New internal query result payload format: add support for remote rule evaluation path #4331
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
charleskorn
commented
Mar 1, 2023
pkg/ruler/remotequerier.go
Outdated
| return decodeQueryResponse(valTyp, res) | ||
| level.Debug(logger).Log("msg", "query expression successfully evaluated", "qs", query, "tm", ts) | ||
|
|
||
| contentTypeHeader := getHeader(resp, "Content-Type") |
There was a problem hiding this comment.
Note to reviewers: the query-frontend has always set Content-Type to application/json, so checking it like this with no fallback does not introduce any backwards-compatibility issues.
24 tasks
charleskorn
commented
Mar 1, 2023
charleskorn
force-pushed
the
charleskorn/new-query-result-format-in-ruler
branch
5 times, most recently
from
499aa59
to
3f8d9fb
Compare
charleskorn
force-pushed
the
charleskorn/new-query-result-format-in-ruler
branch
from
9046553
to
4e5d9ed
Compare
charleskorn
changed the title
charleskorn
force-pushed
the
charleskorn/new-query-result-format-in-ruler
branch
from
4e5d9ed
to
f657daa
Compare
charleskorn
force-pushed
the
charleskorn/new-query-result-format-in-ruler
branch
from
9311830
to
f52aa61
Compare
…sult payload format from query-frontends.
# Conflicts: # CHANGELOG.md
…ad format in the query-frontend.
Co-authored-by: Marco Pracucci <marco@pracucci.com>
charleskorn
force-pushed
the
charleskorn/new-query-result-format-in-ruler
branch
from
712a9a1
to
285b4b2
Compare
|
This PR should be good to go now, and now targets |
pracucci
approved these changes
Mar 8, 2023
| @@ -1571,6 +1571,11 @@ query_frontend: | |||
| # ruler.query-frontend.grpc-client-config | |||
| [grpc_client_config: <grpc_client>] | |||
|
|
|||
| # (experimental) Format to use when retrieving query results from | |||
| # query-frontends. Supported values: json, protobuf | |||
| # CLI flag: -ruler.query-frontend.query-result-response-format | |||
There was a problem hiding this comment.
Can you also mention it in the list of experimental features under docs/sources/mimir/operators-guide/configure/about-versioning.md? It's non blocking, you can do it in a follow up PR too.
There was a problem hiding this comment.
Good catch, I've created #4429 to do this.
osg-grafana
pushed a commit
that referenced
this pull request
Mar 9, 2023
… evaluation path (#4331) * Push decodeQueryResponse into query. * Extract createRequest method. * Extract JSON decoding to its own type. * Select decoder based on response content type. * Add configuration flag to enable requesting the new internal query result payload format from query-frontends. * Send appropriate Accept header based on configured format. * Add support for decoding responses sent in protobuf format. * Update changelog. # Conflicts: # CHANGELOG.md * Fix typo in comment. * Add support for encoding responses in the protobuf query result payload format in the query-frontend. * Refactor integration test to run a new ruler instance for each test case. * Add integration test for use of protobuf format between ruler and query-frontend. * Add benchmark. * Implement content negotiation correctly. * Rename types. * Address PR feedback: fix typos Co-authored-by: Marco Pracucci <marco@pracucci.com> * Address PR feedback: no need to take receiver * Address PR feedback: take MIME types from decoders. * Address PR feedback: rename `defaultFormatter` * Fix issue introduced during rebase on `main`. --------- Co-authored-by: Marco Pracucci <marco@pracucci.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.
What this PR does
This PR adds support for decoding the new internal query result payload format in the ruler, and encoding it in the query-frontend to send to rulers.
Which issue(s) this PR fixes or relates to
#4104
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]