-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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
QFE: pass "stats" parameter to queriers, fix prometheus stats merging #7852
Merged
saswatamcode
merged 1 commit into
thanos-io:main
from
pedro-stanaka:fix/qfe-merge-stats
Oct 22, 2024
Merged
QFE: pass "stats" parameter to queriers, fix prometheus stats merging #7852
saswatamcode
merged 1 commit into
thanos-io:main
from
pedro-stanaka:fix/qfe-merge-stats
Oct 22, 2024
+218
−108
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pedro-stanaka
force-pushed
the
fix/qfe-merge-stats
branch
from
October 21, 2024 15:51
ca8b1d1
to
4ea012d
Compare
fpetkovski
previously approved these changes
Oct 21, 2024
If a querier sees a "stats" parameter in the query request, it will attach important information about the query execution to the response. But currently, even if an user sets this value, the Query Frontend will lose this value in its middleware/roundtrippers. This PR fixes this problem by properly encoding/decoding the requests in QFE. Signed-off-by: Pedro Tanaka <pedro.tanaka@shopify.com>
pedro-stanaka
force-pushed
the
fix/qfe-merge-stats
branch
from
October 21, 2024 17:54
4ea012d
to
d4c57d7
Compare
saswatamcode
approved these changes
Oct 22, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
Reimirno
pushed a commit
to Reimirno/thanos
that referenced
this pull request
Oct 22, 2024
If a querier sees a "stats" parameter in the query request, it will attach important information about the query execution to the response. But currently, even if an user sets this value, the Query Frontend will lose this value in its middleware/roundtrippers. This PR fixes this problem by properly encoding/decoding the requests in QFE. Signed-off-by: Pedro Tanaka <pedro.tanaka@shopify.com> Signed-off-by: Yu Long <yu.long@databricks.com>
saswatamcode
pushed a commit
that referenced
this pull request
Oct 23, 2024
* UI: Select time range with mouse drag Signed-off-by: Yu Long <yu.long@databricks.com> * QueryFrontend: pass "stats" parameter forward (#7852) If a querier sees a "stats" parameter in the query request, it will attach important information about the query execution to the response. But currently, even if an user sets this value, the Query Frontend will lose this value in its middleware/roundtrippers. This PR fixes this problem by properly encoding/decoding the requests in QFE. Signed-off-by: Pedro Tanaka <pedro.tanaka@shopify.com> Signed-off-by: Yu Long <yu.long@databricks.com> * build(deps): bump go.opentelemetry.io/otel/bridge/opentracing (#7851) Bumps [go.opentelemetry.io/otel/bridge/opentracing](https://github.com/open-telemetry/opentelemetry-go) from 1.29.0 to 1.31.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go@v1.29.0...v1.31.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel/bridge/opentracing dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: Yu Long <yu.long@databricks.com> * Update CHANGELOG Signed-off-by: Yu Long <yu.long@databricks.com> * Apply fix to linter error (from orig prom PR) Signed-off-by: Yu Long <yu.long@databricks.com> * Fix not-null assertion bug from orig PR Signed-off-by: Yu Long <yu.long@databricks.com> * Commit generated files Signed-off-by: Yu Long <yu.long@databricks.com> * Fix unit test Signed-off-by: Yu Long <yu.long@databricks.com> --------- Signed-off-by: Yu Long <yu.long@databricks.com> Signed-off-by: Pedro Tanaka <pedro.tanaka@shopify.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Yu Long <yu.long@databricks.com> Co-authored-by: Pedro Tanaka <pedro.tanaka@shopify.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If a querier sees a "stats" parameter in the query request, it will attach important information about the query execution to the response.
But currently, even if an user sets this value, the Query Frontend will lose this value in its middleware/roundtrippers.
This PR fixes this problem by properly encoding/decoding the requests in QFE. Moreover, this PR also fixes the problem where Thanos does not know about the field "peakSamples" in the stats response from Prometheus. This field was added a while ago, but the protobuf on thanos side was never changed.
Verification
Updated tests, and tested locally: