Merge pull request #379 from askuy/feature/tracebycontextvalue

fix header value
gotomicro · May 5, 2024 · 548d2b5 · 548d2b5
2 parents b458510 + 1ac0025
commit 548d2b5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/server/egin/interceptor.go b/server/egin/interceptor.go
@@ -136,6 +136,7 @@ func (c *Container) defaultServerInterceptor() gin.HandlerFunc {
 		var event = "normal"
 
 		// 必须在defer外层，因为要赋值，替换ctx
+		// 只有在环境变量里的自定义header，才会写入到context value里
 		for _, key := range loggerKeys {
 			// 赋值context
 			getHeaderValue(ctx, key, c.config.EnableTrustedCustomHeader)
@@ -416,13 +417,7 @@ func getHeaderValue(c *gin.Context, key string, enableTrustedCustomHeader bool)
 	value := c.GetHeader(key)
 	if value != "" {
 		// 如果信任该Header，将header数据赋值到context上
-		for _, customContextKey := range transport.CustomContextKeys() {
-			// 如果header key和自定义key是一样的，写入到contet value中
-			if customContextKey == key {
-				c.Request = c.Request.WithContext(transport.WithValue(c.Request.Context(), key, value))
-			}
-		}
-
+		c.Request = c.Request.WithContext(transport.WithValue(c.Request.Context(), key, value))
 	}
 	return value
 }

diff --git a/server/egrpc/interceptor.go b/server/egrpc/interceptor.go
@@ -236,16 +236,10 @@ func (c *Container) defaultUnaryServerInterceptor() grpc.UnaryServerInterceptor
 		var event = "normal"
 
 		// 必须在defer外层，因为要赋值，替换ctx
+		// 只有在环境变量里的自定义header，才会写入到context value里
 		for _, key := range loggerKeys {
 			if value := tools.GrpcHeaderValue(ctx, key); value != "" {
-				// 如果信任该Header，将header数据赋值到context上
-				for _, customContextKey := range transport.CustomContextKeys() {
-					// 如果header key和自定义key是一样的，写入到contet value中
-					if customContextKey == key {
-						ctx = transport.WithValue(ctx, key, value)
-					}
-				}
-
+				ctx = transport.WithValue(ctx, key, value)
 			}
 		}