Merging with upstream to reflect v1.9.0 changes

.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}
@@ -76,6 +76,10 @@ FRONTEND_HOST=frontend
 ENVOY_PORT=8080
 FRONTEND_PROXY_ADDR=frontend-proxy:${ENVOY_PORT}
 
+# Image Provider
+IMAGE_PROVIDER_HOST=imageprovider
+IMAGE_PROVIDER_PORT=8081
+
 # Load Generator
 LOCUST_WEB_PORT=8089
 LOCUST_USERS=10

.github/workflows/build-images.yml

@@ -104,6 +104,10 @@ jobs:
             tag_suffix: frontend-tests
             context: ./
             setup-qemu: true
+          - file: ./test/tracetesting/Dockerfile
+            tag_suffix: traceBasedTests
+            context: ./
+            setup-qemu: true
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/gradle-wrapper-validation.yml

@@ -15,4 +15,4 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: gradle/wrapper-validation-action@v2.1.2
+      - uses: gradle/wrapper-validation-action@v3.3.1

.github/workflows/label-pr.yml

@@ -0,0 +1,60 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+# adds a label to a pull request if certain files are changed
+name: Label Pull Requests
+
+on:
+  pull_request_target:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  label:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+      contents: read
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Check for changed files
+        id: file_changes
+        uses: dorny/paths-filter@v2
+        with:
+          list-files: shell
+          filters: |
+            docsUpdateRequired:
+              - 'src/flagd/**'
+            helmUpdateRequired:
+              - '.env'
+              - 'docker-compose*.yml'
+              - 'src/flagd/**'
+              - 'src/grafana/**'
+              - 'src/otelcollector/**'
+              - 'src/prometheus/**'
+
+      - name: "Add Label: docs-update-required"
+        if: steps.file_changes.outputs.docsUpdateRequired == 'true'
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const issue_number = context.issue.number;
+            github.rest.issues.addLabels({
+              issue_number: issue_number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ['docs-update-required']
+            })
+
+      - name: "Add Label: helm-update-required"
+        if: steps.file_changes.outputs.helmUpdateRequired == 'true'
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const issue_number = context.issue.number;
+            github.rest.issues.addLabels({
+              issue_number: issue_number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ['helm-update-required']
+            })

CHANGELOG.md

