From 53fa067da6f96f24abaa6cfb905de32107264d49 Mon Sep 17 00:00:00 2001 From: Artem Zavatskiy Date: Tue, 28 Apr 2020 16:03:38 +0300 Subject: [PATCH 1/2] query-frontend: fix trace propagation when downstream_url is specified (#2538) Signed-off-by: Artem Zavatskiy --- CHANGELOG.md | 1 + pkg/querier/frontend/frontend.go | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf80f6bb201..65caf6bd985 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,6 +52,7 @@ * [BUGFIX] Distributor: `/all_user_stats` now show API and Rule Ingest Rate correctly. #2457 * [BUGFIX] Fixed `version`, `revision` and `branch` labels exported by the `cortex_build_info` metric. #2468 * [BUGFIX] QueryFrontend: fixed a situation where HTTP error is ignored and an incorrect status code is set. #2483 +* [BUGFIX] QueryFrontend: fixed a situation where span context missed when downstream_url is used. #2538 ## 1.0.0 / 2020-04-02 diff --git a/pkg/querier/frontend/frontend.go b/pkg/querier/frontend/frontend.go index a59443f8b04..19e323c743b 100644 --- a/pkg/querier/frontend/frontend.go +++ b/pkg/querier/frontend/frontend.go @@ -111,6 +111,11 @@ func New(cfg Config, log log.Logger, registerer prometheus.Registerer) (*Fronten } f.roundTripper = RoundTripFunc(func(r *http.Request) (*http.Response, error) { + tracer, span := opentracing.GlobalTracer(), opentracing.SpanFromContext(r.Context()) + if tracer != nil && span != nil { + carrier := opentracing.HTTPHeadersCarrier(r.Header) + tracer.Inject(span.Context(), opentracing.HTTPHeaders, carrier) + } r.URL.Scheme = u.Scheme r.URL.Host = u.Host r.URL.Path = path.Join(u.Path, r.URL.Path) From 1349984b8e50da26c88dfd1221e4bcfd56fc8a94 Mon Sep 17 00:00:00 2001 From: Marco Pracucci Date: Tue, 28 Apr 2020 16:09:12 +0200 Subject: [PATCH 2/2] Update CHANGELOG.md Signed-off-by: Marco Pracucci --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65caf6bd985..3fbc3312afa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,7 +52,7 @@ * [BUGFIX] Distributor: `/all_user_stats` now show API and Rule Ingest Rate correctly. #2457 * [BUGFIX] Fixed `version`, `revision` and `branch` labels exported by the `cortex_build_info` metric. #2468 * [BUGFIX] QueryFrontend: fixed a situation where HTTP error is ignored and an incorrect status code is set. #2483 -* [BUGFIX] QueryFrontend: fixed a situation where span context missed when downstream_url is used. #2538 +* [BUGFIX] QueryFrontend: fixed a situation where span context missed when downstream_url is used. #2539 ## 1.0.0 / 2020-04-02