Merge remote-tracking branch 'upstream/main'

elastic · Jul 30, 2024 · fc559d7 · fc559d7
2 parents 3a5bff8 + 47dbb31
commit fc559d7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/.env b/.env
@@ -1,7 +1,7 @@
 
 
 # Demo App version
-IMAGE_VERSION=1.11.0
+IMAGE_VERSION=1.11.1
 IMAGE_NAME=ghcr.io/open-telemetry/demo
 DEMO_VERSION=latest
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@ the release.
 
 ## Unreleased
 
+## 1.11.1
+
 * [otel-col] Add docker stats receiver
   ([#1650](https://github.com/open-telemetry/opentelemetry-demo/pull/1650))
 * [otel-col] strip high-cardinality segments of span names

diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml
@@ -553,6 +553,7 @@ services:
       - "${OTEL_COLLECTOR_PORT_GRPC}"
     environment:
       - METRICS_STORAGE_TYPE=prometheus
+      - COLLECTOR_OTLP_GRPC_HOST_PORT=${JAEGER_SERVICE_HOST}:${OTEL_COLLECTOR_PORT_GRPC}
     logging: *logging
 
   # Grafana

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -663,6 +663,7 @@ services:
       - "${OTEL_COLLECTOR_PORT_GRPC}"
     environment:
       - METRICS_STORAGE_TYPE=prometheus
+      - COLLECTOR_OTLP_GRPC_HOST_PORT=${JAEGER_SERVICE_HOST}:${OTEL_COLLECTOR_PORT_GRPC}
     logging: *logging
 
   # Grafana