From 5c024b4543600e5da3b06c5037219b4e796af09a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Mon, 5 Jul 2021 15:43:50 +0200 Subject: [PATCH] use context from middleware in proxy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- proxy/pkg/proxy/proxy.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/proxy/pkg/proxy/proxy.go b/proxy/pkg/proxy/proxy.go index b4871617a1..0d4e9cfd79 100644 --- a/proxy/pkg/proxy/proxy.go +++ b/proxy/pkg/proxy/proxy.go @@ -1,7 +1,6 @@ package proxy import ( - "context" "crypto/tls" "net" "net/http" @@ -213,12 +212,12 @@ func (p *MultiHostReverseProxy) AddHost(policy string, target *url.URL, rt confi } func (p *MultiHostReverseProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) { - ctx := context.Background() + ctx := r.Context() var span *trace.Span // Start root span. if p.config.Tracing.Enabled { - ctx, span = trace.StartSpan(context.Background(), r.URL.String()) + ctx, span = trace.StartSpan(ctx, r.URL.String()) defer span.End() p.propagator.SpanContextToRequest(span.SpanContext(), r) }