diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index a760193..6f71a5f 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -6,7 +6,7 @@ jobs: test: strategy: matrix: - go-versions: [ 1.18.x, 1.19.x, 1.20.x ] + go-version: [ 1.19.x, 1.20.x, 1.21.x ] platform: [ ubuntu-latest, macos-latest, windows-latest ] runs-on: ${{ matrix.platform }} steps: diff --git a/slog_test.go b/slog_test.go index 78d84b3..c9f3be6 100644 --- a/slog_test.go +++ b/slog_test.go @@ -28,7 +28,7 @@ import ( "testing" "testing/slogtest" - "github.com/go-logr/logr/slogr" + "github.com/go-logr/logr" "github.com/go-logr/zapr" "github.com/stretchr/testify/require" "go.uber.org/zap" @@ -48,7 +48,7 @@ func TestSlogHandler(t *testing.T) { core := zapcore.NewCore(encoder, zapcore.AddSync(&buffer), zapcore.Level(0)) zl := zap.New(core) logger := zapr.NewLogger(zl) - handler := slogr.NewSlogHandler(logger) + handler := logr.ToSlogHandler(logger) err := slogtest.TestHandler(handler, func() []map[string]any { _ = zl.Sync() @@ -157,7 +157,7 @@ func TestSlogCases(t *testing.T) { core := zapcore.NewCore(encoder, zapcore.AddSync(&buffer), zapcore.Level(-10)) zl := zap.New(core) logger := zapr.NewLoggerWithOptions(zl, zapr.LogInfoLevel("v")) - handler := slogr.NewSlogHandler(logger.V(tc.v)) + handler := logr.ToSlogHandler(logger.V(tc.v)) require.NoError(t, handler.Handle(context.Background(), tc.record)) _ = zl.Sync() require.JSONEq(t, tc.expected, buffer.String()) diff --git a/slogzapr.go b/slogzapr.go index 84f56e4..33926f9 100644 --- a/slogzapr.go +++ b/slogzapr.go @@ -24,12 +24,12 @@ import ( "log/slog" "runtime" - "github.com/go-logr/logr/slogr" + "github.com/go-logr/logr" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) -var _ slogr.SlogSink = &zapLogger{} +var _ logr.SlogSink = &zapLogger{} func (zl *zapLogger) Handle(_ context.Context, record slog.Record) error { zapLevel := zap.InfoLevel @@ -170,13 +170,13 @@ func pcToCallerEntry(pc uintptr) zapcore.EntryCaller { } } -func (zl *zapLogger) WithAttrs(attrs []slog.Attr) slogr.SlogSink { +func (zl *zapLogger) WithAttrs(attrs []slog.Attr) logr.SlogSink { newLogger := *zl newLogger.l = newLogger.l.With(zap.Inline(marshalAttrs(attrs))) return &newLogger } -func (zl *zapLogger) WithGroup(name string) slogr.SlogSink { +func (zl *zapLogger) WithGroup(name string) logr.SlogSink { newLogger := *zl newLogger.l = newLogger.l.With(zap.Namespace(name)) return &newLogger diff --git a/zapr_slog_test.go b/zapr_slog_test.go index 0663a28..1b72661 100644 --- a/zapr_slog_test.go +++ b/zapr_slog_test.go @@ -23,7 +23,6 @@ import ( "log/slog" "github.com/go-logr/logr" - "github.com/go-logr/logr/slogr" ) func hasSlog() bool { @@ -71,7 +70,7 @@ func (v valuer) LogValue() slog.Value { var _ slog.LogValuer = valuer{} func logWithSlog(l logr.Logger, msg string, withKeysValues, keysValues []interface{}) { - logger := slog.New(slogr.NewSlogHandler(l)) + logger := slog.New(logr.ToSlogHandler(l)) if withKeysValues != nil { logger = logger.With(withKeysValues...) }