From 0b5720faa548269c865941c384956ba45e98f015 Mon Sep 17 00:00:00 2001 From: Matthew Penner Date: Wed, 8 May 2024 16:40:40 -0600 Subject: [PATCH] tracing: add trace_id var (`http.vars.trace_id` placeholder) (#6308) --- modules/caddyhttp/tracing/tracer.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/caddyhttp/tracing/tracer.go b/modules/caddyhttp/tracing/tracer.go index ecd415fa..89c617bf 100644 --- a/modules/caddyhttp/tracing/tracer.go +++ b/modules/caddyhttp/tracing/tracer.go @@ -87,8 +87,12 @@ func (ot *openTelemetryWrapper) serveHTTP(w http.ResponseWriter, r *http.Request ot.propagators.Inject(ctx, propagation.HeaderCarrier(r.Header)) spanCtx := trace.SpanContextFromContext(ctx) if spanCtx.IsValid() { + traceID := spanCtx.TraceID().String() + // Add a trace_id placeholder, accessible via `{http.vars.trace_id}`. + caddyhttp.SetVar(ctx, "trace_id", traceID) + // Add the trace id to the log fields for the request. if extra, ok := ctx.Value(caddyhttp.ExtraLogFieldsCtxKey).(*caddyhttp.ExtraLogFields); ok { - extra.Add(zap.String("traceID", spanCtx.TraceID().String())) + extra.Add(zap.String("traceID", traceID)) } } next := ctx.Value(nextCallCtxKey).(*nextCall)