fix(otel): Update Jaeger for OTEL changes (#1063)

* fix(otel): update jaeger-all-in-one to support otel defaults

* docs(jaeger): add docs for more exposed ports

* fix(jaeger): fix image hash

Author: Chickensoupwithrice

docker-compose/jaeger/docker-compose.yaml

@@ -4,35 +4,41 @@ services:
   # (https://www.jaegertracing.io/docs/1.17/getting-started/#all-in-one) for distributed tracing.
   #
   # Disk: none
-  # Ports exposed to other Sourcegraph services: 5778/TCP 6831/UDP 6832/UDP 14250/TCP
+  # Ports exposed to other Sourcegraph services: 5778/TCP 6831/UDP 6832/UDP 14250/TCP 4320/UDP 4321/UDP
   # Ports exposed to the public internet: none
   # Ports exposed to site admins only: 16686/HTTP
   #
   jaeger:
     container_name: jaeger
-    image: 'index.docker.io/sourcegraph/jaeger-all-in-one:216430_2023-05-02_5.0-3cc9006de32c@sha256:ec73cff6ea398d96241a9451634fc83682292b0175cc63c09f1f866cf03beb8d'
+    image: 'index.docker.io/sourcegraph/jaeger-all-in-one:281057_2024-07-04_5.4-b98c7d084d30@sha256:3ff2c29a456f4b275a46ca413eb38c84ee9df6109460691b13a798aecee038a0'
     cpus: 0.5
     mem_limit: '512m'
     ports:
       # Query port
       - '0.0.0.0:16686:16686'
       # Collector port
       - '0.0.0.0:14250:14250'
+      - '0.0.0.0:4320:4320' # gRPC port
+      - '0.0.0.0:4321:4321' # HTTP port
       # Agent ports
       - '0.0.0.0:5778:5778'
       - '0.0.0.0:6831:6831'
       - '0.0.0.0:6832:6832'
     networks:
       - sourcegraph
     restart: always
-    command: ['--memory.max-traces=20000']
+    command: ['--memory.max-traces=20000', "--sampling.strategies-file=/etc/jaeger/sampling_strategies.json", "--collector.otlp.enabled" ]
     environment:
       - 'SAMPLING_STRATEGIES_FILE=/etc/jaeger/sampling_strategies.json'
+      - 'COLLECTOR_OTLP_ENABLED=true'
+      - 'JAEGER_OTLP_GRPC_PORT=4320'
+      - 'JAEGER_OTLP_HTTP_PORT=4321'
 
   # Configure collector to send traces to Jaeger
   otel-collector:
     environment:
       - JAEGER_HOST=jaeger
+      - JAEGER_OTLP_GRPC_PORT=4320
     command: ['--config', '/etc/otel-collector/configs/jaeger.yaml']
 
   # Let frontend proxy to Jaeger interface

otel-collector/config.yaml

@@ -4,8 +4,8 @@
 receivers:
   otlp:
     protocols:
-      grpc: # port 4317
-      http: # port 4318
+      grpc: # port 4320
+      http: # port 4321
 
 exporters:
   # Add your exporter(s) configuration here. For each exporter, make sure it is enabled