chore: add OTEL_COLLECTOR_PORT env for frontendproxy to support 1.4 i…

…mage
open-telemetry · Jul 17, 2023 · 8a45d39 · 8a45d39
1 parent 28a6c74
commit 8a45d39
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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