tracing: add TraceID to logs

cernbox · Oct 10, 2022 · 35e6f41 · 35e6f41
1 parent aca9656
commit 35e6f41
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/internal/grpc/interceptors/appctx/appctx.go b/internal/grpc/interceptors/appctx/appctx.go
@@ -35,7 +35,7 @@ func NewUnary(log zerolog.Logger) grpc.UnaryServerInterceptor {
 		ctx, span := tracing.SpanStartFromContext(ctx, tracerName, "appctx UnaryServerInterceptor")
 		defer span.End()
 
-		sub := log.With().Logger()
+		sub := log.With().Str("TraceID", span.SpanContext().TraceID().String()).Logger()
 		ctx = appctx.WithLogger(ctx, &sub)
 		res, err := handler(ctx, req)
 		return res, err
@@ -51,7 +51,7 @@ func NewStream(log zerolog.Logger) grpc.StreamServerInterceptor {
 		ctx, span := tracing.SpanStartFromContext(ctx, tracerName, "appctx StreamServerInterceptor")
 		defer span.End()
 
-		sub := log.With().Logger()
+		sub := log.With().Str("TraceID", span.SpanContext().TraceID().String()).Logger()
 		ctx = appctx.WithLogger(ctx, &sub)
 
 		wrapped := newWrappedServerStream(ctx, ss)

diff --git a/internal/http/interceptors/appctx/appctx.go b/internal/http/interceptors/appctx/appctx.go
@@ -47,7 +47,7 @@ func handler(log zerolog.Logger, h http.Handler) http.Handler {
 		defer span.End()
 
 		ctx := r.Context()
-		sub := log.With().Logger()
+		sub := log.With().Str("TraceID", span.SpanContext().TraceID().String()).Logger()
 		ctx = appctx.WithLogger(ctx, &sub)
 		r = r.WithContext(ctx)
 		h.ServeHTTP(w, r)