Simplify test logger interface

Author: nhooyr

internal/stdlibctx/stdlibctx.go

@@ -159,10 +159,8 @@ func Make(s Sink) Logger {
 	}
 	l.SetLevel(LevelDebug)
 
-	if sink, ok := s.(interface {
-		XXX_slogTestingHelper() func()
-	}); ok {
-		l.testingHelper = sink.XXX_slogTestingHelper()
+	if ts, ok := s.(testSink); ok {
+		l.testingHelper = ts.TestingHelper()
 	}
 	return l
 }
@@ -180,6 +178,11 @@ type Logger struct {
 	skip  int
 }
 
+func (l Logger) clone() Logger {
+	l.sinks = append([]sink(nil), l.sinks...)
+	return l
+}
+
 func (l Logger) Debug(ctx context.Context, msg string, fields ...Field) {
 	l.testingHelper()
 	l.log(ctx, LevelDebug, msg, fields)
@@ -211,15 +214,15 @@ func (l Logger) Fatal(ctx context.Context, msg string, fields ...Field) {
 }
 
 func (l Logger) With(fields ...Field) Logger {
-	sinks := make([]sink, len(l.sinks))
+	l = l.clone()
 	for i, s := range l.sinks {
 		s.pl = s.pl.withFields(fields)
-		sinks[i] = s
+		l.sinks[i] = s
 	}
-	l.sinks = sinks
 	return l
 }
 
+// SetLevel changes the Logger's level.
 func (l Logger) SetLevel(level Level) {
 	for _, s := range l.sinks {
 		atomic.StoreInt64(s.level, int64(level))
@@ -358,3 +361,8 @@ func Tee(ls ...Logger) Logger {
 
 	return l
 }
+
+type testSink interface {
+	Stdlib() Sink
+	TestingHelper() func()
+}

slog.go

@@ -7,7 +7,6 @@ import (
 
 	"go.coder.com/slog"
 	"go.coder.com/slog/internal/humanfmt"
-	"go.coder.com/slog/internal/stdlibctx"
 )
 
 // TestOptions represents the options for the logger returned
@@ -30,11 +29,23 @@ func Make(tb testing.TB, opts *TestOptions) slog.Logger {
 }
 
 type testSink struct {
-	tb   testing.TB
-	opts *TestOptions
+	tb     testing.TB
+	opts   *TestOptions
+	stdlib bool
 }
 
-func (ts testSink) XXX_slogTestingHelper() func() {
+func (ts testSink) Stdlib() slog.Sink {
+	ts.stdlib = true
+	return ts
+}
+
+// Implements:
+// type testSink interface {
+//	Stdlib() Sink
+//	TestingHelper() func()
+// }
+// See slog.go in root package.
+func (ts testSink) TestingHelper() func() {
 	return ts.tb.Helper
 }
 
@@ -43,7 +54,7 @@ var stderrColor = humanfmt.IsTTY(os.Stderr)
 func (ts testSink) LogEntry(ctx context.Context, ent slog.Entry) {
 	ts.tb.Helper()
 
-	if !stdlibctx.From(ctx) {
+	if !ts.stdlib {
 		// We do not want to print the file or line number ourselves.
 		// The testing framework handles it for us.
 		// But we do want the function name.

sloggers/slogtest/test.go

@@ -4,8 +4,6 @@ import (
 	"context"
 	"log"
 	"strings"
-
-	"go.coder.com/slog/internal/stdlibctx"
 )
 
 // Stdlib creates a standard library logger from the given logger.
@@ -20,7 +18,12 @@ import (
 func Stdlib(ctx context.Context, l Logger) *log.Logger {
 	l.skip += 4
 
-	ctx = stdlibctx.With(ctx)
+	l = l.clone()
+	for i, s := range l.sinks {
+		if ts, ok := s.sink.(testSink); ok {
+			l.sinks[i].sink = ts.Stdlib()
+		}
+	}
 
 	w := &stdlogWriter{
 		Log: func(msg string) {