zhangdeman/gin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: update trquest_id trace_id

Browse Source
This commit is contained in:
白茶清欢
2025-10-26 14:08:16 +08:00
parent 561ba88bc9
commit 1a4665dffb
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
middleware/init_request.go
View File

@ -28,8 +28,8 @@ import (
func InitRequest() gin.HandlerFunc { func InitRequest() gin.HandlerFunc {
return func(ctx *gin.Context) { return func(ctx *gin.Context) {
httpHandleConfig := define.GetHttpHandleConfig() httpHandleConfig := define.GetHttpHandleConfig()
traceID := getTraceID(ctx) requestID := getRequestID(ctx)
requestID := getRequestID(ctx, traceID) traceID := getTraceID(ctx, requestID)
ctx.Set(httpHandleConfig.TraceIDField, traceID) ctx.Set(httpHandleConfig.TraceIDField, traceID)
ctx.Set(httpHandleConfig.RequestIDField, requestID) ctx.Set(httpHandleConfig.RequestIDField, requestID)
ctx.Set(httpHandleConfig.StartRequestTimeField, time.Now().UnixMilli()) ctx.Set(httpHandleConfig.StartRequestTimeField, time.Now().UnixMilli())
@ -37,12 +37,12 @@ func InitRequest() gin.HandlerFunc {
} }
} }
// getTraceID 生成traceID // getRequestID 生成 request id
// //
// Author : go_developer@163.com<白茶清欢> // Author : go_developer@163.com<白茶清欢>
// //
// Date : 23:12 2022/6/25 // Date : 23:12 2022/6/25
func getTraceID(ctx *gin.Context) string { func getRequestID(ctx *gin.Context) string {
return fmt.Sprintf( return fmt.Sprintf(
"%v-%v-%v-%v", "%v-%v-%v-%v",
time.Now().UnixNano()/1e6, time.Now().UnixNano()/1e6,
@ -52,18 +52,18 @@ func getTraceID(ctx *gin.Context) string {
) )
} }
// getRequestID 生成requestID // getTraceID 生成 trace id
// //
// Author : go_developer@163.com<白茶清欢> // Author : go_developer@163.com<白茶清欢>
// //
// Date : 23:12 2022/6/25 // Date : 23:12 2022/6/25
func getRequestID(ctx *gin.Context, traceID string) string { func getTraceID(ctx *gin.Context, requestID string) string {
requestID := ctx.GetHeader("X-Forward-Request-Id") traceID := ctx.GetHeader("X-Forward-Trace-Id")
if len(requestID) > 0 {
return requestID
}
if len(traceID) > 0 { if len(traceID) > 0 {
return traceID return traceID
} }
return getTraceID(ctx) if len(requestID) > 0 {
return requestID
}
return getRequestID(ctx)
} }

2
util/context.go
View File

@ -29,7 +29,7 @@ func GinCtxToContext(ctx *gin.Context) context.Context {
requestData[fmt.Sprintf("%v", k)] = v requestData[fmt.Sprintf("%v", k)] = v
} }
if nil != ctx.Request { if nil != ctx.Request {
requestData[consts.GinRequestURIField] = ctx.Request.RequestURI requestData[consts.GinRequestURIField] = ctx.Request.URL.Path
requestData[consts.GinRequestMethodField] = ctx.Request.Method requestData[consts.GinRequestMethodField] = ctx.Request.Method
} }