Skip to content

Commit a676dee

Browse files
committed
chore: remove logWrapper
1 parent 4b6c2a3 commit a676dee

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

kod.go

+8-13
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,6 @@ type options struct {
325325
logger *slog.Logger
326326
configFilename string
327327
fakes map[reflect.Type]any
328-
logWrapper func(slog.Handler) slog.Handler
329328
registrations []*Registration
330329
interceptors []interceptor.Interceptor
331330
}
@@ -372,17 +371,13 @@ func newKod(ctx context.Context, opts ...func(*options)) (*Kod, error) {
372371
return nil, err
373372
}
374373

375-
if opt.logger != nil {
376-
kod.log = opt.logger
374+
if opt.enableOpenTelemetry && os.Getenv("OTEL_SDK_DISABLED") != "true" {
375+
kod.initOpenTelemetry(ctx)
377376
} else {
378-
if opt.enableOpenTelemetry && os.Getenv("OTEL_SDK_DISABLED") != "true" {
379-
kod.initOpenTelemetry(ctx)
380-
} else {
381-
kod.log = kod.newSlog(slog.NewTextHandler(
382-
os.Stdout,
383-
&slog.HandlerOptions{},
384-
))
385-
}
377+
kod.log = kod.newSlog(slog.NewTextHandler(
378+
os.Stdout,
379+
&slog.HandlerOptions{},
380+
))
386381
}
387382

388383
return kod, nil
@@ -544,8 +539,8 @@ func (k *Kod) configureLog(ctx context.Context, res *resource.Resource) {
544539

545540
// newSlog creates a new slog logger with the provided handler.
546541
func (k *Kod) newSlog(handler slog.Handler) *slog.Logger {
547-
if k.opts.logWrapper != nil {
548-
handler = k.opts.logWrapper(handler)
542+
if k.opts.logger != nil {
543+
return k.opts.logger
549544
}
550545

551546
handler = kslog.NewLevelHandler(k.config.LogLevel)(handler)

0 commit comments

Comments
 (0)