- 调整 `slog`

README.md

@@ -13,5 +13,5 @@
 #### 安装
 
 ```shell
-go get -v -u go.dtapp.net/gotrace_id@v1.0.10
+go get -v -u go.dtapp.net/gotrace_id@v1.0.11
 ```

const.go

@@ -2,12 +2,6 @@ package gotrace_id
 
 const Nil = "%!s(<nil>)"
 
-type ctxKey string
-
-const (
-	SlogFields ctxKey = "slog_fields"
-)
-
 const (
 	TraceIdKey        = "trace_id"
 	TraceIdGinKey     = "trace_id"

context.go

@@ -5,68 +5,23 @@ import (
 	"fmt"
 	"github.com/gin-gonic/gin"
 	"go.dtapp.net/gostring"
-	"log/slog"
 )
 
 // CustomTraceIdContext 自定义设置跟踪编号上下文
 func CustomTraceIdContext(ctx context.Context) context.Context {
-
-	if ctx == nil {
-		ctx = context.Background()
-	}
-
 	var traceId = gostring.GetUuId()
-
+	return context.WithValue(ctx, TraceIdKey, traceId)
-	// slog
-	if v, ok := ctx.Value(SlogFields).([]slog.Attr); ok {
-		v = append(v, slog.String(TraceIdKey, traceId))
-		return context.WithValue(ctx, SlogFields, v)
-	}
-
-	var v []slog.Attr
-	v = append(v, slog.String(TraceIdKey, traceId))
-
-	return context.WithValue(context.WithValue(ctx, SlogFields, v), TraceIdKey, traceId)
 }
 
 // SetCustomTraceId 自定义设置跟踪编号上下文
 func SetCustomTraceId(ctx context.Context, traceId string) context.Context {
-
+	return context.WithValue(ctx, TraceIdKey, traceId)
-	if ctx == nil {
-		ctx = context.Background()
-	}
-
-	// slog
-	if v, ok := ctx.Value(SlogFields).([]slog.Attr); ok {
-		v = append(v, slog.String(TraceIdKey, traceId))
-		return context.WithValue(ctx, SlogFields, v)
-	}
-
-	var v []slog.Attr
-	v = append(v, slog.String(TraceIdKey, traceId))
-
-	return context.WithValue(context.WithValue(ctx, SlogFields, v), TraceIdKey, traceId)
 }
 
 // SetGinTraceIdContext 设置跟踪编号上下文
 func SetGinTraceIdContext(ctx context.Context, c *gin.Context) context.Context {
-
-	if ctx == nil {
-		ctx = context.Background()
-	}
-
 	var traceId = GetGinTraceId(c)
-
+	return context.WithValue(ctx, TraceIdKey, traceId)
-	// slog
-	if v, ok := ctx.Value(SlogFields).([]slog.Attr); ok {
-		v = append(v, slog.String(TraceIdKey, traceId))
-		return context.WithValue(ctx, SlogFields, v)
-	}
-
-	var v []slog.Attr
-	v = append(v, slog.String(TraceIdKey, traceId))
-
-	return context.WithValue(context.WithValue(ctx, SlogFields, v), TraceIdKey, traceId)
 }
 
 // GetTraceIdContext 通过上下文获取跟踪编号

context_test.go

@@ -12,4 +12,7 @@ func TestContext(t *testing.T) {
 	ctx2 := context.Background()
 	t.Log(ctx2)
 	t.Log(GetTraceIdContext(ctx2))
+	ctx3 := SetCustomTraceId(context.Background(), "23456")
+	t.Log(ctx3)
+	t.Log(GetTraceIdContext(ctx3))
 }

version.go

@@ -1,3 +1,3 @@
 package gotrace_id
 
-const Version = "1.0.10"
+const Version = "1.0.11"