Merge branch 'main' into chore/upgrade-deps

open-telemetry · Apr 3, 2024 · fd01b8b · fd01b8b
2 parents 49a62c4 + 4185d2d
commit fd01b8b
Show file tree

Hide file tree

Showing 15 changed files with 672 additions and 719 deletions.
diff --git a/.env b/.env
@@ -1,7 +1,7 @@
 
 
 # Demo App version
-IMAGE_VERSION=1.8.0
+IMAGE_VERSION=1.9.0
 IMAGE_NAME=ghcr.io/open-telemetry/demo
 DEMO_VERSION=latest
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,10 +7,8 @@ the release.
 
 ## Unreleased
 
-* [loadgenerator] emit logs via OTLP
-  ([#1446](https://github.com/open-telemetry/opentelemetry-demo/pull/1446))
-* [frontend] reset quantity when new product selected
-  ([#1447](https://github.com/open-telemetry/opentelemetry-demo/pull/1447))
+## 1.9.0
+
 * [featureflag] deprecate in favor of flagd
   ([#1338](https://github.com/open-telemetry/opentelemetry-demo/pull/1388))
 * [checkoutservice] add producer interceptor for tracing
@@ -31,8 +29,14 @@ the release.
   ([#1415](https://github.com/open-telemetry/opentelemetry-demo/pull/1415))
 * [chore] - add tests and odd profiles to make stop
   ([#1427](https://github.com/open-telemetry/opentelemetry-demo/pull/1427))
+* [shippingservice] fix context propagation
+  ([#1433](https://github.com/open-telemetry/opentelemetry-demo/pull/1433))
 * [chore] - Update Telemetry Components
   ([#1440](https://github.com/open-telemetry/opentelemetry-demo/pull/1440))
+* [loadgenerator] emit logs via OTLP
+  ([#1446](https://github.com/open-telemetry/opentelemetry-demo/pull/1446))
+* [frontend] reset quantity when new product selected
+  ([#1447](https://github.com/open-telemetry/opentelemetry-demo/pull/1447))
 * [paymentservice] add paymentServiceFailure feature flag
   ([#1449](https://github.com/open-telemetry/opentelemetry-demo/pull/1449))
 * [checkoutservice] add paymentServiceUnreachable feature flag

diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml
@@ -440,7 +440,7 @@ services:
     environment:
       - SHIPPING_SERVICE_PORT
       - QUOTE_SERVICE_ADDR
-      - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_GRPC}/v1/traces
+      - OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_GRPC}
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=shippingservice
     depends_on:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -528,7 +528,7 @@ services:
     environment:
       - SHIPPING_SERVICE_PORT
       - QUOTE_SERVICE_ADDR
-      - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_GRPC}/v1/traces
+      - OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_GRPC}
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=shippingservice
     depends_on: