chore: update to v3 (#223)

spikecurtis · web-flow · commit 348ac12d311d · 2025-12-23T15:36:08.000+04:00
diff --git a/example_helper_test.go b/example_helper_test.go
@@ -5,8 +5,8 @@ import (
 	"net/http"
 	"os"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/sloggers/sloghuman"
+	"cdr.dev/slog/v3"
+	"cdr.dev/slog/v3/sloggers/sloghuman"
 )
 
 func httpLogHelper(ctx context.Context, status int) {
diff --git a/example_marshaller_test.go b/example_marshaller_test.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"os"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/sloggers/sloghuman"
+	"cdr.dev/slog/v3"
+	"cdr.dev/slog/v3/sloggers/sloghuman"
 )
 
 type myStruct struct {
diff --git a/example_test.go b/example_test.go
@@ -10,10 +10,10 @@ import (
 
 	"golang.org/x/xerrors"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/sloggers/sloghuman"
-	"cdr.dev/slog/sloggers/slogstackdriver"
-	"cdr.dev/slog/sloggers/slogtest"
+	"cdr.dev/slog/v3"
+	"cdr.dev/slog/v3/sloggers/sloghuman"
+	"cdr.dev/slog/v3/sloggers/slogstackdriver"
+	"cdr.dev/slog/v3/sloggers/slogtest"
 )
 
 func Example() {
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module cdr.dev/slog
+module cdr.dev/slog/v3
 
 go 1.20
 
diff --git a/internal/entryhuman/entry.go b/internal/entryhuman/entry.go
@@ -21,7 +21,7 @@ import (
 	"golang.org/x/term"
 	"golang.org/x/xerrors"
 
-	"cdr.dev/slog"
+	"cdr.dev/slog/v3"
 )
 
 // StripTimestamp strips the timestamp from entry and returns
diff --git a/internal/entryhuman/entry_test.go b/internal/entryhuman/entry_test.go
@@ -11,9 +11,9 @@ import (
 	"testing"
 	"time"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/internal/assert"
-	"cdr.dev/slog/internal/entryhuman"
+	"cdr.dev/slog/v3"
+	"cdr.dev/slog/v3/internal/assert"
+	"cdr.dev/slog/v3/internal/entryhuman"
 )
 
 var kt = time.Date(2000, time.February, 5, 4, 4, 4, 4, time.UTC)
diff --git a/internal/syncwriter/syncwriter_test.go b/internal/syncwriter/syncwriter_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"cdr.dev/slog/internal/assert"
+	"cdr.dev/slog/v3/internal/assert"
 )
 
 type testWriter struct {
diff --git a/map_test.go b/map_test.go
@@ -11,8 +11,8 @@ import (
 
 	"golang.org/x/xerrors"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/internal/assert"
+	"cdr.dev/slog/v3"
+	"cdr.dev/slog/v3/internal/assert"
 )
 
 var _, mapTestFile, _, _ = runtime.Caller(0)
@@ -61,12 +61,12 @@ func TestMap(t *testing.T) {
 			"error": [
 				{
 					"msg": "wrap1",
-					"fun": "cdr.dev/slog_test.TestMap.func2",
+					"fun": "cdr.dev/slog/v3_test.TestMap.func2",
 					"loc": "`+mapTestFile+`:41"
 				},
 				{
 					"msg": "wrap2",
-					"fun": "cdr.dev/slog_test.TestMap.func2",
+					"fun": "cdr.dev/slog/v3_test.TestMap.func2",
 					"loc": "`+mapTestFile+`:42"
 				},
 				"EOF"
@@ -92,7 +92,7 @@ func TestMap(t *testing.T) {
 				"error": [
 					{
 						"msg": "failed to marshal to JSON",
-						"fun": "cdr.dev/slog.encodeJSON",
+						"fun": "cdr.dev/slog/v3.encodeJSON",
 						"loc": "`+mapTestFile+`:140"
 					},
 					"json: error calling MarshalJSON for type slog_test.complexJSON: json: unsupported type: complex128"
diff --git a/s_test.go b/s_test.go
@@ -4,10 +4,10 @@ import (
 	"bytes"
 	"testing"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/internal/assert"
-	"cdr.dev/slog/internal/entryhuman"
-	"cdr.dev/slog/sloggers/sloghuman"
+	"cdr.dev/slog/v3"
+	"cdr.dev/slog/v3/internal/assert"
+	"cdr.dev/slog/v3/internal/entryhuman"
+	"cdr.dev/slog/v3/sloggers/sloghuman"
 )
 
 func TestStdlib(t *testing.T) {
diff --git a/slog.go b/slog.go
@@ -8,7 +8,7 @@
 // Logger implements Sink as well to allow composition.
 //
 // Implementations of the Sink interface are available in the sloggers subdirectory.
-package slog // import "cdr.dev/slog"
+package slog // import "cdr.dev/slog/v3"
 
 import (
 	"context"
diff --git a/slog_exit_test.go b/slog_exit_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"cdr.dev/slog/internal/assert"
+	"cdr.dev/slog/v3/internal/assert"
 )
 
 func TestExit(t *testing.T) {
diff --git a/slog_test.go b/slog_test.go
@@ -8,8 +8,8 @@ import (
 
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/internal/assert"
+	"cdr.dev/slog/v3"
+	"cdr.dev/slog/v3/internal/assert"
 )
 
 var _, slogTestFile, _, _ = runtime.Caller(0)
@@ -74,7 +74,7 @@ func TestLogger(t *testing.T) {
 			Message: "logging in helper",
 
 			File: slogTestFile,
-			Func: "cdr.dev/slog_test.TestLogger.func2",
+			Func: "cdr.dev/slog/v3_test.TestLogger.func2",
 			Line: 67,
 
 			Fields: slog.M(
@@ -111,7 +111,7 @@ func TestLogger(t *testing.T) {
 			LoggerNames: []string{"hello", "hello2"},
 
 			File: slogTestFile,
-			Func: "cdr.dev/slog_test.TestLogger.func3",
+			Func: "cdr.dev/slog/v3_test.TestLogger.func3",
 			Line: 102,
 
 			SpanContext: span.SpanContext(),
diff --git a/sloggers/sloghuman/sloghuman.go b/sloggers/sloghuman/sloghuman.go
@@ -1,16 +1,16 @@
 // Package sloghuman contains the slogger
 // that writes logs in a human readable format.
-package sloghuman // import "cdr.dev/slog/sloggers/sloghuman"
+package sloghuman // import "cdr.dev/slog/v3/sloggers/sloghuman"
 
 import (
 	"bytes"
 	"context"
 	"io"
 	"sync"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/internal/entryhuman"
-	"cdr.dev/slog/internal/syncwriter"
+	"cdr.dev/slog/v3"
+	"cdr.dev/slog/v3/internal/entryhuman"
+	"cdr.dev/slog/v3/internal/syncwriter"
 )
 
 // Sink creates a slog.Sink that writes logs in a human
diff --git a/sloggers/sloghuman/sloghuman_bench_test.go b/sloggers/sloghuman/sloghuman_bench_test.go
@@ -9,9 +9,9 @@ import (
 	"testing"
 	"time"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/internal/entryhuman"
-	"cdr.dev/slog/sloggers/sloghuman"
+	"cdr.dev/slog/v3"
+	"cdr.dev/slog/v3/internal/entryhuman"
+	"cdr.dev/slog/v3/sloggers/sloghuman"
 )
 
 func multiline(n int) string {
diff --git a/sloggers/sloghuman/sloghuman_test.go b/sloggers/sloghuman/sloghuman_test.go
@@ -7,10 +7,10 @@ import (
 	"os"
 	"testing"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/internal/assert"
-	"cdr.dev/slog/internal/entryhuman"
-	"cdr.dev/slog/sloggers/sloghuman"
+	"cdr.dev/slog/v3"
+	"cdr.dev/slog/v3/internal/assert"
+	"cdr.dev/slog/v3/internal/entryhuman"
+	"cdr.dev/slog/v3/sloggers/sloghuman"
 )
 
 var bg = context.Background()
diff --git a/sloggers/slogjson/slogjson.go b/sloggers/slogjson/slogjson.go
@@ -8,23 +8,23 @@
 //	  "logger_names": ["comp", "subcomp"],
 //	  "msg": "hi",
 //	  "caller": "slog/examples_test.go:62",
-//	  "func": "cdr.dev/slog/sloggers/slogtest_test.TestExampleTest",
+//	  "func": "cdr.dev/slog/v3/sloggers/slogtest_test.TestExampleTest",
 //	  "trace": "<traceid>",
 //	  "span": "<spanid>",
 //	  "fields": {
 //	    "my_field": "field value"
 //	  }
 //	}
-package slogjson // import "cdr.dev/slog/sloggers/slogjson"
+package slogjson // import "cdr.dev/slog/v3/sloggers/slogjson"
 
 import (
 	"context"
 	"encoding/json"
 	"fmt"
 	"io"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/internal/syncwriter"
+	"cdr.dev/slog/v3"
+	"cdr.dev/slog/v3/internal/syncwriter"
 )
 
 // Sink creates a slog.Sink that writes JSON logs
diff --git a/sloggers/slogjson/slogjson_test.go b/sloggers/slogjson/slogjson_test.go
@@ -10,10 +10,10 @@ import (
 
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/internal/assert"
-	"cdr.dev/slog/internal/entryjson"
-	"cdr.dev/slog/sloggers/slogjson"
+	"cdr.dev/slog/v3"
+	"cdr.dev/slog/v3/internal/assert"
+	"cdr.dev/slog/v3/internal/entryjson"
+	"cdr.dev/slog/v3/sloggers/slogjson"
 )
 
 var _, slogjsonTestFile, _, _ = runtime.Caller(0)
@@ -34,7 +34,7 @@ func TestMake(t *testing.T) {
 	l.Error(ctx, "line1\n\nline2", slog.F("wowow", "me\nyou"))
 
 	j := entryjson.Filter(b.String(), "ts")
-	exp := fmt.Sprintf(`{"level":"ERROR","msg":"line1\n\nline2","caller":"%v:34","func":"cdr.dev/slog/sloggers/slogjson_test.TestMake","logger_names":["named"],"trace":"%v","span":"%v","fields":{"wowow":"me\nyou"}}
+	exp := fmt.Sprintf(`{"level":"ERROR","msg":"line1\n\nline2","caller":"%v:34","func":"cdr.dev/slog/v3/sloggers/slogjson_test.TestMake","logger_names":["named"],"trace":"%v","span":"%v","fields":{"wowow":"me\nyou"}}
 `, slogjsonTestFile, span.SpanContext().TraceID().String(), span.SpanContext().SpanID().String())
 	assert.Equal(t, "entry", exp, j)
 }
@@ -60,7 +60,7 @@ func TestNoDriverValue(t *testing.T) {
 	l.Error(bg, "error!", slog.F("inval", invalidField), slog.F("val", validField), slog.F("int", validInt))
 
 	j := entryjson.Filter(b.String(), "ts")
-	exp := fmt.Sprintf(`{"level":"ERROR","msg":"error!","caller":"%v:60","func":"cdr.dev/slog/sloggers/slogjson_test.TestNoDriverValue","logger_names":["named"],"fields":{"inval":null,"val":"cat","int":42}}
+	exp := fmt.Sprintf(`{"level":"ERROR","msg":"error!","caller":"%v:60","func":"cdr.dev/slog/v3/sloggers/slogjson_test.TestNoDriverValue","logger_names":["named"],"fields":{"inval":null,"val":"cat","int":42}}
 `, slogjsonTestFile)
 	assert.Equal(t, "entry", exp, j)
 }
diff --git a/sloggers/slogstackdriver/export_test.go b/sloggers/slogstackdriver/export_test.go
@@ -3,7 +3,7 @@ package slogstackdriver
 import (
 	logpbtype "google.golang.org/genproto/googleapis/logging/type"
 
-	"cdr.dev/slog"
+	"cdr.dev/slog/v3"
 )
 
 func Sev(level slog.Level) logpbtype.LogSeverity {
diff --git a/sloggers/slogstackdriver/slogstackdriver.go b/sloggers/slogstackdriver/slogstackdriver.go
@@ -1,5 +1,5 @@
 // Package slogstackdriver contains the slogger for google cloud's stackdriver.
-package slogstackdriver // import "cdr.dev/slog/sloggers/slogstackdriver"
+package slogstackdriver // import "cdr.dev/slog/v3/sloggers/slogstackdriver"
 
 import (
 	"context"
@@ -15,8 +15,8 @@ import (
 	"go.opentelemetry.io/otel/trace"
 	logpbtype "google.golang.org/genproto/googleapis/logging/type"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/internal/syncwriter"
+	"cdr.dev/slog/v3"
+	"cdr.dev/slog/v3/internal/syncwriter"
 )
 
 // Sink creates a slog.Sink configured to write JSON logs
diff --git a/sloggers/slogstackdriver/slogstackdriver_test.go b/sloggers/slogstackdriver/slogstackdriver_test.go
@@ -15,10 +15,10 @@ import (
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 	logpbtype "google.golang.org/genproto/googleapis/logging/type"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/internal/assert"
-	"cdr.dev/slog/internal/entryjson"
-	"cdr.dev/slog/sloggers/slogstackdriver"
+	"cdr.dev/slog/v3"
+	"cdr.dev/slog/v3/internal/assert"
+	"cdr.dev/slog/v3/internal/entryjson"
+	"cdr.dev/slog/v3/sloggers/slogstackdriver"
 )
 
 var (
@@ -43,7 +43,7 @@ func TestStackdriver(t *testing.T) {
 
 	j := entryjson.Filter(b.String(), "timestampSeconds")
 	j = entryjson.Filter(j, "timestampNanos")
-	exp := fmt.Sprintf(`{"logging.googleapis.com/severity":"ERROR","severity":"ERROR","message":"line1\n\nline2","logging.googleapis.com/sourceLocation":{"file":"%v","line":40,"function":"cdr.dev/slog/sloggers/slogstackdriver_test.TestStackdriver"},"logging.googleapis.com/operation":{"producer":"meow"},"logging.googleapis.com/trace":"projects/%v/traces/%v","logging.googleapis.com/spanId":"%v","logging.googleapis.com/trace_sampled":%v,"wowow":"me\nyou"}
+	exp := fmt.Sprintf(`{"logging.googleapis.com/severity":"ERROR","severity":"ERROR","message":"line1\n\nline2","logging.googleapis.com/sourceLocation":{"file":"%v","line":40,"function":"cdr.dev/slog/v3/sloggers/slogstackdriver_test.TestStackdriver"},"logging.googleapis.com/operation":{"producer":"meow"},"logging.googleapis.com/trace":"projects/%v/traces/%v","logging.googleapis.com/spanId":"%v","logging.googleapis.com/trace_sampled":%v,"wowow":"me\nyou"}
 `, slogstackdriverTestFile, projectID, span.SpanContext().TraceID(), span.SpanContext().SpanID(), span.SpanContext().IsSampled())
 	assert.Equal(t, "entry", exp, j)
 }
diff --git a/sloggers/slogtest/assert/assert.go b/sloggers/slogtest/assert/assert.go
@@ -3,17 +3,17 @@
 // On failure, every assertion will fatal the test.
 //
 // The name parameter is available in each assertion for easier debugging.
-package assert // import "cdr.dev/slog/sloggers/slogtest/assert"
+package assert // import "cdr.dev/slog/v3/sloggers/slogtest/assert"
 
 import (
 	"strings"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/internal/assert"
-	"cdr.dev/slog/sloggers/slogtest"
+	"cdr.dev/slog/v3"
+	"cdr.dev/slog/v3/internal/assert"
+	"cdr.dev/slog/v3/sloggers/slogtest"
 )
 
 // Equal asserts exp == act.
diff --git a/sloggers/slogtest/assert/assert_test.go b/sloggers/slogtest/assert/assert_test.go
@@ -5,8 +5,8 @@ import (
 	"io"
 	"testing"
 
-	simpleassert "cdr.dev/slog/internal/assert"
-	"cdr.dev/slog/sloggers/slogtest/assert"
+	simpleassert "cdr.dev/slog/v3/internal/assert"
+	"cdr.dev/slog/v3/sloggers/slogtest/assert"
 )
 
 func TestEqual(t *testing.T) {
diff --git a/sloggers/slogtest/t.go b/sloggers/slogtest/t.go
@@ -3,7 +3,7 @@
 //
 // If imported, then all logs that go through the stdlib's
 // default logger will go through slog.
-package slogtest // import "cdr.dev/slog/sloggers/slogtest"
+package slogtest // import "cdr.dev/slog/v3/sloggers/slogtest"
 
 import (
 	"bytes"
@@ -16,9 +16,9 @@ import (
 
 	"golang.org/x/xerrors"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/internal/entryhuman"
-	"cdr.dev/slog/sloggers/sloghuman"
+	"cdr.dev/slog/v3"
+	"cdr.dev/slog/v3/internal/entryhuman"
+	"cdr.dev/slog/v3/sloggers/sloghuman"
 )
 
 // Ensure all stdlib logs go through slog.
diff --git a/sloggers/slogtest/t_test.go b/sloggers/slogtest/t_test.go
@@ -8,9 +8,9 @@ import (
 
 	"golang.org/x/xerrors"
 
-	"cdr.dev/slog"
-	"cdr.dev/slog/internal/assert"
-	"cdr.dev/slog/sloggers/slogtest"
+	"cdr.dev/slog/v3"
+	"cdr.dev/slog/v3/internal/assert"
+	"cdr.dev/slog/v3/sloggers/slogtest"
 )
 
 func TestStateless(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ import (`
`5`	`5`	`"net/http"`
`6`	`6`	`"os"`
`7`	`7`
`8`		`- "cdr.dev/slog"`
`9`		`- "cdr.dev/slog/sloggers/sloghuman"`
	`8`	`+ "cdr.dev/slog/v3"`
	`9`	`+ "cdr.dev/slog/v3/sloggers/sloghuman"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`func httpLogHelper(ctx context.Context, status int) {`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ import (`
`4`	`4`	`"context"`
`5`	`5`	`"os"`
`6`	`6`
`7`		`- "cdr.dev/slog"`
`8`		`- "cdr.dev/slog/sloggers/sloghuman"`
	`7`	`+ "cdr.dev/slog/v3"`
	`8`	`+ "cdr.dev/slog/v3/sloggers/sloghuman"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`type myStruct struct {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module cdr.dev/slog`
	`1`	`+module cdr.dev/slog/v3`
`2`	`2`
`3`	`3`	`go 1.20`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import (`
`21`	`21`	`"golang.org/x/term"`
`22`	`22`	`"golang.org/x/xerrors"`
`23`	`23`
`24`		`- "cdr.dev/slog"`
	`24`	`+ "cdr.dev/slog/v3"`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`// StripTimestamp strips the timestamp from entry and returns`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"os"`
`6`	`6`	`"testing"`
`7`	`7`
`8`		`- "cdr.dev/slog/internal/assert"`
	`8`	`+ "cdr.dev/slog/v3/internal/assert"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`type testWriter struct {`