From 363ad46a95174962dbe0d8511b475a574d92e61f Mon Sep 17 00:00:00 2001 From: Juliano Costa Date: Tue, 30 Jul 2024 17:53:43 +0200 Subject: [PATCH 1/2] Add required jaeger env var (#1689) --- docker-compose.minimal.yml | 1 + docker-compose.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml index f10ad9470a..90a984c970 100644 --- 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 index e253cdc982..9ca0309bf3 100644 --- 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 From 47dbb31da7e324e1437c97538bf6797e8824787c Mon Sep 17 00:00:00 2001 From: Pierre Tessier Date: Tue, 30 Jul 2024 12:56:45 -0400 Subject: [PATCH 2/2] 1.11.1 release (#1687) Co-authored-by: Juliano Costa --- .env | 2 +- CHANGELOG.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.env b/.env index 81ae7a027b..f54a0ecff4 100644 --- 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 index 0fcd0ea666..02b3a0eee9 100644 --- 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