Merge branch 'main' into accountservice.fix-memory-limit

.env

@@ -6,7 +6,7 @@ IMAGE_NAME=ghcr.io/open-telemetry/demo
 DEMO_VERSION=latest
 
 # Dependent images
-COLLECTOR_CONTRIB_IMAGE=otel/opentelemetry-collector-contrib:0.102.1
+COLLECTOR_CONTRIB_IMAGE=otel/opentelemetry-collector-contrib:0.104.0
 FLAGD_IMAGE=ghcr.io/open-feature/flagd:v0.10.2
 GRAFANA_IMAGE=grafana/grafana:10.4.3
 JAEGERTRACING_IMAGE=jaegertracing/all-in-one:1.57

.github/workflows/build-images.yml

@@ -11,4 +11,4 @@ on:
 jobs:
   build_images:
     if: github.repository == 'open-telemetry/opentelemetry-demo'
-    uses: ./.github/workflows/component_build_images.yml
+    uses: ./.github/workflows/component-build-images.yml

.github/workflows/checks.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   build_images:
-    uses: ./.github/workflows/component_build-images.yml
+    uses: ./.github/workflows/component-build-images.yml
     with:
       push: false
       version: 'dev'

.github/workflows/nightly-release.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   build_and_push_images:
-    uses: ./.github/workflows/component_build-images.yml
+    uses: ./.github/workflows/component-build-images.yml
     if: github.repository == 'open-telemetry/opentelemetry-demo'
     with:
       push: true

.github/workflows/release.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build_and_push_images:
-    uses: ./.github/workflows/component_build-images.yml
+    uses: ./.github/workflows/component-build-images.yml
     if: github.repository == 'open-telemetry/opentelemetry-demo'
     with:
       push: true

CHANGELOG.md

@@ -27,6 +27,8 @@ the release.
   ([#1634](https://github.com/open-telemetry/opentelemetry-demo/pull/1634))
 * [otel-col] Add docker stats receiver
   ([#1650](https://github.com/open-telemetry/opentelemetry-demo/pull/1650))
+* [otel-col] Set OTLP receiver endpoint to avoid breaking changes
+  ([#1662](https://github.com/open-telemetry/opentelemetry-demo/pull/1662))
 
 ## 1.10.0
 

docker-compose-tests_include-override.yml

@@ -5,6 +5,11 @@ services:
 
   otelcol:
     command: [ "--config=/etc/otelcol-config.yml", "--config=/etc/otelcol-config-tracetest.yml" ]
+    environment:
+      - ENVOY_PORT
+      - OTEL_COLLECTOR_HOST
+      - OTEL_COLLECTOR_PORT_GRPC
+      - OTEL_COLLECTOR_PORT_HTTP
     volumes:
       - ${DOCKER_SOCK}:/var/run/docker.sock:ro
       - ${OTEL_COLLECTOR_CONFIG}:/etc/otelcol-config.yml

docker-compose.minimal.yml

@@ -596,6 +596,9 @@ services:
     logging: *logging
     environment:
       - ENVOY_PORT
+      - OTEL_COLLECTOR_HOST
+      - OTEL_COLLECTOR_PORT_GRPC
+      - OTEL_COLLECTOR_PORT_HTTP
 
   # Prometheus
   prometheus:

docker-compose.yml

@@ -706,6 +706,9 @@ services:
     logging: *logging
     environment:
       - ENVOY_PORT
+      - OTEL_COLLECTOR_HOST
+      - OTEL_COLLECTOR_PORT_GRPC
+      - OTEL_COLLECTOR_PORT_HTTP
 
   # Prometheus
   prometheus:

src/otelcollector/otelcol-config.yml

@@ -5,7 +5,9 @@ receivers:
   otlp:
     protocols:
       grpc:
+        endpoint: ${env:OTEL_COLLECTOR_HOST}:${env:OTEL_COLLECTOR_PORT_GRPC}
       http:
+        endpoint: ${env:OTEL_COLLECTOR_HOST}:${env:OTEL_COLLECTOR_PORT_HTTP}
         cors:
           allowed_origins:
             - "http://*"