Merge branch 'main' into imageprovider

Author: austinlparker

.env

@@ -1,18 +1,18 @@
 
 
 # Demo App version
-IMAGE_VERSION=1.8.0
+IMAGE_VERSION=1.9.0
 IMAGE_NAME=ghcr.io/open-telemetry/demo
 DEMO_VERSION=latest
 
 # Dependent images
-COLLECTOR_CONTRIB_IMAGE=otel/opentelemetry-collector-contrib:0.96.0
-GRAFANA_IMAGE=grafana/grafana:10.4.0
+COLLECTOR_CONTRIB_IMAGE=otel/opentelemetry-collector-contrib:0.97.0
+GRAFANA_IMAGE=grafana/grafana:10.4.1
 JAEGERTRACING_IMAGE=jaegertracing/all-in-one:1.55
 # must also update version field in /src/grafana/provisioning/datasources/opensearch.yml
 OPENSEARCH_IMAGE=opensearchproject/opensearch:2.12.0
 POSTGRES_IMAGE=postgres:16.2
-PROMETHEUS_IMAGE=quay.io/prometheus/prometheus:v2.50.1
+PROMETHEUS_IMAGE=quay.io/prometheus/prometheus:v2.51.1
 REDIS_IMAGE=redis:7.2-alpine
 TRACETEST_IMAGE_VERSION=v0.16.0
 TRACETEST_IMAGE=kubeshop/tracetest:${TRACETEST_IMAGE_VERSION}

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

docker-compose.minimal.yml

@@ -471,7 +471,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:

docker-compose.yml

@@ -559,7 +559,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: