Skip to content
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.

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

Fix issue where querier trace spans are not nested correctly #6893

Merged
merged 2 commits into from
Dec 12, 2023

Conversation

charleskorn
Copy link
Contributor

@charleskorn charleskorn commented Dec 12, 2023

What this PR does

This PR fixes #5341: trace spans created by queriers are not nested correctly.

Before this change:

Before

After this change:

After

Note that the HTTP GET - prometheus_api_v1_query_range span is nested under the querier_processor_runRequest span.

The duplicate HTTP GET - prometheus_api_v1_query_range spans are a separate issue, I suspect this was introduced by grafana/dskit#372.

Which issue(s) this PR fixes or relates to

Resolves #5341

Checklist

  • [n/a] Tests updated.
  • [n/a] Documentation added.
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX].
  • [n/a] about-versioning.md updated with experimental features.

@charleskorn charleskorn marked this pull request as ready for review December 12, 2023 02:58
@charleskorn charleskorn requested a review from a team as a code owner December 12, 2023 02:58
@krajorama krajorama self-requested a review December 12, 2023 07:35
Copy link
Collaborator

@pracucci pracucci left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@krajorama krajorama removed their request for review December 12, 2023 08:31
@charleskorn charleskorn merged commit e408c59 into main Dec 12, 2023
28 checks passed
@charleskorn charleskorn deleted the charleskorn/nest-query-trace-span branch December 12, 2023 08:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Querier query-frontend processing loop spans aren't nested correctly
2 participants