chore(trace): add trace ID and span ID

Signed-off-by: Bo-Yi.Wu <[email protected]>
gin-contrib · Sep 18, 2022 · 1a33159 · 1a33159
1 parent 6278943
commit 1a33159
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -76,11 +76,17 @@ func main() {
     return "foobar"
   })), logger.SetLogger(
     logger.WithLogger(func(c *gin.Context, l zerolog.Logger) zerolog.Logger {
+      if trace.SpanFromContext(c.Request.Context()).SpanContext().IsValid() {
+        l = l.With().
+          Str("trace_id", trace.SpanFromContext(c.Request.Context()).SpanContext().TraceID().String()).
+          Str("span_id", trace.SpanFromContext(c.Request.Context()).SpanContext().SpanID().String()).
+          Logger()
+      }
+
       return l.With().
         Str("id", requestid.Get(c)).
         Str("foo", "bar").
         Str("path", c.Request.URL.Path).
-        Str("traceID", trace.SpanFromContext(c.Request.Context()).SpanContext().TraceID().String()).
         Logger()
     }),
   ), func(c *gin.Context) {

diff --git a/_example/main.go b/_example/main.go
@@ -64,11 +64,17 @@ func main() {
 		return "foobar"
 	})), logger.SetLogger(
 		logger.WithLogger(func(c *gin.Context, l zerolog.Logger) zerolog.Logger {
+			if trace.SpanFromContext(c.Request.Context()).SpanContext().IsValid() {
+				l = l.With().
+					Str("trace_id", trace.SpanFromContext(c.Request.Context()).SpanContext().TraceID().String()).
+					Str("span_id", trace.SpanFromContext(c.Request.Context()).SpanContext().SpanID().String()).
+					Logger()
+			}
+
 			return l.With().
 				Str("id", requestid.Get(c)).
 				Str("foo", "bar").
 				Str("path", c.Request.URL.Path).
-				Str("traceID", trace.SpanFromContext(c.Request.Context()).SpanContext().TraceID().String()).
 				Logger()
 		}),
 	), func(c *gin.Context) {