Upgrade slog package to release version

Author: tt

binary/binary.go

@@ -7,11 +7,10 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"log/slog"
 	"math"
 	"sync"
 	"time"
-
-	"golang.org/x/exp/slog"
 )
 
 type Encoder struct {

go.mod

@@ -1,12 +1,11 @@
 module github.com/jba/slog
 
-go 1.19
+go 1.21
 
 require (
 	github.com/go-kit/log v0.2.1
 	github.com/google/go-cmp v0.5.9
 	go.opentelemetry.io/otel/trace v1.11.2
-	golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb
 )
 
 require (

go.sum

@@ -1,16 +1,18 @@
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU=
 github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
 github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
 github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 go.opentelemetry.io/otel v1.11.2 h1:YBZcQlsVekzFsFbjygXMOXSs6pialIZxcjfO/mBDmR0=
 go.opentelemetry.io/otel v1.11.2/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI=
 go.opentelemetry.io/otel/trace v1.11.2 h1:Xf7hWSF2Glv0DE3MH7fBHvtpSBsjcBUe5MYAmZM/+y0=
 go.opentelemetry.io/otel/trace v1.11.2/go.mod h1:4N+yC7QEz7TTsG9BSRLNAa63eg5E06ObSbKPmxQ/pKA=
-golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb h1:mIKbk8weKhSeLH2GmUTrvx8CjkyJmnU1wFmg59CUjFA=
-golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

gokit/gokit.go

@@ -6,11 +6,11 @@ package gokit
 import (
 	"context"
 	"fmt"
+	"log/slog"
 	"time"
 
 	gklog "github.com/go-kit/log"
 	gklevel "github.com/go-kit/log/level"
-	"golang.org/x/exp/slog"
 )
 
 // New returns go-kit logger that calls h.Handle.

gokit/gokit_test.go

@@ -2,11 +2,11 @@ package gokit
 
 import (
 	"bytes"
+	"log/slog"
 	"strings"
 	"testing"
 
 	gklevel "github.com/go-kit/log/level"
-	"golang.org/x/exp/slog"
 )
 
 func Test(t *testing.T) {

handlers/binary.go

@@ -2,8 +2,7 @@ package handlers
 
 import (
 	"io"
-
-	"golang.org/x/exp/slog"
+	"log/slog"
 )
 
 // BinaryHandler uses the format in github.com/jba/slog/binary

handlers/general/general_handler.go

@@ -6,16 +6,15 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"log/slog"
 	"reflect"
+	"slices"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
 	"unicode"
 	"unicode/utf8"
-
-	"golang.org/x/exp/slices"
-	"golang.org/x/exp/slog"
 )
 
 // Handler implements a [slog.Handler] that can produce a variety of output

handlers/general/general_handler_test.go

@@ -4,11 +4,10 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"log/slog"
 	"strings"
 	"testing"
 	"time"
-
-	"golang.org/x/exp/slog"
 )
 
 type Attr = slog.Attr
@@ -111,7 +110,7 @@ func TestHandler(t *testing.T) {
 			replace:  removeKeys(slog.TimeKey, slog.LevelKey),
 			attrs:    []Attr{slog.Group("g"), slog.Group("h", slog.Int("a", 1))},
 			wantText: "msg=message h.a=1",
-			wantJSON: `{"msg":"message","g":{},"h":{"a":1}}`,
+			wantJSON: `{"msg":"message","h":{"a":1}}`,
 		},
 		{
 			name:     "inline group",

handlers/loghandler/log_handler.go

@@ -5,12 +5,11 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"log/slog"
 	"runtime"
 	"strconv"
 	"sync"
 	"time"
-
-	"golang.org/x/exp/slog"
 )
 
 type Handler struct {

handlers/loghandler/log_handler_test.go

@@ -4,10 +4,9 @@ import (
 	"bytes"
 	"context"
 	"io"
+	"log/slog"
 	"testing"
 	"time"
-
-	"golang.org/x/exp/slog"
 )
 
 var testTime = time.Date(2023, time.April, 3, 1, 2, 3, 0, time.UTC)

handlers/simple/simple_handler.go

@@ -2,10 +2,10 @@ package simple
 
 import (
 	"context"
+	"log/slog"
+	"slices"
 
 	"github.com/jba/slog/withsupport"
-	"golang.org/x/exp/slices"
-	"golang.org/x/exp/slog"
 )
 
 func Handler(handle func(slog.Record) error, opts slog.HandlerOptions) slog.Handler {

handlers/simple/simple_handler_test.go

@@ -4,9 +4,8 @@ import (
 	"bytes"
 	"fmt"
 	"io"
+	"log/slog"
 	"testing"
-
-	"golang.org/x/exp/slog"
 )
 
 func newHandle(w io.Writer) func(slog.Record) error {

trace/trace_test.go

@@ -2,9 +2,8 @@ package trace
 
 import (
 	"context"
+	"log/slog"
 	"testing"
-
-	"golang.org/x/exp/slog"
 )
 
 func Test(t *testing.T) {

verbosity/verbosity.go

@@ -6,7 +6,7 @@
 //	Level = INFO - verbosity
 package verbosity
 
-import "golang.org/x/exp/slog"
+import "log/slog"
 
 // ToLevel converts a verbosity to a Level.
 func ToLevel(verbosity int) slog.Level {

verbosity/verbosity_test.go

@@ -3,7 +3,7 @@ package verbosity
 import (
 	"testing"
 
-	"golang.org/x/exp/slog"
+	"log/slog"
 )
 
 func TestToLevel(t *testing.T) {

withsupport/withsupport.go

@@ -2,7 +2,7 @@
 // Handler.WithGroup.
 package withsupport
 
-import "golang.org/x/exp/slog"
+import "log/slog"
 
 // GroupOrAttrs holds either a group name or a list of slog.Attrs.
 type GroupOrAttrs struct {

withsupport/withsupport_test.go

@@ -5,11 +5,11 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"log/slog"
 	"strings"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	"golang.org/x/exp/slog"
 )
 
 type handler struct {