Skip to content

[Backport 7.1.x] chore/platform: update docker-compose to support jaeger 2.16 config#1370

Merged
DaedalusG merged 1 commit into7.1.xfrom
backport-1369-to-7.1.x
Mar 19, 2026
Merged

[Backport 7.1.x] chore/platform: update docker-compose to support jaeger 2.16 config#1370
DaedalusG merged 1 commit into7.1.xfrom
backport-1369-to-7.1.x

Conversation

@sourcegraph-release-bot
Copy link
Collaborator

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 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

…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

<!--
Kubernetes and Docker Compose MUST be kept in sync. You should not merge
a change here
without a corresponding change in the other repository, unless it truly
is specific to
this repository. If uneeded, add link or explanation of why it is not
needed here.
-->
* [ ] 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"
/>

<!--
As part of SOC2/GN-104 and SOC2/GN-105 requirements, all pull requests
are REQUIRED to
provide a "test plan". A test plan is a loose explanation of what you
have done or
implemented to test this, as outlined in our Testing principles and
guidelines:

https://docs.sourcegraph.com/dev/background-information/testing_principles
  Write your test plan here after the "Test plan" header.
-->

(cherry picked from commit 513fd6c)
@DaedalusG DaedalusG merged commit e6da06f into 7.1.x Mar 19, 2026
2 checks passed
@DaedalusG DaedalusG deleted the backport-1369-to-7.1.x branch March 19, 2026 20:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants