Skip to content

chore: update to v3 #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spikecurtis merged 1 commit into from
Dec 23, 2025
Merged

chore: update to v3 #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions example_helper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions example_marshaller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions example_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module cdr.dev/slog
module cdr.dev/slog/v3

go 1.20

Expand Down
2 changes: 1 addition & 1 deletion internal/entryhuman/entry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions internal/entryhuman/entry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion internal/syncwriter/syncwriter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"
"testing"

"cdr.dev/slog/internal/assert"
"cdr.dev/slog/v3/internal/assert"
)

type testWriter struct {
Expand Down
10 changes: 5 additions & 5 deletions map_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions s_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion slog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion slog_exit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"testing"

"cdr.dev/slog/internal/assert"
"cdr.dev/slog/v3/internal/assert"
)

func TestExit(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions slog_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(),
Expand Down
8 changes: 4 additions & 4 deletions sloggers/sloghuman/sloghuman.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions sloggers/sloghuman/sloghuman_bench_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions sloggers/sloghuman/sloghuman_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
8 changes: 4 additions & 4 deletions sloggers/slogjson/slogjson.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions sloggers/slogjson/slogjson_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
}
Expand All @@ -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)
}
2 changes: 1 addition & 1 deletion sloggers/slogstackdriver/export_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions sloggers/slogstackdriver/slogstackdriver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions sloggers/slogstackdriver/slogstackdriver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand All @@ -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)
}
Expand Down
8 changes: 4 additions & 4 deletions sloggers/slogtest/assert/assert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions sloggers/slogtest/assert/assert_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
8 changes: 4 additions & 4 deletions sloggers/slogtest/t.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions sloggers/slogtest/t_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down