Skip to content

chore/platform: update docker-compose to support jaeger 2.16 config#1369

Merged
DaedalusG merged 1 commit into
mainfrom
wg/plat/jaeger-2.16
Mar 19, 2026
Merged

chore/platform: update docker-compose to support jaeger 2.16 config#1369
DaedalusG merged 1 commit into
mainfrom
wg/plat/jaeger-2.16

Conversation

@DaedalusG

@DaedalusG DaedalusG commented Mar 18, 2026

Copy link
Copy Markdown
Contributor

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

  • Sister deploy-sourcegraph change:
  • Sister customer-replica 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
Screenshot 2026-03-19 at 10 33 48 AM

Screenshot 2026-03-19 at 10 31 56 AM
@DaedalusG DaedalusG requested review from a team and loujar March 18, 2026 05:09
@DaedalusG DaedalusG merged commit 513fd6c into main Mar 19, 2026
2 checks passed
@DaedalusG DaedalusG deleted the wg/plat/jaeger-2.16 branch March 19, 2026 19:26
@DaedalusG DaedalusG added the backport 7.1.x Backport to 7.1.x release branch label Mar 19, 2026
@sourcegraph-release-bot

Copy link
Copy Markdown
Collaborator

The backport to 7.1.x failed at https://github.com/sourcegraph/deploy-sourcegraph-docker/actions/runs/23313032747:

Reviews may only be requested from collaborators. One or more of the teams you specified is not a collaborator of the sourcegraph/deploy-sourcegraph-docker repository.

To backport this PR manually, you can either:

Via the sg tool

Use the sg backport command to backport your commit to the release branch.

sg backport -r 7.1.x -p 1369
Via your terminal

To 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.x

If 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
  • Follow above instructions to backport the commit.
  • Create a pull request where the base branch is 7.1.x and the compare/head branch is backport-1369-to-7.1.x., click here to create the pull request.

Once the pull request has been created, please ensure the following:

  • Make sure to tag @sourcegraph/release in the pull request description.

  • kindly remove the release-blocker from this pull request.

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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment