Commit 406476f

mo khan <mo@mokhan.ca>
2025-04-03 14:25:43
refactor: remove slog-http
1 parent de548af
Changed files (4)
pkg/cfg/mux.go
@@ -2,16 +2,10 @@ package cfg
 
 import (
 	"net/http"
-
-	sloghttp "github.com/samber/slog-http"
-	xlog "gitlab.com/mokhax/spike/pkg/log"
 )
 
 func WithMux(mux http.Handler) Option {
 	return func(config *Config) {
-		config.Mux = sloghttp.NewWithConfig(xlog.Logger, sloghttp.Config{
-			WithSpanID:  true,
-			WithTraceID: true,
-		})(sloghttp.Recovery(mux))
+		config.Mux = mux
 	}
 }
pkg/log/init.go
@@ -1,12 +1,12 @@
 package log
 
 import (
+	"fmt"
 	"log"
 	"log/slog"
 	"net/http"
 	"os"
 
-	sloghttp "github.com/samber/slog-http"
 	"github.com/xlgmokha/x/pkg/env"
 )
 
@@ -24,6 +24,7 @@ type Fields map[string]interface{}
 
 func WithFields(r *http.Request, fields Fields) {
 	for key, value := range fields {
-		sloghttp.AddCustomAttributes(r, slog.Any(key, value))
+		attr := slog.String(key, fmt.Sprintf("%v", value))
+		Logger.LogAttrs(r.Context(), slog.LevelDebug, "x", attr)
 	}
 }
go.mod
@@ -8,7 +8,6 @@ require (
 	github.com/lestrrat-go/jwx/v3 v3.0.0-alpha3
 	github.com/magefile/mage v1.15.0
 	github.com/playwright-community/playwright-go v0.5001.0
-	github.com/samber/slog-http v1.6.0
 	github.com/stretchr/testify v1.10.0
 	github.com/xlgmokha/x v0.0.0-20240605230110-5cbcac4d8ff8
 	golang.org/x/oauth2 v0.28.0
go.sum
@@ -403,8 +403,6 @@ github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
 github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
-github.com/samber/slog-http v1.6.0 h1:+rD5QtOWGTcFT7jq8Yf0EgGy87krv0pcgh9jtWkrqjQ=
-github.com/samber/slog-http v1.6.0/go.mod h1:PAcQQrYFo5KM7Qbk50gNNwKEAMGCyfsw6GN5dI0iv9g=
 github.com/schollz/jsonstore v1.1.0 h1:WZBDjgezFS34CHI+myb4s8GGpir3UMpy7vWoCeO0n6E=
 github.com/schollz/jsonstore v1.1.0/go.mod h1:15c6+9guw8vDRyozGjN3FoILt0wpruJk9Pi66vjaZfg=
 github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys=