chore: upgrade jaegertracing to v2.8.0 (#2389)

* chore: upgrade jaegertracing to v2.8.0

Signed-off-by: Roman Dmytrenko <[email protected]>

* Update docker-compose.yml

Co-authored-by: Juliano Costa <[email protected]>

* Update docker-compose.minimal.yml

Co-authored-by: Juliano Costa <[email protected]>

* Update docker-compose.minimal.yml

Co-authored-by: Juliano Costa <[email protected]>

* cleanup

Signed-off-by: Roman Dmytrenko <[email protected]>

* Add Jaeger env vars

* changelog

* Add Jaeger UI env var

* typo

---------

Signed-off-by: Roman Dmytrenko <[email protected]>
Co-authored-by: Juliano Costa <[email protected]>
Co-authored-by: Juliano Costa <[email protected]>

Author: erka

.env

@@ -1,5 +1,3 @@
-
-
 # Demo App version
 IMAGE_VERSION=2.0.2
 IMAGE_NAME=ghcr.io/open-telemetry/demo
@@ -14,7 +12,7 @@ OPENTELEMETRY_CPP_VERSION=1.21.0
 COLLECTOR_CONTRIB_IMAGE=ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.133.0
 FLAGD_IMAGE=ghcr.io/open-feature/flagd:v0.12.8
 GRAFANA_IMAGE=grafana/grafana:12.1.0
-JAEGERTRACING_IMAGE=jaegertracing/all-in-one:1.72.0
+JAEGERTRACING_IMAGE=jaegertracing/jaeger:2.10.0
 # must also update version field in src/grafana/provisioning/datasources/opensearch.yaml
 OPENSEARCH_IMAGE=opensearchproject/opensearch:3.2.0
 POSTGRES_IMAGE=postgres:17.6
@@ -158,8 +156,9 @@ GRAFANA_PORT=3000
 GRAFANA_HOST=grafana
 
 # Jaeger
-JAEGER_PORT=16686
 JAEGER_HOST=jaeger
+JAEGER_UI_PORT=16686
+JAEGER_GRPC_PORT=4317
 
 # Prometheus
 PROMETHEUS_PORT=9090

CHANGELOG.md

@@ -76,6 +76,8 @@ the release.
   ([#2352]((https://github.com/open-telemetry/opentelemetry-demo/pull/2352)))
 * [image-provider] Update to latest version of nginx and alpine
   ([#2369](https://github.com/open-telemetry/opentelemetry-demo/pull/2369))
+* [chore] Upgrade Jaeger to v2
+  ([#2389](https://github.com/open-telemetry/opentelemetry-demo/pull/2389))
 * [load-generator] Fix Playwright wait until load state error
   ([#2374](https://github.com/open-telemetry/opentelemetry-demo/pull/2374))
 * [flagd] Bump Flagd to v0.12.8 and get compliant `http.Server.request.duration`

docker-compose.minimal.yml

@@ -264,7 +264,7 @@ services:
       - LOCUST_WEB_PORT
       - GRAFANA_PORT
       - GRAFANA_HOST
-      - JAEGER_PORT
+      - JAEGER_UI_PORT
       - JAEGER_HOST
       - OTEL_COLLECTOR_HOST
       - IMAGE_PROVIDER_HOST
@@ -562,21 +562,24 @@ services:
     image: ${JAEGERTRACING_IMAGE}
     container_name: jaeger
     command:
-      - "--memory.max-traces=5000"
-      - "--query.base-path=/jaeger/ui"
-      - "--prometheus.server-url=http://${PROMETHEUS_ADDR}"
-      - "--prometheus.query.normalize-calls=true"
-      - "--prometheus.query.normalize-duration=true"
+      - "--config=file:/etc/jaeger/config.yml"
     deploy:
       resources:
         limits:
           memory: 400M
     restart: unless-stopped
     ports:
-      - "${JAEGER_PORT}"         # Jaeger UI
-      - "${OTEL_COLLECTOR_PORT_GRPC}"
+      - "${JAEGER_UI_PORT}"
+      - "${JAEGER_GRPC_PORT}"
     environment:
-      - METRICS_STORAGE_TYPE=prometheus
+      - JAEGER_HOST
+      - JAEGER_GRPC_PORT
+      - PROMETHEUS_ADDR
+      - OTEL_COLLECTOR_HOST
+      - OTEL_COLLECTOR_PORT_HTTP
+      - MEMORY_MAX_TRACES=5000
+    volumes:
+      - ./src/jaeger/config.yml:/etc/jaeger/config.yml
     logging: *logging
 
   # Grafana

docker-compose.yml

@@ -342,7 +342,7 @@ services:
       - LOCUST_WEB_PORT
       - GRAFANA_PORT
       - GRAFANA_HOST
-      - JAEGER_PORT
+      - JAEGER_UI_PORT
       - JAEGER_HOST
       - OTEL_COLLECTOR_HOST
       - IMAGE_PROVIDER_HOST
@@ -731,21 +731,24 @@ services:
     image: ${JAEGERTRACING_IMAGE}
     container_name: jaeger
     command:
-      - "--memory.max-traces=25000"
-      - "--query.base-path=/jaeger/ui"
-      - "--prometheus.server-url=http://${PROMETHEUS_ADDR}"
-      - "--prometheus.query.normalize-calls=true"
-      - "--prometheus.query.normalize-duration=true"
+      - "--config=file:/etc/jaeger/config.yml"
     deploy:
       resources:
         limits:
           memory: 1200M
     restart: unless-stopped
     ports:
-      - "${JAEGER_PORT}"         # Jaeger UI
-      - "${OTEL_COLLECTOR_PORT_GRPC}"
+      - "${JAEGER_UI_PORT}"
+      - "${JAEGER_GRPC_PORT}"
     environment:
-      - METRICS_STORAGE_TYPE=prometheus
+      - JAEGER_HOST
+      - JAEGER_GRPC_PORT
+      - PROMETHEUS_ADDR
+      - OTEL_COLLECTOR_HOST
+      - OTEL_COLLECTOR_PORT_HTTP
+      - MEMORY_MAX_TRACES=25000
+    volumes:
+      - ./src/jaeger/config.yml:/etc/jaeger/config.yml
     logging: *logging
 
   # Grafana

src/frontend-proxy/envoy.tmpl.yaml

@@ -241,7 +241,7 @@ static_resources:
                   address:
                     socket_address:
                       address: ${JAEGER_HOST}
-                      port_value: ${JAEGER_PORT}
+                      port_value: ${JAEGER_UI_PORT}
 admin:
   address:
     socket_address:

src/jaeger/config.yml

@@ -0,0 +1,59 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+service:
+  extensions: [jaeger_storage, jaeger_query, healthcheckv2]
+  pipelines:
+    traces:
+      receivers: [otlp]
+      processors: [batch]
+      exporters: [jaeger_storage_exporter]
+  telemetry:
+    resource:
+      service.name: jaeger-query
+    metrics:
+      level: detailed
+      readers:
+        - periodic:
+            interval: 10000
+            timeout: 5000
+            exporter:
+              otlp:
+                protocol: http/protobuf
+                endpoint: http://${env:OTEL_COLLECTOR_HOST}:${env:OTEL_COLLECTOR_PORT_HTTP}
+    logs:
+      level: info
+extensions:
+  healthcheckv2:
+    use_v2: true
+    http:
+
+  jaeger_query:
+    storage:
+      traces: memory_backend
+      metrics: metrics_backend
+    base_path: /jaeger/ui
+  jaeger_storage:
+    backends:
+      memory_backend:
+        memory:
+          max_traces: ${env:MEMORY_MAX_TRACES}
+    metric_backends:
+      metrics_backend:
+        prometheus:
+          endpoint: "http://${env:PROMETHEUS_ADDR}"
+          normalize_calls: true
+          normalize_duration: true
+
+receivers:
+  otlp:
+    protocols:
+      grpc:
+        endpoint: ${env:JAEGER_HOST}:${env:JAEGER_GRPC_PORT}
+
+processors:
+  batch:
+
+exporters:
+  jaeger_storage_exporter:
+    trace_storage: memory_backend