Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: diagnostic logs not formatted correctly
Kyle Mendelleed265c4a290
diff --git a/backend/pkg/libarcane/logstream/logstream.go b/backend/pkg/libarcane/logstream/logstream.goindex 1487ec631..11d031f27 100644--- a/backend/pkg/libarcane/logstream/logstream.go+++ b/backend/pkg/libarcane/logstream/logstream.go@@ -130,7 +130,7 @@ func (h *slogHandler) Handle(ctx context.Context, r slog.Record) error {if r.NumAttrs() > 0 {attrs = make(map[string]any, r.NumAttrs())r.Attrs(func(a slog.Attr) bool {- attrs[a.Key] = a.Value.Any()+ attrs[a.Key] = normalizeAttrValueInternal(a.Value)return true})}@@ -150,3 +150,68 @@ func (h *slogHandler) WithAttrs(attrs []slog.Attr) slog.Handler {func (h *slogHandler) WithGroup(name string) slog.Handler {return &slogHandler{base: h.base.WithGroup(name), b: h.b}}++func normalizeAttrValueInternal(value slog.Value) any {+ value = value.Resolve()++ switch value.Kind() {+ case slog.KindAny:+ return normalizeAnyValueInternal(value.Any())+ case slog.KindBool:+ return value.Bool()+ case slog.KindDuration:+ return value.Duration()+ case slog.KindFloat64:+ return value.Float64()+ case slog.KindGroup:+ return normalizeGroupAttrsInternal(value.Group())+ case slog.KindInt64:+ return value.Int64()+ case slog.KindLogValuer:+ return value.String()+ case slog.KindString:+ return value.String()+ case slog.KindTime:+ return value.Time()+ case slog.KindUint64:+ return value.Uint64()+ default:+ return value.String()+ }+}++func normalizeAnyValueInternal(value any) any {+ switch typed := value.(type) {+ case slog.Attr:+ return map[string]any{typed.Key: normalizeAttrValueInternal(typed.Value)}+ case []slog.Attr:+ return normalizeGroupAttrsInternal(typed)+ case slog.Value:+ return normalizeAttrValueInternal(typed)+ case []any:+ out := make([]any, len(typed))+ for i, item := range typed {+ out[i] = normalizeAnyValueInternal(item)+ }+ return out+ case map[string]any:+ out := make(map[string]any, len(typed))+ for key, item := range typed {+ out[key] = normalizeAnyValueInternal(item)+ }+ return out+ default:+ return value+ }+}++func normalizeGroupAttrsInternal(attrs []slog.Attr) map[string]any {+ out := make(map[string]any, len(attrs))+ for _, attr := range attrs {+ if attr.Key == "" {+ continue+ }+ out[attr.Key] = normalizeAttrValueInternal(attr.Value)+ }+ return out+}diff --git a/backend/pkg/libarcane/logstream/logstream_test.go b/backend/pkg/libarcane/logstream/logstream_test.gonew file mode 100644index 000000000..8397ae8d9--- /dev/null+++ b/backend/pkg/libarcane/logstream/logstream_test.go@@ -0,0 +1,47 @@+package logstream++import (+ "context"+ "io"+ "log/slog"+ "reflect"+ "testing"+ "time"+)++func TestSlogHandlerNormalizesGroupedAttrsInternal(t *testing.T) {+ b := New(10)+ h := NewSlogHandler(slog.NewTextHandler(io.Discard, nil), b)+ record := slog.NewRecord(time.Unix(1, 0).UTC(), slog.LevelInfo, "Incoming request", 0)+ record.AddAttrs(+ slog.Group("request",+ slog.String("method", "GET"),+ slog.String("path", "/api/diagnostics/logs"),+ slog.Group("headers", slog.String("accept", "application/json")),+ ),+ slog.Any("ids", []string{"one", "two"}),+ )++ if err := h.Handle(context.Background(), record); err != nil {+ t.Fatalf("Handle failed: %v", err)+ }++ entries := b.Recent()+ if len(entries) != 1 {+ t.Fatalf("Recent returned %d entries, want 1", len(entries))+ }++ wantRequest := map[string]any{+ "method": "GET",+ "path": "/api/diagnostics/logs",+ "headers": map[string]any{+ "accept": "application/json",+ },+ }+ if !reflect.DeepEqual(entries[0].Attrs["request"], wantRequest) {+ t.Fatalf("request attr = %#v, want %#v", entries[0].Attrs["request"], wantRequest)+ }+ if !reflect.DeepEqual(entries[0].Attrs["ids"], []string{"one", "two"}) {+ t.Fatalf("ids attr = %#v, want %#v", entries[0].Attrs["ids"], []string{"one", "two"})+ }+}diff --git a/frontend/src/routes/(app)/settings/diagnostics/diagnostic-log-formatting.ts b/frontend/src/routes/(app)/settings/diagnostics/diagnostic-log-formatting.tsnew file mode 100644index 000000000..cc6804c3b--- /dev/null+++ b/frontend/src/routes/(app)/settings/diagnostics/diagnostic-log-formatting.ts@@ -0,0 +1,43 @@+function isRecord(value: unknown): value is Record<string, unknown> {+ return value !== null && typeof value === 'object' && !Array.isArray(value);+}++function formatAttrValue(value: unknown): string {+ if (value === undefined) return '';+ if (value === null) return 'null';+ if (typeof value === 'string') return value;+ if (typeof value === 'number' || typeof value === 'boolean' || typeof value === 'bigint') {+ return String(value);+ }+ try {+ return JSON.stringify(value);+ } catch {+ return String(value);+ }+}++function appendAttrParts(prefix: string, value: unknown, parts: string[]) {+ if (isRecord(value)) {+ const entries = Object.entries(value);+ if (entries.length === 0) {+ parts.push(`${prefix}={}`);+ return;+ }+ for (const [key, child] of entries) {+ appendAttrParts(`${prefix}.${key}`, child, parts);+ }+ return;+ }++ parts.push(`${prefix}=${formatAttrValue(value)}`);+}++export function attrsText(attrs?: Record<string, unknown>): string {+ if (!attrs) return '';++ const parts: string[] = [];+ for (const [key, value] of Object.entries(attrs)) {+ appendAttrParts(key, value, parts);+ }+ return parts.join(' ');+}diff --git a/frontend/src/routes/(app)/settings/diagnostics/diagnostic-log-panel.svelte b/frontend/src/routes/(app)/settings/diagnostics/diagnostic-log-panel.svelteindex 25adda696..19df7943b 100644--- a/frontend/src/routes/(app)/settings/diagnostics/diagnostic-log-panel.svelte+++ b/frontend/src/routes/(app)/settings/diagnostics/diagnostic-log-panel.svelte@@ -7,6 +7,7 @@import { cn } from '$lib/utils';import { ArcaneButton } from '$lib/components/arcane-button/index.js';import { TrashIcon } from '$lib/icons';+ import { attrsText } from './diagnostic-log-formatting';interface Props {height?: string;@@ -65,13 +66,6 @@return isNaN(d.getTime()) ? t : timeFmt.format(d);}- function attrsText(attrs?: Record<string, unknown>): string {- if (!attrs) return '';- return Object.entries(attrs)- .map(([k, v]) => `${k}=${String(v)}`)- .join(' ');- }-function logKey(entry: LogEntry): string {return `${entry.time}-${entry.level}-${entry.message}-${attrsText(entry.attrs)}`;}@@ -153,7 +147,7 @@<span class={cn('w-12 shrink-0 font-semibold uppercase', levelClass(entry.level))}>{entry.level}</span><span class="min-w-0 break-words whitespace-pre-wrap">{entry.message}- {#if entry.attrs}<span class="text-muted-foreground">{attrsText(entry.attrs)}</span>{/if}+ {#if entry.attrs}<span class="text-muted-foreground ml-2">{attrsText(entry.attrs)}</span>{/if}</span></div>{/each}