From 8499187315cbd91cd97db3613829ddf1ada24451 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Thu, 12 Aug 2021 12:13:52 +0200 Subject: [PATCH] add x-request-id to proxy root span --- proxy/pkg/proxy/proxy.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/proxy/pkg/proxy/proxy.go b/proxy/pkg/proxy/proxy.go index b047ec53ce..cd77678213 100644 --- a/proxy/pkg/proxy/proxy.go +++ b/proxy/pkg/proxy/proxy.go @@ -11,6 +11,8 @@ import ( "strings" "time" + "go.opentelemetry.io/otel/attribute" + "github.com/owncloud/ocis/ocis-pkg/log" pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing" "github.com/owncloud/ocis/proxy/pkg/config" @@ -224,6 +226,12 @@ func (p *MultiHostReverseProxy) ServeHTTP(w http.ResponseWriter, r *http.Request ctx, span = tracer.Start(ctx, fmt.Sprintf("%s %v", r.Method, r.URL.Path)) defer span.End() + span.SetAttributes( + attribute.KeyValue{ + Key: "x-request-id", + Value: attribute.StringValue(r.Header.Get("X-Request-ID")), + }) + pkgtrace.Propagator.Inject(ctx, propagation.HeaderCarrier(r.Header)) p.ReverseProxy.ServeHTTP(w, r.WithContext(ctx))