@@ -7,10 +7,24 @@ 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))
+* [frauddetectionservice] use span links when consuming from Kafka
+  ([#1501](https://github.com/open-telemetry/opentelemetry-demo/pull/1501))
+* [frontend] reunite trace from loadgenerator
+  ([#1506](https://github.com/open-telemetry/opentelemetry-demo/pull/1506))
+* [repo] add traceBasedTests image to published images
+  ([#1507](https://github.com/open-telemetry/opentelemetry-demo/pull/1507))
+* [cartservice] update .NET package to 1.8.0 release
+  ([#1514](https://github.com/open-telemetry/opentelemetry-demo/pull/1514))
+* [quoteservice] add manual metric, export logs periodically
+  ([#1519](https://github.com/open-telemetry/opentelemetry-demo/pull/1519))
+* [flagd] export flagd traces to otel collector
+  ([#1522](https://github.com/open-telemetry/opentelemetry-demo/pull/1522))
+* [frontend] Pass down image optimization requests to imageprovider
+  ([#1522](https://github.com/open-telemetry/opentelemetry-demo/pull/1522))
+
+## 1.9.0
+
+* [chore] docker compose: add container name as tag attribute to container logs
 * [featureflag] deprecate in favor of flagd
   ([#1338](https://github.com/open-telemetry/opentelemetry-demo/pull/1388))
 * [checkoutservice] add producer interceptor for tracing
@@ -31,8 +45,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
@@ -41,12 +61,20 @@ the release.
   ([#1448](https://github.com/open-telemetry/opentelemetry-demo/pull/1448))
 * [cartservice] update .NET to .NET 8.0.3
   ([#1460](https://github.com/open-telemetry/opentelemetry-demo/pull/1460))
+* [adservice] add adServiceManualGC feature flag
+  ([#1463](https://github.com/open-telemetry/opentelemetry-demo/pull/1463))
 * [frontendproxy] remove deprecated start_child_span option
   ([#1469](https://github.com/open-telemetry/opentelemetry-demo/pull/1469))
 * [currency] fix metric name
   ([#1470](https://github.com/open-telemetry/opentelemetry-demo/pull/1470))
 * [frontend] disable instrumentation-fs library
   ([#1473](https://github.com/open-telemetry/opentelemetry-demo/pull/1473))
+* [Imageprovider] Create Nginx service to host images, add instrumentation to it
+  ([#1462](https://github.com/open-telemetry/opentelemetry-demo/pull/1462))
+* [loadgenerator] added loadgeneratorFloodHomepage flagd
+  ([#1486](https://github.com/open-telemetry/opentelemetry-demo/pull/1486))
+* [adservice] add adServiceHighCpu feature flag
+  ([#1510](https://github.com/open-telemetry/opentelemetry-demo/pull/1510))
 
 ## 1.8.0
 

Makefile

@@ -131,6 +131,7 @@ start:
 	@echo "Go to http://localhost:8080/jaeger/ui for the Jaeger UI."
 	@echo "Go to http://localhost:8080/grafana/ for the Grafana UI."
 	@echo "Go to http://localhost:8080/loadgen/ for the Load Generator UI."
+	@echo "Go to https://opentelemetry.io/docs/demo/feature-flags/ to learn how to change feature flags."
 
 .PHONY: start-minimal
 start-minimal:
@@ -141,6 +142,7 @@ start-minimal:
 	@echo "Go to http://localhost:8080/jaeger/ui for the Jaeger UI."
 	@echo "Go to http://localhost:8080/grafana/ for the Grafana UI."
 	@echo "Go to http://localhost:8080/loadgen/ for the Load Generator UI."
+	@echo "Go to https://opentelemetry.io/docs/demo/feature-flags/ to learn how to change feature flags."
 
 # Observabilty-Driven Development (ODD)
 .PHONY: start-odd
@@ -153,6 +155,7 @@ start-odd:
 	@echo "Go to http://localhost:8080/grafana/ for the Grafana UI."
 	@echo "Go to http://localhost:8080/loadgen/ for the Load Generator UI."
 	@echo "Go to http://localhost:11633/ for the Tracetest Web UI."
+	@echo "Go to https://opentelemetry.io/docs/demo/feature-flags/ to learn how to change feature flags."
 
 .PHONY: stop
 stop:

README.md

@@ -85,21 +85,21 @@ Monday at 8:30 AM PST and anyone is welcome.
 ([@open-telemetry/demo-maintainers](https://github.com/orgs/open-telemetry/teams/demo-maintainers)):
 
 - [Austin Parker](https://github.com/austinlparker), Honeycomb
-- [Carter Socha](https://github.com/cartersocha), Lightstep
 - [Juliano Costa](https://github.com/julianocosta89), Datadog
+- [Mikko Viitanen](https://github.com/mviitane), Dynatrace
 - [Pierre Tessier](https://github.com/puckpuck), Honeycomb
 
 [Approvers](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver)
 ([@open-telemetry/demo-approvers](https://github.com/orgs/open-telemetry/teams/demo-approvers)):
 
 - [Cedric Ziel](https://github.com/cedricziel) Grafana Labs
-- [Mikko Viitanen](https://github.com/mviitane), Dynatrace
 - [Penghan Wang](https://github.com/wph95), AppDynamics
 - [Reiley Yang](https://github.com/reyang), Microsoft
 - [Ziqi Zhao](https://github.com/fatsheep9146), Alibaba
 
 Emeritus:
 
+- [Carter Socha](https://github.com/cartersocha)
 - [Michael Maxwell](https://github.com/mic-max)
 - [Morgan McLean](https://github.com/mtwo)
 
@@ -118,7 +118,7 @@ Emeritus:
 [Azure]: https://github.com/Azure/Azure-kusto-opentelemetry-demo
 [Coralogix]: https://coralogix.com/blog/configure-otel-demo-send-telemetry-data-coralogix
 [Dash0]: https://github.com/dash0hq/opentelemetry-demo
-[Datadog]: https://github.com/DataDog/opentelemetry-demo
+[Datadog]: https://docs.datadoghq.com/opentelemetry/guide/otel_demo_to_datadog
 [Dynatrace]: https://www.dynatrace.com/news/blog/opentelemetry-demo-application-with-dynatrace/
 [Elastic]: https://github.com/elastic/opentelemetry-demo
 [GoogleCloud]: https://github.com/GoogleCloudPlatform/opentelemetry-demo

docker-compose.minimal.yml

@@ -7,6 +7,7 @@ x-default-logging: &logging
   options:
     max-size: "5m"
     max-file: "2"
+    tag: "{{.Name}}"
 
 networks:
   default:
@@ -228,6 +229,8 @@ services:
         condition: service_started
       otelcol:
         condition: service_started
+      imageprovider:
+        condition: service_started
     logging: *logging
 
   # Frontend Proxy (Envoy)
@@ -256,6 +259,8 @@ services:
       - GRAFANA_SERVICE_HOST
       - JAEGER_SERVICE_PORT
       - JAEGER_SERVICE_HOST
+      - IMAGE_PROVIDER_HOST
+      - IMAGE_PROVIDER_PORT
       - OTEL_COLLECTOR_HOST
       - OTEL_COLLECTOR_PORT_GRPC
       - OTEL_COLLECTOR_PORT_HTTP
@@ -271,6 +276,33 @@ services:
       grafana:
         condition: service_started
 
+  # Imageprovider
+  imageprovider:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-imageprovider
+    container_name: imageprovider
+    build:
+      context: ./
+      dockerfile: ./src/imageprovider/Dockerfile
+      cache_from:
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-imageprovider
+    deploy:
+      resources:
+        limits:
+          memory: 120M
+    restart: unless-stopped
+    ports:
+      - "${IMAGE_PROVIDER_PORT}"
+    environment:
+      - IMAGE_PROVIDER_PORT
+      - OTEL_COLLECTOR_HOST
+      - OTEL_COLLECTOR_PORT_GRPC
+      - OTEL_SERVICE_NAME=imageprovider
+      - OTEL_RESOURCE_ATTRIBUTES
+    depends_on:
+      otelcol:
+        condition: service_started
+    logging: *logging
+
   # Load Generator
   loadgenerator:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-loadgenerator
@@ -299,9 +331,14 @@ services:
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=loadgenerator
       - PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
+      - LOCUST_WEB_HOST=0.0.0.0
+      - FLAGD_HOST
+      - FLAGD_PORT
     depends_on:
       frontend:
         condition: service_started
+      flagd:
+        condition: service_started
     logging: *logging
 
   # Payment service
@@ -440,7 +477,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: