chore: improve log

Author: sysulq

internal/kslog/slog.go

@@ -2,28 +2,13 @@ package kslog
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
 	"log/slog"
 	"strings"
 
 	"github.com/samber/lo"
-	"go.opentelemetry.io/otel/trace"
 )
 
-// LogWithContext returns a logger with trace information.
-func LogWithContext(ctx context.Context, logger *slog.Logger) *slog.Logger {
-	s := trace.SpanContextFromContext(ctx)
-	if s.IsValid() {
-		logger = logger.With(
-			slog.String("span_id", s.SpanID().String()),
-			slog.String("trace_id", s.TraceID().String()),
-		)
-	}
-
-	return logger
-}
-
 // NewTestLogger returns a new test logger.
 func NewTestLogger() (*slog.Logger, *observer) {
 	observer := &observer{

kod.go

@@ -26,7 +26,6 @@ import (
 
 	"github.com/go-kod/kod/interceptor"
 	"github.com/go-kod/kod/internal/hooks"
-	"github.com/go-kod/kod/internal/kslog"
 	"github.com/go-kod/kod/internal/registry"
 	"github.com/go-kod/kod/internal/signals"
 )
@@ -46,7 +45,16 @@ type Implements[T any] struct {
 
 // L returns the associated logger.
 func (i *Implements[T]) L(ctx context.Context) *slog.Logger {
-	return kslog.LogWithContext(ctx, i.log)
+	s := trace.SpanContextFromContext(ctx)
+	if s.IsValid() {
+		return slog.Default().With(
+			slog.String("component", i.name),
+			slog.String("span_id", s.SpanID().String()),
+			slog.String("trace_id", s.TraceID().String()),
+		)
+	}
+
+	return slog.Default().With(slog.String("component", i.name))
 }
 
 // Tracer return the associated tracer.
@@ -59,13 +67,6 @@ func (i *Implements[T]) Meter(opts ...metric.MeterOption) metric.Meter {
 	return otel.Meter(i.name, opts...)
 }
 
-// setLogger sets the logger for the component.
-// nolint
-func (i *Implements[T]) setLogger(name string, log *slog.Logger) {
-	i.name = name
-	i.log = log.With(slog.String("component", name))
-}
-
 // implements is a marker method to assert implementation of an interface.
 // nolint
 func (Implements[T]) implements(T) {}

registry.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"log/slog"
 	"reflect"
 
 	"github.com/dominikbraun/graph"
@@ -109,10 +108,10 @@ func (k *Kod) get(ctx context.Context, reg *Registration) (any, error) {
 		}
 	}
 
-	// Fill logger.
-	if err := fillLog(reg.Name, obj, slog.Default()); err != nil {
-		return nil, err
-	}
+	// // Fill logger.
+	// if err := fillLog(reg.Name, obj, slog.Default()); err != nil {
+	// 	return nil, err
+	// }
 
 	// Fill refs.
 	if err := fillRefs(obj, k.lazyInitComponents,
@@ -133,9 +132,7 @@ func (k *Kod) get(ctx context.Context, reg *Registration) (any, error) {
 
 	// Call Shutdown if available.
 	if i, ok := obj.(interface{ Shutdown(context.Context) error }); ok {
-		k.hooker.Add(hooks.HookFunc{Name: reg.Name, Fn: func(ctx context.Context) error {
-			return i.Shutdown(ctx)
-		}})
+		k.hooker.Add(hooks.HookFunc{Name: reg.Name, Fn: i.Shutdown})
 	}
 
 	// Cache the component.
@@ -144,16 +141,6 @@ func (k *Kod) get(ctx context.Context, reg *Registration) (any, error) {
 	return obj, nil
 }
 
-func fillLog(name string, obj any, log *slog.Logger) error {
-	x, ok := obj.(interface{ setLogger(string, *slog.Logger) })
-	if !ok {
-		return fmt.Errorf("fillLog: %T does not implement kod.Implements", obj)
-	}
-
-	x.setLogger(name, log)
-	return nil
-}
-
 func fillRefs(impl any, lazyInit map[reflect.Type]bool, get func(reflect.Type) componentGetter) error {
 	p := reflect.ValueOf(impl)
 	if p.Kind() != reflect.Pointer {

registry_test.go

@@ -12,10 +12,6 @@ import (
 )
 
 func TestFill(t *testing.T) {
-	t.Run("case 1", func(t *testing.T) {
-		assert.NotNil(t, fillLog("", nil, nil))
-	})
-
 	t.Run("case 2", func(t *testing.T) {
 		assert.NotNil(t, fillRefs(nil, nil, nil))
 	})