Merge branch 'main' into patch-1

open-telemetry · Jul 18, 2023 · 6473af3 · 6473af3
2 parents c629f85 + 1296ae1
commit 6473af3
Show file tree

Hide file tree

Showing 6 changed files with 2,625 additions and 1,887 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -49,8 +49,12 @@ release.
   ([#872](https://github.com/open-telemetry/opentelemetry-demo/pull/872))
 * [frontendproxy]Envoy expose a route for the collector to route frontend spans
   ([#938](https://github.com/open-telemetry/opentelemetry-demo/pull/938))
+* [frontend] update JS SDKs to 1.15.0/0.41.0
+  ([#853](https://github.com/open-telemetry/opentelemetry-demo/pull/853))
 * [shippingservice] Update Rust dependencies and add TelemetryResourceDetector
   ([#972](https://github.com/open-telemetry/opentelemetry-demo/pull/972))
+* Update frontendproxy's env for minimal
+  ([#983](https://github.com/open-telemetry/opentelemetry-demo/pull/983))
 
 ## 1.4.0
 

diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml
@@ -254,7 +254,8 @@ services:
       - JAEGER_SERVICE_PORT
       - JAEGER_SERVICE_HOST
       - OTEL_COLLECTOR_HOST
-      - OTEL_COLLECTOR_PORT
+      - OTEL_COLLECTOR_PORT_GRPC
+      - OTEL_COLLECTOR_PORT_HTTP
       - ENVOY_PORT
     depends_on:
       frontend: