[refactor] Remove jaeger_query extension from remote storage backend config
#7059
Conversation
This file contains hidden or 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
Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #7059 +/- ##
=======================================
Coverage 96.03% 96.03%
=======================================
Files 355 355
Lines 20973 20973
=======================================
Hits 20141 20141
Misses 626 626
Partials 206 206
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
yurishkuro
reviewed
Apr 20, 2025
| EnvVarOverrides: map[string]string{ | ||
| "JAEGER_QUERY_GRPC_ENDPOINT": "localhost:0", | ||
| "JAEGER_QUERY_HTTP_ENDPOINT": "localhost:0", | ||
| }, |
There was a problem hiding this comment.
Why isn't this needed? The main collector config has query in it, and query config also has it, they would cause conflicts.
There was a problem hiding this comment.
@yurishkuro This is using the remote storage backend which removes the query service
There was a problem hiding this comment.
ah... we definitely need the diagrams, you changed how query test is architected - the "backend" acts as both collector and the remote storage (clever!)
There was a problem hiding this comment.
Hahah yeah I had to move those around in the last PR. And yes absolutely - will address in #7055
yurishkuro
approved these changes
Apr 20, 2025
amilbcahat
pushed a commit
to amilbcahat/jaeger
that referenced
this pull request
May 4, 2025
…d config (jaegertracing#7059) ## Which problem is this PR solving? - Resolves jaegertracing#7058 ## Description of the changes - The `jaeger_query` extension was previously added to `config-remote-storage-backend.yaml` solely to satisfy a requirement in the storage cleaner setup, even though it was otherwise unnecessary. - This PR removes that dependency by relaxing the logic that creates the storage cleaner configuration. Instead of requiring `jaeger_query`, the code now first attempts to read the storage from the `jaeger_query` extension if available, and falls back to the `remote_storage` extension if it is not. ## How was this change tested? - CI ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [x] I have added unit tests for the new functionality - [x] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `npm run lint` and `npm run test` --------- Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
amilbcahat
pushed a commit
to amilbcahat/jaeger
that referenced
this pull request
May 4, 2025
…d config (jaegertracing#7059) ## Which problem is this PR solving? - Resolves jaegertracing#7058 ## Description of the changes - The `jaeger_query` extension was previously added to `config-remote-storage-backend.yaml` solely to satisfy a requirement in the storage cleaner setup, even though it was otherwise unnecessary. - This PR removes that dependency by relaxing the logic that creates the storage cleaner configuration. Instead of requiring `jaeger_query`, the code now first attempts to read the storage from the `jaeger_query` extension if available, and falls back to the `remote_storage` extension if it is not. ## How was this change tested? - CI ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [x] I have added unit tests for the new functionality - [x] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `npm run lint` and `npm run test` --------- Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com> Signed-off-by: amol-verma-allen <amol.verma@allen.in>
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.
Which problem is this PR solving?
Description of the changes
jaeger_queryextension was previously added toconfig-remote-storage-backend.yamlsolely to satisfy a requirement in the storage cleaner setup, even though it was otherwise unnecessary.jaeger_query, the code now first attempts to read the storage from thejaeger_queryextension if available, and falls back to theremote_storageextension if it is not.How was this change tested?
Checklist
jaeger:make lint testjaeger-ui:npm run lintandnpm run test