chore/platform: update docker-compose to support jaeger 2.16 config#1369
Merged
chore/platform: update docker-compose to support jaeger 2.16 config#1369
Conversation
loujar
approved these changes
Mar 19, 2026
Chickensoupwithrice
approved these changes
Mar 19, 2026
Collaborator
|
The backport to To backport this PR manually, you can either: Via the sg toolUse the sg backport -r 7.1.x -p 1369Via your terminalTo backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-7.1.x 7.1.x
# Navigate to the new working tree
cd .worktrees/backport-7.1.x
# Create a new branch
git switch --create backport-1369-to-7.1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 513fd6ce2e7e7af445418e00824958a7c8381eba
# Push it to GitHub
git push --set-upstream origin backport-1369-to-7.1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-7.1.xIf you encouter conflict, first resolve the conflict and stage all files, then run the commands below: git cherry-pick --continue
# Push it to GitHub
git push --set-upstream origin backport-1369-to-7.1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-7.1.x
Once the pull request has been created, please ensure the following:
|
3 tasks
DaedalusG
added a commit
that referenced
this pull request
Mar 19, 2026
…ger 2.16 config (#1370) Backport 513fd6c from #1369 closes PLAT-487 Update manifests to support 2.16 jaeger configurations style This follows changes to the sourcegraph jaeger base image sourcegraph/sourcegraph#10912 ### Checklist * [ ] Sister [deploy-sourcegraph](https://github.com/sourcegraph/deploy-sourcegraph) change: * [ ] Sister [customer-replica](https://github.com/sourcegraph/deploy-sourcegraph-docker-customer-replica-1) change (if necessary, for any changes affecting pure-docker or configuration): * [ ] All images have a valid tag and SHA256 sum ### Test plan This was tested with a local deployment of docker compose, switching in the new jaeger image and the config changes here. Then a search and trace were performed <img width="2483" height="1505" alt="Screenshot 2026-03-19 at 10 33 48 AM" src="https://github.com/user-attachments/assets/f5f6e5bf-f759-4663-8701-0c6f88e1087b" /> <img width="2541" height="857" alt="Screenshot 2026-03-19 at 10 31 56 AM" src="https://github.com/user-attachments/assets/1383df54-f997-47f2-931d-7eef19012ec1" /> Co-authored-by: Warren Gifford <warrenbruceg@gmail.com>
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
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.
closes PLAT-487
Update manifests to support 2.16 jaeger configurations style
This follows changes to the sourcegraph jaeger base image https://github.com/sourcegraph/sourcegraph/pull/10912
Checklist
Test plan
This was tested with a local deployment of docker compose, switching in the new jaeger image and the config changes here.
Then a search and trace were performed
