Skip to content

Commit e6da06f

Browse files
[Backport 7.1.x] chore/platform: update docker-compose to support jaeger 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>
1 parent 84f69e0 commit e6da06f

File tree

1 file changed

+7
-15
lines changed

1 file changed

+7
-15
lines changed

docker-compose/jaeger/docker-compose.yaml

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
version: '2.4'
22
services:
33
# Description: Jaeger all-in-one instance
4-
# (https://www.jaegertracing.io/docs/1.17/getting-started/#all-in-one) for distributed tracing.
4+
# (https://www.jaegertracing.io/docs/2.16/getting-started/) for distributed tracing.
55
#
66
# Disk: none
7-
# Ports exposed to other Sourcegraph services: 5778/TCP 6831/UDP 6832/UDP 14250/TCP 4317/UDP 4321/UDP
7+
# Ports exposed to other Sourcegraph services: 5778/TCP 4317/TCP 4318/TCP
88
# Ports exposed to the public internet: none
99
# Ports exposed to site admins only: 16686/HTTP
1010
#
@@ -16,23 +16,15 @@ services:
1616
ports:
1717
# Query port
1818
- '0.0.0.0:16686:16686'
19-
# Collector port
20-
- '0.0.0.0:14250:14250'
21-
- '0.0.0.0:4317:4317' # gRPC port
22-
- '0.0.0.0:4321:4321' # HTTP port
23-
# Agent ports
19+
# OTLP ports
20+
- '0.0.0.0:4317:4317' # gRPC
21+
- '0.0.0.0:4318:4318' # HTTP
22+
# Remote sampling
2423
- '0.0.0.0:5778:5778'
25-
- '0.0.0.0:6831:6831'
26-
- '0.0.0.0:6832:6832'
2724
networks:
2825
- sourcegraph
2926
restart: always
30-
command: ['--memory.max-traces=20000', "--sampling.strategies-file=/etc/jaeger/sampling_strategies.json", "--collector.otlp.enabled" ]
31-
environment:
32-
- 'SAMPLING_STRATEGIES_FILE=/etc/jaeger/sampling_strategies.json'
33-
- 'COLLECTOR_OTLP_ENABLED=true'
34-
- 'JAEGER_OTLP_GRPC_PORT=4317'
35-
- 'JAEGER_OTLP_HTTP_PORT=4321'
27+
command: ['--config=/etc/jaeger/jaeger-config.yaml']
3628

3729
# Configure collector to send traces to Jaeger
3830
otel-collector:

0 commit comments

Comments
 (0)