From d3c2b2334bdded9b751833aca5bdfbfcca609e4b Mon Sep 17 00:00:00 2001 From: Marc <7050295+marcleblanc2@users.noreply.github.com> Date: Thu, 19 Dec 2024 00:54:04 -0700 Subject: [PATCH 1/2] Fix Jaeger ports for HTTP tracing --- docker-compose/jaeger/docker-compose.yaml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/docker-compose/jaeger/docker-compose.yaml b/docker-compose/jaeger/docker-compose.yaml index d544bb040..cd2e61a95 100644 --- a/docker-compose/jaeger/docker-compose.yaml +++ b/docker-compose/jaeger/docker-compose.yaml @@ -27,18 +27,20 @@ services: networks: - sourcegraph restart: always - 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' + command: [ + '--memory.max-traces=20000', + "--sampling.strategies-file=/etc/jaeger/sampling_strategies.json", + "--collector.otlp.enabled", + "--collector.otlp.grpc.host-port=:4320", + "--collector.otlp.http.host-port=:4321" + ] # Configure collector to send traces to Jaeger otel-collector: environment: - JAEGER_HOST=jaeger - JAEGER_OTLP_GRPC_PORT=4320 + - JAEGER_OTLP_HTTP_PORT=4321 command: ['--config', '/etc/otel-collector/configs/jaeger.yaml'] # Let frontend proxy to Jaeger interface From 6fc4ca289f65336cff066a7d04cc13c02b0cc0e5 Mon Sep 17 00:00:00 2001 From: Marc LeBlanc Date: Thu, 19 Dec 2024 01:15:12 -0700 Subject: [PATCH 2/2] Formatting --- docker-compose/jaeger/docker-compose.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose/jaeger/docker-compose.yaml b/docker-compose/jaeger/docker-compose.yaml index cd2e61a95..9695a2801 100644 --- a/docker-compose/jaeger/docker-compose.yaml +++ b/docker-compose/jaeger/docker-compose.yaml @@ -18,8 +18,8 @@ services: - '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 + - '0.0.0.0:4320:4320' # gRPC + - '0.0.0.0:4321:4321' # HTTP # Agent ports - '0.0.0.0:5778:5778' - '0.0.0.0:6831:6831' @@ -28,8 +28,8 @@ services: - sourcegraph restart: always command: [ - '--memory.max-traces=20000', - "--sampling.strategies-file=/etc/jaeger/sampling_strategies.json", + '--memory.max-traces=20000', + "--sampling.strategies-file=/etc/jaeger/sampling_strategies.json", "--collector.otlp.enabled", "--collector.otlp.grpc.host-port=:4320", "--collector.otlp.http.host-port=:4321"