From 8a45d399ea9971a79cd31105ff2c4271e592b763 Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Mon, 17 Jul 2023 20:32:47 +0700 Subject: [PATCH] chore: add OTEL_COLLECTOR_PORT env for frontendproxy to support 1.4 image --- CHANGELOG.md | 2 ++ docker-compose.minimal.yml | 6 ++++-- docker-compose.yml | 2 ++ kubernetes/opentelemetry-demo.yaml | 3 +++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 39a19a3d13..4a36c63843 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,6 +51,8 @@ release. ([#938](https://github.com/open-telemetry/opentelemetry-demo/pull/938)) * [shippingservice] Update Rust dependencies and add TelemetryResourceDetector ([#972](https://github.com/open-telemetry/opentelemetry-demo/pull/972)) +* Add OTEL_COLLECTOR_PORT env for frontendproxy to support 1.4 image + ([#981](https://github.com/open-telemetry/opentelemetry-demo/pull/981)) ## 1.4.0 diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml index 79d39e4d00..ba4ff1ce25 100644 --- a/docker-compose.minimal.yml +++ b/docker-compose.minimal.yml @@ -253,8 +253,10 @@ services: - GRAFANA_SERVICE_HOST - JAEGER_SERVICE_PORT - JAEGER_SERVICE_HOST - - OTEL_COLLECTOR_HOST - - OTEL_COLLECTOR_PORT + - OTEL_COLLECTOR_PORT_GRPC + - OTEL_COLLECTOR_PORT_HTTP + # Deprecated + - OTEL_COLLECTOR_PORT=${OTEL_COLLECTOR_PORT_GRPC} - ENVOY_PORT depends_on: frontend: diff --git a/docker-compose.yml b/docker-compose.yml index a5cfee0c9e..2fd74b69c8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -344,6 +344,8 @@ services: - OTEL_COLLECTOR_HOST - OTEL_COLLECTOR_PORT_GRPC - OTEL_COLLECTOR_PORT_HTTP + # Deprecated + - OTEL_COLLECTOR_PORT=${OTEL_COLLECTOR_PORT_GRPC} - ENVOY_PORT depends_on: frontend: diff --git a/kubernetes/opentelemetry-demo.yaml b/kubernetes/opentelemetry-demo.yaml index 8b03b7cc47..ee4781f708 100644 --- a/kubernetes/opentelemetry-demo.yaml +++ b/kubernetes/opentelemetry-demo.yaml @@ -7864,6 +7864,9 @@ spec: value: "4317" - name: OTEL_COLLECTOR_PORT_HTTP value: "4318" + # Deprecated + - name: OTEL_COLLECTOR_PORT + value: "4317" - name: OTEL_COLLECTOR_HOST value: $(OTEL_COLLECTOR_NAME) - name: OTEL_RESOURCE_ATTRIBUTES