Skip to content

query-frontend: fix trace propagation when downstream_url is specifie… #2539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 28, 2020
Merged

query-frontend: fix trace propagation when downstream_url is specifie… #2539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53fa067
query-frontend: fix trace propagation when downstream_url is specifie…
Apr 28, 2020
1349984
Update CHANGELOG.md
pracucci Apr 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. #2539

## 1.0.0 / 2020-04-02

Expand Down
5 changes: 5 additions & 0 deletions pkg/querier/frontend/frontend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down