diff --git a/internal/kslog/slog.go b/internal/kslog/slog.go index 3ee2999..309ed72 100644 --- a/internal/kslog/slog.go +++ b/internal/kslog/slog.go @@ -14,11 +14,11 @@ import ( // LogWithContext returns a logger with trace information. func LogWithContext(ctx context.Context, logger *slog.Logger) *slog.Logger { s := trace.SpanContextFromContext(ctx) - if s.HasTraceID() { - logger = logger.With(slog.String("trace_id", s.TraceID().String())) - } - if s.HasSpanID() { - logger = logger.With(slog.String("span_id", s.SpanID().String())) + if s.IsValid() { + logger = logger.With( + slog.String("span_id", s.SpanID().String()), + slog.String("trace_id", s.TraceID().String()), + ) } return logger diff --git a/internal/kslog/slog_level.go b/internal/kslog/slog_level.go deleted file mode 100644 index f74562d..0000000 --- a/internal/kslog/slog_level.go +++ /dev/null @@ -1,42 +0,0 @@ -package kslog - -import ( - "context" - "log/slog" -) - -// levelHandler is a slog.Handler implementation that observes logs. -type levelHandler struct { - level slog.Level - next slog.Handler -} - -// NewLogLevelHandler returns a new LevelHandler and the observed logs. -func NewLevelHandler(level slog.Level) func(slog.Handler) slog.Handler { - return func(h slog.Handler) slog.Handler { - return &levelHandler{ - next: h, - level: level, - } - } -} - -// Handle implements slog.Handler. -func (h *levelHandler) Handle(ctx context.Context, r slog.Record) error { - return h.next.Handle(ctx, r) -} - -// WithAttrs returns a new slog.handler with the provided attributes. -func (h *levelHandler) WithAttrs(attrs []slog.Attr) slog.Handler { - return &levelHandler{level: h.level, next: h.next.WithAttrs(attrs)} -} - -// WithGroup returns a slog.handler with a group, provided the group's name. -func (h *levelHandler) WithGroup(name string) slog.Handler { - return &levelHandler{level: h.level, next: h.next.WithGroup(name)} -} - -// Enabled returns true if the provided level is enabled. -func (h levelHandler) Enabled(_ context.Context, lv slog.Level) bool { - return lv >= h.level -}