build(deps): bump the pip-production-dependencies group across 3 directories with 10 updates (#2354)

Bumps the pip-production-dependencies group with 10 updates in the /src directory:

| Package | From | To |
| --- | --- | --- |
| [opentelemetry-api](https://github.com/open-telemetry/opentelemetry-python) | `1.34.1` | `1.35.0` |
| [opentelemetry-exporter-otlp-proto-grpc](https://github.com/open-telemetry/opentelemetry-python) | `1.34.1` | `1.35.0` |
| [opentelemetry-instrumentation-jinja2](https://github.com/open-telemetry/opentelemetry-python-contrib) | `0.55b1` | `0.56b0` |
| [opentelemetry-instrumentation-requests](https://github.com/open-telemetry/opentelemetry-python-contrib) | `0.55b1` | `0.56b0` |
| [opentelemetry-instrumentation-system-metrics](https://github.com/open-telemetry/opentelemetry-python-contrib) | `0.55b1` | `0.56b0` |
| [opentelemetry-instrumentation-urllib3](https://github.com/open-telemetry/opentelemetry-python-contrib) | `0.55b1` | `0.56b0` |
| [opentelemetry-sdk](https://github.com/open-telemetry/opentelemetry-python) | `1.34.1` | `1.35.0` |
| [opentelemetry-semantic-conventions](https://github.com/open-telemetry/opentelemetry-python) | `0.55b1` | `0.56b0` |
| [opentelemetry-instrumentation-logging](https://github.com/open-telemetry/opentelemetry-python-contrib) | `0.55b1` | `0.56b0` |
| [opentelemetry-distro](https://github.com/open-telemetry/opentelemetry-python-contrib) | `0.55b1` | `0.56b0` |

Bumps the pip-production-dependencies group with 9 updates in the /src/load-generator directory:

| Package | From | To |
| --- | --- | --- |
| [opentelemetry-api](https://github.com/open-telemetry/opentelemetry-python) | `1.34.1` | `1.35.0` |
| [opentelemetry-exporter-otlp-proto-grpc](https://github.com/open-telemetry/opentelemetry-python) | `1.34.1` | `1.35.0` |
| [opentelemetry-instrumentation-jinja2](https://github.com/open-telemetry/opentelemetry-python-contrib) | `0.55b1` | `0.56b0` |
| [opentelemetry-instrumentation-requests](https://github.com/open-telemetry/opentelemetry-python-contrib) | `0.55b1` | `0.56b0` |
| [opentelemetry-instrumentation-system-metrics](https://github.com/open-telemetry/opentelemetry-python-contrib) | `0.55b1` | `0.56b0` |
| [opentelemetry-instrumentation-urllib3](https://github.com/open-telemetry/opentelemetry-python-contrib) | `0.55b1` | `0.56b0` |
| [opentelemetry-sdk](https://github.com/open-telemetry/opentelemetry-python) | `1.34.1` | `1.35.0` |
| [opentelemetry-semantic-conventions](https://github.com/open-telemetry/opentelemetry-python) | `0.55b1` | `0.56b0` |
| [opentelemetry-instrumentation-logging](https://github.com/open-telemetry/opentelemetry-python-contrib) | `0.55b1` | `0.56b0` |

Bumps the pip-production-dependencies group with 2 updates in the /src/recommendation directory: [opentelemetry-exporter-otlp-proto-grpc](https://github.com/open-telemetry/opentelemetry-python) and [opentelemetry-distro](https://github.com/open-telemetry/opentelemetry-python-contrib).


Updates `opentelemetry-api` from 1.34.1 to 1.35.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python/compare/v1.34.1...v1.35.0)

Updates `opentelemetry-exporter-otlp-proto-grpc` from 1.34.1 to 1.35.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python/compare/v1.34.1...v1.35.0)

Updates `opentelemetry-instrumentation-jinja2` from 0.55b1 to 0.56b0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python-contrib/commits)

Updates `opentelemetry-instrumentation-requests` from 0.55b1 to 0.56b0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python-contrib/commits)

Updates `opentelemetry-instrumentation-system-metrics` from 0.55b1 to 0.56b0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python-contrib/commits)

Updates `opentelemetry-instrumentation-urllib3` from 0.55b1 to 0.56b0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python-contrib/commits)

Updates `opentelemetry-sdk` from 1.34.1 to 1.35.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python/compare/v1.34.1...v1.35.0)

Updates `opentelemetry-semantic-conventions` from 0.55b1 to 0.56b0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python/commits)

Updates `opentelemetry-instrumentation-logging` from 0.55b1 to 0.56b0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python-contrib/commits)

Updates `opentelemetry-distro` from 0.55b1 to 0.56b0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python-contrib/commits)

Updates `opentelemetry-api` from 1.34.1 to 1.35.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python/compare/v1.34.1...v1.35.0)

Updates `opentelemetry-exporter-otlp-proto-grpc` from 1.34.1 to 1.35.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python/compare/v1.34.1...v1.35.0)

Updates `opentelemetry-instrumentation-jinja2` from 0.55b1 to 0.56b0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python-contrib/commits)

Updates `opentelemetry-instrumentation-requests` from 0.55b1 to 0.56b0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python-contrib/commits)

Updates `opentelemetry-instrumentation-system-metrics` from 0.55b1 to 0.56b0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python-contrib/commits)

Updates `opentelemetry-instrumentation-urllib3` from 0.55b1 to 0.56b0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python-contrib/commits)

Updates `opentelemetry-sdk` from 1.34.1 to 1.35.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python/compare/v1.34.1...v1.35.0)

Updates `opentelemetry-semantic-conventions` from 0.55b1 to 0.56b0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python/commits)

Updates `opentelemetry-instrumentation-logging` from 0.55b1 to 0.56b0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python-contrib/commits)

Updates `opentelemetry-exporter-otlp-proto-grpc` from 1.34.1 to 1.35.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python/compare/v1.34.1...v1.35.0)

Updates `opentelemetry-distro` from 0.55b1 to 0.56b0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python-contrib/commits)

---
updated-dependencies:
- dependency-name: opentelemetry-api
  dependency-version: 1.35.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: pip-production-dependencies
- dependency-name: opentelemetry-exporter-otlp-proto-grpc
  dependency-version: 1.35.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: pip-production-dependencies
- dependency-name: opentelemetry-instrumentation-jinja2
  dependency-version: 0.56b0
  dependency-type: direct:production
  dependency-group: pip-production-dependencies
- dependency-name: opentelemetry-instrumentation-requests
  dependency-version: 0.56b0
  dependency-type: direct:production
  dependency-group: pip-production-dependencies
- dependency-name: opentelemetry-instrumentation-system-metrics
  dependency-version: 0.56b0
  dependency-type: direct:production
  dependency-group: pip-production-dependencies
- dependency-name: opentelemetry-instrumentation-urllib3
  dependency-version: 0.56b0
  dependency-type: direct:production
  dependency-group: pip-production-dependencies
- dependency-name: opentelemetry-sdk
  dependency-version: 1.35.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: pip-production-dependencies
- dependency-name: opentelemetry-semantic-conventions
  dependency-version: 0.56b0
  dependency-type: direct:production
  dependency-group: pip-production-dependencies
- dependency-name: opentelemetry-instrumentation-logging
  dependency-version: 0.56b0
  dependency-type: direct:production
  dependency-group: pip-production-dependencies
- dependency-name: opentelemetry-distro
  dependency-version: 0.56b0
  dependency-type: direct:production
  dependency-group: pip-production-dependencies
- dependency-name: opentelemetry-api
  dependency-version: 1.35.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: pip-production-dependencies
- dependency-name: opentelemetry-exporter-otlp-proto-grpc
  dependency-version: 1.35.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: pip-production-dependencies
- dependency-name: opentelemetry-instrumentation-jinja2
  dependency-version: 0.56b0
  dependency-type: direct:production
  dependency-group: pip-production-dependencies
- dependency-name: opentelemetry-instrumentation-requests
  dependency-version: 0.56b0
  dependency-type: direct:production
  dependency-group: pip-production-dependencies
- dependency-name: opentelemetry-instrumentation-system-metrics
  dependency-version: 0.56b0
  dependency-type: direct:production
  dependency-group: pip-production-dependencies
- dependency-name: opentelemetry-instrumentation-urllib3
  dependency-version: 0.56b0
  dependency-type: direct:production
  dependency-group: pip-production-dependencies
- dependency-name: opentelemetry-sdk
  dependency-version: 1.35.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: pip-production-dependencies
- dependency-name: opentelemetry-semantic-conventions
  dependency-version: 0.56b0
  dependency-type: direct:production
  dependency-group: pip-production-dependencies
- dependency-name: opentelemetry-instrumentation-logging
  dependency-version: 0.56b0
  dependency-type: direct:production
  dependency-group: pip-production-dependencies
- dependency-name: opentelemetry-exporter-otlp-proto-grpc
  dependency-version: 1.35.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: pip-production-dependencies
- dependency-name: opentelemetry-distro
  dependency-version: 0.56b0
  dependency-type: direct:production
  dependency-group: pip-production-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Roger Coll <rogercoll@protonmail.com>

.dockerignore

@@ -1,38 +1,24 @@
+
+
 .github
 docs
 internal
+src/*/README.md
+src/*/Dockerfile
+src/*/*/Dockerfile
 
 ###################################
-# shippingservice
-./src/shippingservice/target
+# currency
+./src/currency/client.js
+./src/currency/node_modules/
 ###################################
 
 ###################################
-# currencyservice
-./src/currencyservice/client.js
-./src/currencyservice/node_modules/
-###################################
+# frontend
+./src/frontend/node_modules/
 
 ###################################
-# featureflagservice
-# Common development/test artifacts
-./src/featureflagservice/cover/
-./src/featureflagservice/doc/
-./src/featureflagservice/test/
-./src/featureflagservice/tmp/
-./src/featureflagservice/.elixir_ls
-
-# Mix artifacts
-./src/featureflagservice/_build/
-./src/featureflagservice/deps/
-./src/featureflagservice/*.ez
-
-# Generated on crash by the VM
-./src/featureflagservice/erl_crash.dump
-
-# Static artifacts - These should be fetched and built inside the Docker image
-./src/featureflagservice/assets/node_modules/
-./src/featureflagservice/priv/static/assets/
-./src/featureflagservice/priv/static/cache_manifest.json
+# shipping
+./src/shipping/target
 ###################################
 

.env

@@ -1,83 +1,167 @@
-# compose
-IMAGE_VERSION=v0.6.1-beta
-IMAGE_NAME=ghcr.io/open-telemetry/demo
 
-# Collector
-OTEL_EXPORTER_OTLP_ENDPOINT=http://otelcol:4317
-OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=${OTEL_EXPORTER_OTLP_ENDPOINT}
-OTEL_EXPORTER_OTLP_METRICS_ENDPOINT=${OTEL_EXPORTER_OTLP_ENDPOINT}
-PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:4318/v1/traces
+
+# Demo App version
+IMAGE_VERSION=2.0.2
+IMAGE_NAME=ghcr.io/open-telemetry/demo
+DEMO_VERSION=latest
+
+# Build Args
+TRACETEST_IMAGE_VERSION=v1.7.1
+OTEL_JAVA_AGENT_VERSION=2.17.0
+OPENTELEMETRY_CPP_VERSION=1.21.0
+
+# Dependent images
+COLLECTOR_CONTRIB_IMAGE=ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.129.1
+FLAGD_IMAGE=ghcr.io/open-feature/flagd:v0.12.5
+GRAFANA_IMAGE=grafana/grafana:12.0.2
+JAEGERTRACING_IMAGE=jaegertracing/all-in-one:1.70.0
+# must also update version field in src/grafana/provisioning/datasources/opensearch.yaml
+OPENSEARCH_IMAGE=opensearchproject/opensearch:3.1.0
+POSTGRES_IMAGE=postgres:17.5
+PROMETHEUS_IMAGE=quay.io/prometheus/prometheus:v3.4.2
+VALKEY_IMAGE=valkey/valkey:8.1-alpine
+TRACETEST_IMAGE=kubeshop/tracetest:${TRACETEST_IMAGE_VERSION}
+
+# Demo Platform
+ENV_PLATFORM=local
+
+# OpenTelemetry Collector
+HOST_FILESYSTEM=/
+DOCKER_SOCK=/var/run/docker.sock
+OTEL_COLLECTOR_HOST=otel-collector
+OTEL_COLLECTOR_PORT_GRPC=4317
+OTEL_COLLECTOR_PORT_HTTP=4318
+OTEL_COLLECTOR_CONFIG=./src/otel-collector/otelcol-config.yml
+OTEL_COLLECTOR_CONFIG_EXTRAS=./src/otel-collector/otelcol-config-extras.yml
+OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_GRPC}
+PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:8080/otlp-http/v1/traces
+
+# OpenTelemetry Resource Definitions
+OTEL_RESOURCE_ATTRIBUTES=service.namespace=opentelemetry-demo,service.version=${IMAGE_VERSION}
 
 # Metrics Temporality
 OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE=cumulative
 
+# ******************
+# Core Demo Services
+# ******************
+# Accounting Service
+ACCOUNTING_DOCKERFILE=./src/accounting/Dockerfile
+
+# Ad Service
+AD_PORT=9555
+AD_ADDR=ad:${AD_PORT}
+AD_DOCKERFILE=./src/ad/Dockerfile
+
+# Cart Service
+CART_PORT=7070
+CART_ADDR=cart:${CART_PORT}
+CART_DOCKERFILE=./src/cart/src/Dockerfile
+
+# Checkout Service
+CHECKOUT_PORT=5050
+CHECKOUT_ADDR=checkout:${CHECKOUT_PORT}
+CHECKOUT_DOCKERFILE=./src/checkout/Dockerfile
+
+# Currency Service
+CURRENCY_PORT=7001
+CURRENCY_ADDR=currency:${CURRENCY_PORT}
+CURRENCY_DOCKERFILE=./src/currency/Dockerfile
+
+# Email Service
+EMAIL_PORT=6060
+EMAIL_ADDR=http://email:${EMAIL_PORT}
+EMAIL_DOCKERFILE=./src/email/Dockerfile
+
+# Fraud Service
+FRAUD_DOCKERFILE=./src/fraud-detection/Dockerfile
+
 # Frontend
 FRONTEND_PORT=8080
 FRONTEND_ADDR=frontend:${FRONTEND_PORT}
+FRONTEND_DOCKERFILE=./src/frontend/Dockerfile
 
-# Envoy
+# Frontend Proxy (Envoy)
 FRONTEND_HOST=frontend
 ENVOY_PORT=8080
+FRONTEND_PROXY_ADDR=frontend-proxy:${ENVOY_PORT}
+FRONTEND_PROXY_DOCKERFILE=./src/frontend-proxy/Dockerfile
 
-# Redis
-REDIS_PORT=6379
-REDIS_ADDR=redis-cart:${REDIS_PORT}
-
-# Services
-AD_SERVICE_PORT=9555
-AD_SERVICE_ADDR=adservice:${AD_SERVICE_PORT}
-
-CART_SERVICE_PORT=7070
-CART_SERVICE_ADDR=cartservice:${CART_SERVICE_PORT}
-
-CHECKOUT_SERVICE_PORT=5050
-CHECKOUT_SERVICE_ADDR=checkoutservice:${CHECKOUT_SERVICE_PORT}
-
-CURRENCY_SERVICE_PORT=7001
-CURRENCY_SERVICE_ADDR=currencyservice:${CURRENCY_SERVICE_PORT}
-
-EMAIL_SERVICE_PORT=6060
-EMAIL_SERVICE_ADDR=http://emailservice:${EMAIL_SERVICE_PORT}
-
-PAYMENT_SERVICE_PORT=50051
-PAYMENT_SERVICE_ADDR=paymentservice:${PAYMENT_SERVICE_PORT}
-
-PRODUCT_CATALOG_SERVICE_PORT=3550
-PRODUCT_CATALOG_SERVICE_ADDR=productcatalogservice:${PRODUCT_CATALOG_SERVICE_PORT}
-
-QUOTE_SERVICE_PORT=8090
-QUOTE_SERVICE_ADDR=http://quoteservice:${QUOTE_SERVICE_PORT}
-
-RECOMMENDATION_SERVICE_PORT=9001
-RECOMMENDATION_SERVICE_ADDR=recommendationservice:${RECOMMENDATION_SERVICE_PORT}
-
-SHIPPING_SERVICE_PORT=50050
-SHIPPING_SERVICE_ADDR=shippingservice:${SHIPPING_SERVICE_PORT}
-
-FEATURE_FLAG_SERVICE_PORT=8081
-FEATURE_FLAG_SERVICE_ADDR=featureflagservice:${FEATURE_FLAG_SERVICE_PORT}
-FEATURE_FLAG_SERVICE_HOST=feature-flag-service
-FEATURE_FLAG_GRPC_SERVICE_PORT=50053
-FEATURE_FLAG_GRPC_SERVICE_ADDR=featureflagservice:${FEATURE_FLAG_GRPC_SERVICE_PORT}
+# Image Provider
+IMAGE_PROVIDER_HOST=image-provider
+IMAGE_PROVIDER_PORT=8081
+IMAGE_PROVIDER_DOCKERFILE=./src/image-provider/Dockerfile
 
 # Load Generator
 LOCUST_WEB_PORT=8089
-LOCUST_USERS=10
-LOCUST_HOST=http://${FRONTEND_ADDR}
-LOCUST_WEB_HOST=loadgenerator
+LOCUST_USERS=5
+LOCUST_HOST=http://${FRONTEND_PROXY_ADDR}
+LOCUST_WEB_HOST=load-generator
 LOCUST_AUTOSTART=true
 LOCUST_HEADLESS=false
+LOAD_GENERATOR_DOCKERFILE=./src/load-generator/Dockerfile
 
-# Prometheus
-PROMETHEUS_SERVICE_PORT=9090
-PROMETHEUS_SERVICE_HOST=prometheus
+# Payment Service
+PAYMENT_PORT=50051
+PAYMENT_ADDR=payment:${PAYMENT_PORT}
+PAYMENT_DOCKERFILE=./src/payment/Dockerfile
 
+# Product Catalog Service
+PRODUCT_CATALOG_RELOAD_INTERVAL=10
+PRODUCT_CATALOG_PORT=3550
+PRODUCT_CATALOG_ADDR=product-catalog:${PRODUCT_CATALOG_PORT}
+PRODUCT_CATALOG_DOCKERFILE=./src/product-catalog/Dockerfile
+
+# Quote Service
+QUOTE_PORT=8090
+QUOTE_ADDR=http://quote:${QUOTE_PORT}
+QUOTE_DOCKERFILE=./src/quote/Dockerfile
+
+# Recommendation Service
+RECOMMENDATION_PORT=9001
+RECOMMENDATION_ADDR=recommendation:${RECOMMENDATION_PORT}
+RECOMMENDATION_DOCKERFILE=./src/recommendation/Dockerfile
+
+# Shipping Service
+SHIPPING_PORT=50050
+SHIPPING_ADDR=http://shipping:${SHIPPING_PORT}
+SHIPPING_DOCKERFILE=./src/shipping/Dockerfile
+
+# ******************
+# Dependent Services
+# ******************
+# Flagd
+FLAGD_HOST=flagd
+FLAGD_PORT=8013
+FLAGD_OFREP_PORT=8016
+
+# Flagd UI
+FLAGD_UI_HOST=flagd-ui
+FLAGD_UI_PORT=4000
+FLAGD_UI_DOCKERFILE=./src/flagd-ui/Dockerfile
+
+# Kafka
+KAFKA_PORT=9092
+KAFKA_HOST=kafka
+KAFKA_ADDR=${KAFKA_HOST}:${KAFKA_PORT}
+KAFKA_DOCKERFILE=./src/kafka/Dockerfile
+
+# Valkey
+VALKEY_PORT=6379
+VALKEY_ADDR=valkey-cart:${VALKEY_PORT}
+
+# ********************
+# Telemetry Components
+# ********************
 # Grafana
-GRAFANA_SERVICE_PORT=3000
-GRAFANA_SERVICE_HOST=grafana
+GRAFANA_PORT=3000
+GRAFANA_HOST=grafana
 
 # Jaeger
-JAEGER_SERVICE_PORT=16686
-JAEGER_SERVICE_HOST=jaeger
+JAEGER_PORT=16686
+JAEGER_HOST=jaeger
 
-ENV_PLATFORM=local
+# Prometheus
+PROMETHEUS_PORT=9090
+PROMETHEUS_HOST=prometheus
+PROMETHEUS_ADDR=${PROMETHEUS_HOST}:${PROMETHEUS_PORT}

.env.arm64

@@ -0,0 +1 @@
+_JAVA_OPTIONS=-XX:UseSVE=0

.env.override

@@ -0,0 +1,2 @@
+# DO NOT PUSH CHANGES OF THIS FILE TO opentelemetry/opentelemetry-demo
+# PLACE YOUR .env ENVIRONMENT VARIABLES OVERRIDES IN THIS FILE

.gitattributes

@@ -1,3 +1,5 @@
+
+
 * text=auto
 
 gradlew text eol=lf

.github/.mlc_config.json

@@ -1,16 +0,0 @@
-{
-    "ignorePatterns": [
-        {"pattern": "^http://localhost:8080"},
-        {"pattern": "^https://calendar.google.com/calendar"}
-    ],
-    "replacementPatterns": [
-        {
-            "pattern": "^/",
-            "replacement": "/github/workspace/"
-        }
-    ],
-    "aliveStatusCodes": [
-        200,
-        429
-    ]
-}

.github/ISSUE_TEMPLATE/bug_report.md

@@ -22,11 +22,11 @@ What do you expect to see?
 
 **What is the actual behavior?**
 
-What did you see instead?
+Please describe the actual behavior experienced.
 
 ## Reproduce
 
-Provide the minimum required steps to result in the issue you're observing.
+Could you provide the minimum required steps to resolve the issue you're seeing?
 
 We will close this issue if:
 
@@ -35,4 +35,4 @@ We will close this issue if:
 
 ## Additional Context
 
-Add any other context about the problem here.
+Please feel free to add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -18,7 +18,7 @@ If so, provide a concise description of the problem.
 
 **Describe the solution you'd like:**
 
-What do you want to happen instead? What is the expected behavior?
+What would you like to happen instead? What is the expected behavior?
 
 **Describe alternatives you've considered.**
 
@@ -26,4 +26,4 @@ Which alternative solutions or features have you considered?
 
 ## Additional Context
 
-Add any other context about the feature request here.
+Feel free to add any other context about the feature request here.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,10 +1,30 @@
-Fixes #.
-
-## Changes
+# Changes
 
 Please provide a brief description of the changes here.
 
-For significant contributions please make sure you have completed the following items:
+## Merge Requirements
 
-* [ ] Appropriate `CHANGELOG.md` updated for non-trivial changes
-* [ ] Design discussion issue #
+For new features contributions, please make sure you have completed the following
+essential items:
+
+* [ ] `CHANGELOG.md` updated to document new feature additions
+* [ ] Appropriate documentation updates in the [docs][]
+* [ ] Appropriate Helm chart updates in the [helm-charts][]
+
+<!--
+A Pull Request that modifies instrumentation code will likely require an
+update in docs. Please make sure to update the opentelemetry.io repo with any
+docs changes.
+
+A Pull Request that modifies docker-compose.yaml, otelcol-config.yaml, or
+Grafana dashboards will likely require an update to the Demo Helm chart.
+Other changes affecting how a service is deployed will also likely require an
+update to the Demo Helm chart.
+-->
+
+Maintainers will not merge until the above have been completed. If you're unsure
+which docs need to be changed ping the
+[@open-telemetry/demo-approvers](https://github.com/orgs/open-telemetry/teams/demo-approvers).
+
+[docs]: https://opentelemetry.io/docs/demo/
+[helm-charts]: https://github.com/open-telemetry/opentelemetry-helm-charts

.github/component_owners.yml

@@ -0,0 +1,8 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+# this file is used by .github/workflows/assign-reviewers.yml
+components:
+  src/ad:
+    - jack-berg
+    - mateuszrzeszutek
+    - trask

.github/dependabot.yml

@@ -1,8 +1,83 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
 version: 2
 updates:
   - package-ecosystem: "github-actions"
-    directory: "/"
+    directories:
+      - "/"
+    groups:
+      actions-production-dependencies:
+        dependency-type: "production"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "gomod"
+    directories:
+      - "/src/**/*"
+    groups:
+      go-production-dependencies:
+        dependency-type: "production"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "gradle"
+    directories:
+      - "/src/**/*"
+    groups:
+      gradle-production-dependencies:
+        dependency-type: "production"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "pip"
+    directories:
+      - "/src/**/*"
+    groups:
+      pip-production-dependencies:
+        dependency-type: "production"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "nuget"
+    directories:
+      - "/src/**/*"
+    groups:
+      nuget-production-dependencies:
+        dependency-type: "production"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "composer"
+    directories:
+      - "/src/**/*"
+    groups:
+      composer-production-dependencies:
+        dependency-type: "production"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "npm"
+    directories:
+      - "/"
+      - "/src/flagd-ui/*"
+      - "/src/frontend/*"
+      - "/src/payment/*"
+    groups:
+      npm-production-dependencies:
+        dependency-type: "production"
+      npm-development-dependencies:
+        dependency-type: "development"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "cargo"
+    directories:
+      - "/src/shipping/*"
+    groups:
+      cargo-production-dependencies:
+        dependency-type: "production"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "bundler"
+    directories:
+      - "/src/email/*"
+    groups:
+      bundler-production-dependencies:
+        dependency-type: "production"
+      bundler-development-dependencies:
+        dependency-type: "development"
     schedule:
       interval: "daily"
-    labels:
-      - "infra"

.github/workflows/assign-reviewers.yml

@@ -0,0 +1,26 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+# assigns reviewers to pull requests in a similar way as CODEOWNERS, but doesn't require reviewers
+# to have write access to the repository
+# see .github/component_owners.yaml for the list of components and their owners
+name: Assign reviewers
+
+on:
+  # pull_request_target is needed instead of just pull_request
+  # because repository write permission is needed to assign reviewers
+  pull_request_target:
+
+permissions:
+  contents: read
+
+jobs:
+  assign-reviewers:
+    permissions:
+      pull-requests: write  # required for assigning reviewers to PRs
+    if: github.repository == 'open-telemetry/opentelemetry-demo'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dyladan/component-owners@main
+        with:
+          # using this action to request review only (not assignment)
+          assign-owners: false

.github/workflows/build-images.yml

@@ -0,0 +1,17 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+name: Test image generation
+
+on:
+  push:
+    paths:
+      - 'src/**'
+      - 'test/**'
+
+permissions:
+  contents: read
+
+jobs:
+  build_images:
+    if: github.repository == 'open-telemetry/opentelemetry-demo'
+    uses: ./.github/workflows/component-build-images.yml

.github/workflows/checks.yml

@@ -1,64 +1,83 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
 name: Checks
 
 on:
+  push:
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
+  workflow_dispatch:
+
+permissions:
+  contents: read
 
 jobs:
+  build_images:
+    permissions: # required by the reusable workflow
+      contents: read
+      packages: write
+    uses: ./.github/workflows/component-build-images.yml
+    with:
+      push: false
+      version: 'dev'
+
   markdownlint:
     runs-on: ubuntu-latest
     steps:
-    - name: check out code
-      uses: actions/checkout@v3
-
-    - name: install dependencies
-      run: npm install
-
-    - name: run markdownlint
-      run: make markdownlint
+      - name: check out code
+        uses: actions/checkout@v4
+      - name: install dependencies
+        run: npm install
+      - name: run markdownlint
+        run: make markdownlint
 
   yamllint:
     runs-on: ubuntu-latest
     steps:
-    - name: check out code
-      uses: actions/checkout@v3
-
-    - uses: actions/setup-python@v4
-      with:
-        python-version: '3.x'
-
-    - name: install yamllint
-      run: make install-yamllint
-
-    - name: run yamllint
-      run: yamllint . -f github
+      - name: check out code
+        uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+      - name: install yamllint
+        run: make install-yamllint
+      - name: run yamllint
+        run: yamllint . -f github
 
   misspell:
     runs-on: ubuntu-latest
     steps:
-    - name: check out code
-      uses: actions/checkout@v3
+      - name: check out code
+        uses: actions/checkout@v4
+      - name: run misspell
+        run: make misspell
 
-    - name: run misspell
-      run: make misspell
-
-  markdownlinkcheck:
-    name: markdownlinkcheck
+  checklinks:
+    name: linkspector
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - name: Run link check
-      uses: gaurav-nelson/github-action-markdown-link-check@v1
-      with:
-        use-quiet-mode: 'no'
-        use-verbose-mode: 'yes'
-        config-file: '.github/.mlc_config.json'
+      - uses: actions/checkout@v4
+      - name: Run linkspector
+        uses: umbrelladocs/action-linkspector@v1
+        with:
+          level: info
+          fail_level: any
+          config_file: '.linkspector.yml'
 
   sanity:
     runs-on: ubuntu-latest
-
     steps:
-    - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      - name: run sanitycheck.py
+        run: python3 ./internal/tools/sanitycheck.py
 
-    - name: run sanitycheck.py
-      run: python3 ./internal/tools/sanitycheck.py
+  checklicense:
+    runs-on: ubuntu-latest
+    steps:
+      - name: check out code
+        uses: actions/checkout@v4
+      - name: install tools
+        run: make install-tools
+      - name: run checklicense
+        run: make checklicense

.github/workflows/component-build-images.yml

@@ -0,0 +1,211 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+on:
+  workflow_call:
+    inputs:
+      push:
+        description: Should the images be pushed
+        default: false
+        required: false
+        type: boolean
+      version:
+        description: The version used when tagging the image
+        default: 'dev'
+        required: false
+        type: string
+      dockerhub_repo:
+        description: Docker Hub repository
+        default: 'otel/demo'
+        required: false
+        type: string
+      ghcr_repo:
+        description: GHCR repository
+        default: 'ghcr.io/open-telemetry/demo'
+        required: false
+        type: string
+
+permissions:
+  contents: read
+
+jobs:
+  protobufcheck:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Generate
+        run: make clean docker-generate-protobuf
+      - name: Check Clean Work Tree
+        run: make check-clean-work-tree
+
+  build_and_push_images:
+    runs-on: ubuntu-latest
+    needs: protobufcheck
+
+    permissions:
+      contents: read
+      packages: write
+
+    env:
+      RELEASE_VERSION: "${{ github.event.release.tag_name }}"
+
+    strategy:
+      fail-fast: false
+      matrix:
+        file_tag:
+          - file: ./src/accounting/Dockerfile
+            tag_suffix: accounting
+            context: ./
+            setup-qemu: true
+          - file: ./src/ad/Dockerfile
+            tag_suffix: ad
+            context: ./
+            setup-qemu: true
+          - file: ./src/cart/src/Dockerfile
+            tag_suffix: cart
+            context: ./
+            setup-qemu: false
+          - file: ./src/checkout/Dockerfile
+            tag_suffix: checkout
+            context: ./
+            setup-qemu: true
+          - file: ./src/currency/Dockerfile
+            tag_suffix: currency
+            context: ./
+            setup-qemu: true
+          - file: ./src/email/Dockerfile
+            tag_suffix: email
+            context: ./
+            setup-qemu: true
+          - file: ./src/fraud-detection/Dockerfile
+            tag_suffix: fraud-detection
+            context: ./
+            setup-qemu: true
+          - file: ./src/frontend/Dockerfile
+            tag_suffix: frontend
+            context: ./
+            setup-qemu: true
+          - file: ./src/frontend-proxy/Dockerfile
+            tag_suffix: frontend-proxy
+            context: ./
+            setup-qemu: true
+          - file: ./src/frontend/Dockerfile.cypress
+            tag_suffix: frontend-tests
+            context: ./
+            setup-qemu: true
+          - file: ./src/image-provider/Dockerfile
+            tag_suffix: image-provider
+            context: ./
+            setup-qemu: true
+          - file: ./src/kafka/Dockerfile
+            tag_suffix: kafka
+            context: ./
+            setup-qemu: true
+          - file: ./src/load-generator/Dockerfile
+            tag_suffix: load-generator
+            context: ./
+            setup-qemu: true
+          - file: ./src/payment/Dockerfile
+            tag_suffix: payment
+            context: ./
+            setup-qemu: true
+          - file: ./src/product-catalog/Dockerfile
+            tag_suffix: product-catalog
+            context: ./
+            setup-qemu: true
+          - file: ./src/quote/Dockerfile
+            tag_suffix: quote
+            context: ./
+            setup-qemu: true
+          - file: ./src/recommendation/Dockerfile
+            tag_suffix: recommendation
+            context: ./
+            setup-qemu: true
+          - file: ./src/shipping/Dockerfile
+            tag_suffix: shipping
+            context: ./
+            setup-qemu: true
+          - file: ./src/flagd-ui/Dockerfile
+            tag_suffix: flagd-ui
+            context: ./
+            setup-qemu: true
+          - file: ./test/tracetesting/Dockerfile
+            tag_suffix: traceBasedTests
+            context: ./
+            setup-qemu: true
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Load environment variables from .env file
+        run: |
+          if [ -f .env ]; then
+            # Filter out comments and empty lines, then add each variable to $GITHUB_ENV
+            grep -vE '^\s*#|^\s*$' .env | while read -r line; do
+              echo "$line" >> $GITHUB_ENV
+            done
+          else
+            echo ".env file not found!"
+            exit 1
+          fi
+      - name: Check for changes and set push options
+        id: check_changes
+        run: |
+          DOCKERFILE_DIR=$(dirname ${{ matrix.file_tag.file }})
+          FILES_CHANGED=$(git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ github.sha }} -- $DOCKERFILE_DIR)
+          FORCE_PUSH=${{ inputs.push }}
+          if [ "$FORCE_PUSH" = true ]; then
+            echo "Force push is enabled, proceeding with build."
+            echo "skip=false" >> "$GITHUB_OUTPUT"
+          elif [ -z "$FILES_CHANGED" ]; then
+            echo "No changes in ${{ matrix.file_tag.context }}, skipping build."
+            echo "skip=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "Changes detected in ${{ matrix.file_tag.context }}, proceeding with build."
+            echo "skip=false" >> "$GITHUB_OUTPUT"
+          fi
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+        if: ${{ inputs.push }}
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+        if: ${{ inputs.push }}
+      - name: Set up QEMU
+        if: ${{ matrix.file_tag.setup-qemu }}
+        uses: docker/setup-qemu-action@v3
+        with:
+          image: tonistiigi/binfmt:master
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          buildkitd-config-inline: |
+            [worker.oci]
+            max-parallelism = 2
+      - name: Matrix Build and push demo images
+        if: steps.check_changes.outputs.skip == 'false'
+        uses: docker/build-push-action@v6.18.0
+        with:
+          context: ${{ matrix.file_tag.context }}
+          file: ${{ matrix.file_tag.file }}
+          platforms: linux/amd64,linux/arm64
+          push: ${{ inputs.push }}
+          build-args: |
+            OTEL_JAVA_AGENT_VERSION=${{ env.OTEL_JAVA_AGENT_VERSION }}
+            OPENTELEMETRY_CPP_VERSION=${{ env.OPENTELEMETRY_CPP_VERSION }}
+            TRACETEST_IMAGE_VERSION=${{ env.TRACETEST_IMAGE_VERSION }}
+          tags: |
+            ${{ inputs.dockerhub_repo }}:${{ inputs.version }}-${{matrix.file_tag.tag_suffix }}
+            ${{ inputs.dockerhub_repo }}:latest-${{matrix.file_tag.tag_suffix }}
+            ${{ inputs.ghcr_repo }}:${{ inputs.version }}-${{ matrix.file_tag.tag_suffix }}
+            ${{ inputs.ghcr_repo }}:latest-${{ matrix.file_tag.tag_suffix }}
+          cache-from: type=gha
+          cache-to: type=gha

.github/workflows/dependabot-auto-update-protobuf-diff.yml

@@ -0,0 +1,37 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+on:
+  pull_request:
+    branches: [ main ]
+
+permissions:
+  contents: read
+
+jobs:
+  dependabot-auto-update-protobuf-diff:
+    permissions:
+      actions: write
+      pull-requests: write
+      contents: write
+      packages: write
+    runs-on: ubuntu-latest
+    # Only run this job if the PR is opened by dependabot and the last commit is from dependabot
+    if: github.event.pull_request.user.login == 'dependabot[bot]'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.head_ref }}
+          token: ${{ secrets.DEPENDABOT_TOKEN }}
+      - name: Generate
+        run: make clean docker-generate-protobuf
+      - name: Commit only if there are changes
+        run: |
+          if ! git diff --quiet; then
+            git config user.name "dependabot[bot]"
+            git config user.email "49699333+dependabot[bot]@users.noreply.github.com"
+            git add .
+            git commit -s -m "chore: update protobuf"
+            git push
+          fi

.github/workflows/fossa.yml

@@ -0,0 +1,23 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+name: FOSSA scanning
+
+on:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: read
+
+jobs:
+  fossa:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
+
+      - uses: fossas/fossa-action@3ebcea1862c6ffbd5cf1b4d0bd6b3fe7bd6f2cac  # v1.7.0
+        with:
+          api-key: ${{secrets.FOSSA_API_KEY}}
+          team: OpenTelemetry

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

@@ -0,0 +1,21 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+name: Gradle wrapper validation
+on:
+  pull_request:
+    paths:
+      - '**/gradle/wrapper/**'
+  push:
+    paths:
+      - '**/gradle/wrapper/**'
+
+permissions:
+  contents: read
+
+jobs:
+  validation:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: gradle/actions/wrapper-validation@v4.4.1

.github/workflows/label-pr.yml

@@ -0,0 +1,63 @@
+# 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]
+
+permissions:
+  contents: read
+
+jobs:
+  label:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+      contents: read
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Check for changed files
+        id: file_changes
+        uses: dorny/paths-filter@v3
+        with:
+          list-files: shell
+          filters: |
+            docsUpdateRequired:
+              - 'src/flagd/**'
+            helmUpdateRequired:
+              - '.env'
+              - 'docker-compose*.yml'
+              - 'src/flagd/**'
+              - 'src/grafana/**'
+              - 'src/otel-collector/**'
+              - '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']
+            })

.github/workflows/nightly-release.yml

@@ -0,0 +1,23 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+name: Nightly Release
+
+on:
+  schedule:
+    # Runs at 00:00 UTC every day
+    - cron: '0 0 * * *'
+
+permissions:
+  contents: read
+
+jobs:
+  build_and_push_images:
+    permissions:  # required by the reusable workflow
+      contents: read
+      packages: write
+    uses: ./.github/workflows/component-build-images.yml
+    if: github.repository == 'open-telemetry/opentelemetry-demo'
+    with:
+      push: true
+      version: nightly-${{ github.run_id }}
+    secrets: inherit

.github/workflows/ossf-scorecard.yml

@@ -0,0 +1,50 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+name: OSSF Scorecard
+
+on:
+  push:
+    branches:
+      - main
+  schedule:
+    - cron: "25 11 * * 3"    # once a week
+  workflow_dispatch:
+
+permissions: read-all
+
+jobs:
+  analysis:
+    runs-on: ubuntu-latest
+    permissions:
+      # Needed for Code scanning upload
+      security-events: write
+      # Needed for GitHub OIDC token if publish_results is true
+      id-token: write
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683    # v4.2.2
+        with:
+          persist-credentials: false
+
+      - uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde    # v2.4.2
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          publish_results: true
+
+      # Upload the results as artifacts (optional). Commenting out will disable
+      # uploads of run results in SARIF format to the repository Actions tab.
+      # https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
+      - name: "Upload artifact"
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02    # v4.6.2
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
+
+      # Upload the results to GitHub's code scanning dashboard (optional).
+      # Commenting out will disable upload of results to your repo's Code Scanning dashboard
+      - name: "Upload to code-scanning"
+        uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b    # v3.29.2
+        with:
+          sarif_file: results.sarif

.github/workflows/release.yml

@@ -1,51 +1,22 @@
-name: "Release"
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+name: "Build and Publish"
 
 on:
   release:
     types: [published]
 
+permissions:
+  contents: read
+
 jobs:
   build_and_push_images:
-    runs-on: ubuntu-latest
-    permissions:
+    permissions:  # required by the reusable workflow
       contents: read
       packages: write
-
-    env:
-      RELEASE_VERSION: "${{ github.event.release.tag_name }}"
-      DOCKERHUB_REPO: "otel/demo"
-      GHCR_REPO: "ghcr.io/open-telemetry/demo"
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      # limit docker push image concurrency to 1
-      # to avoid github package return 429 ratelimit error
-      - name: Set docker upload concurrent
-        run: |
-          echo $'{"max-concurrent-uploads": 1}' | sudo dd status=none of=/etc/docker/daemon.json
-          sudo service docker restart
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: prepare build env
-        run: make build-env-file
-
-      - name: build and push ghcr docker image
-        run: make build-and-push-ghcr
-
-      - name: build and push dockerhub image
-        run: make build-and-push-dockerhub
+    uses: ./.github/workflows/component-build-images.yml
+    if: github.repository == 'open-telemetry/opentelemetry-demo'
+    with:
+      push: true
+      version: ${{ github.event.release.tag_name }}
+    secrets: inherit

.github/workflows/run-integration-tests.yml

@@ -0,0 +1,23 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+name: Integration Tests
+
+on:
+  pull_request_review:
+    types:
+      - submitted
+
+permissions:
+  contents: read
+
+jobs:
+  run_tests:
+    runs-on: ubuntu-latest
+    name: "Run CI"
+    if: github.event.review.state == 'APPROVED'
+    steps:
+      - name: check out code
+        uses: actions/checkout@v4
+      - name: run tracetesting
+        run: |
+          make build && docker system prune -f && make run-tracetesting

.github/workflows/stale.yml

@@ -1,3 +1,5 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
 # Syntax: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
 # Github Actions Stale: https://github.com/actions/stale
 
@@ -6,11 +8,17 @@ on:
   schedule:
     - cron: "12 3 * * *"  # arbitrary time not to DDOS GitHub
 
+permissions:
+  contents: read
+
 jobs:
   stale:
+    permissions:
+      issues: write  # for actions/stale to close stale issues
+      pull-requests: write  # for actions/stale to close stale PRs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v5
+      - uses: actions/stale@v9
         with:
           stale-pr-message: 'This PR was marked stale due to lack of activity. It will be closed in 7 days.'
           close-pr-message: 'Closed as inactive. Feel free to reopen if this PR is still being worked on.'

.gitignore

@@ -9,6 +9,8 @@
 .DS_Store
 \#*\#
 
+docker-compose.override.yml
+
 # Eclipse
 .classpath
 .project
@@ -22,16 +24,31 @@ obj/
 .idea/
 build/
 node_modules/
-src/shippingservice/target/
-
 coverage
 .next/
 out/
 build
-src/frontend/protos
 next-env.d.ts
-src/frontend/cypress/videos
-src/frontend/cypress/screenshots
 vendor/
 composer.lock
 .venv
+.dockerhub.env
+.ghcr.env
+
+src/frontend/cypress/videos
+src/frontend/cypress/screenshots
+src/shipping/target/
+test/tracetesting/tracetesting-vars.yaml
+
+# Ignore copied/generated protobuf files
+/src/accounting/src/protos/
+/src/cart/src/protos/
+/src/fraud-detection/src/main/proto
+/src/payment/demo.proto
+/src/shipping/proto/
+/src/currency/proto
+
+# Android
+*.apk
+
+!src/currency/build

.licenserc.json

@@ -0,0 +1,60 @@
+{
+    "**/*.{go,cs,h,cpp,js,ts,tsx,rs}": [
+      "// Copyright The OpenTelemetry Authors",
+      "// SPDX-License-Identifier: Apache-2.0"
+    ],
+    "**/*.php": [
+      "<?php",
+      "// Copyright The OpenTelemetry Authors",
+      "// SPDX-License-Identifier: Apache-2.0"
+    ],
+    "**/*.java": [
+      "/*",
+      "* Copyright The OpenTelemetry Authors",
+      "* SPDX-License-Identifier: Apache-2.0",
+      "*/"
+    ],
+    "**/*.py": [
+      "#!/usr/bin/python",
+      "# Copyright The OpenTelemetry Authors",
+      "# SPDX-License-Identifier: Apache-2.0"
+    ],
+    "**/*.sh": [
+      "#!/bin/sh",
+      "# Copyright The OpenTelemetry Authors",
+      "# SPDX-License-Identifier: Apache-2.0"
+    ],
+    "**/*.{ex,exs,rb,yaml,yml,yamllint}": [
+      "# Copyright The OpenTelemetry Authors",
+      "# SPDX-License-Identifier: Apache-2.0"
+    ],
+    "**/*.sql": [
+      "-- Copyright The OpenTelemetry Authors",
+      "-- SPDX-License-Identifier: Apache-2.0"
+    ],
+    "**/{Dockerfile,Makefile}": [
+      "# Copyright The OpenTelemetry Authors",
+      "# SPDX-License-Identifier: Apache-2.0"
+    ],
+    "ignore": [
+        "node_modules/",
+        "src/accounting/bin/",
+        "src/accounting/obj/",
+        "/src/accounting/src/protos/",
+        "src/cart/src/obj/",
+        "src/cart/tests/obj/",
+        "src/currency/build/",
+        "src/checkout/genproto/",
+        "src/product-catalog/genproto/",
+        "src/react-native-app/ios/Pods/",
+        "src/react-native-app/ios/build/",
+        "src/react-native-app/android/app/build/",
+        "src/react-native-app/android/.gradle/",
+        "src/react-native-app/.expo/",
+        "src/react-native-app/expo-env.d.ts",
+        "src/recommendation/demo_pb2.py",
+        "src/recommendation/demo_pb2_grpc.py",
+        "src/frontend/protos/demo.ts",
+        "internal/tools/"
+    ]
+  }

.linkspector.yml

@@ -0,0 +1,20 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+dirs:
+  - .
+
+excludedFiles:
+  - ./CHANGELOG.md
+
+ignorePatterns:
+  - pattern: "^http://localhost:8080"
+  - pattern: "^https://calendar.google.com/calendar"
+
+aliveStatusCodes:
+  - 200
+  - 429
+
+useGitIgnore: true
+
+modifiedFilesOnly: false

.markdownlint.yaml

@@ -1,3 +1,6 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 # Default state for all rules
 default: true
 

.yamlignore

@@ -0,0 +1 @@
+kubernetes/opentelemetry-demo.yaml

.yamllint

@@ -1,5 +1,9 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
 extends: default
 
+ignore-from-file: [.gitignore, .yamlignore]
+
 rules:
   document-start: disable
   octal-values: enable

CHANGELOG.md

@@ -1,40 +1,785 @@
 # Changelog
 
 Please update changelog as part of any significant pull request. Place short
-description of your change into "Unreleased" section. As part of release process
-content of "Unreleased" section content will generate release notes for the
-release.
+description of your change into "Unreleased" section. As part of release
+process content of "Unreleased" section content will generate release notes for
+the release.
 
 ## Unreleased
 
-* The initial code base is donated from a
-[fork](https://github.com/julianocosta89/opentelemetry-microservices-demo) of
-the [Google microservices
-demo](https://github.com/GoogleCloudPlatform/microservices-demo) with express
-knowledge of the owners. The pre-existing copyrights will remain. Any future
-significant modifications will be credited to OpenTelemetry Authors.
-* Added feature flag service protos
-([#26](https://github.com/open-telemetry/opentelemetry-demo/pull/26))
-* Added span attributes to frontend service
-([#82](https://github.com/open-telemetry/opentelemetry-demo/pull/82))
-* Rewrote shipping service in Rust
-([#35](https://github.com/open-telemetry/opentelemetry-demo/issues/35))
-* Added feature flag service implementation
-([#141](https://github.com/open-telemetry/opentelemetry-demo/pull/141))
-* Added additional attributes to productcatalog service
-([#143](https://github.com/open-telemetry/opentelemetry-demo/pull/143))
-* Added manual instrumentation to ad service
-([#150](https://github.com/open-telemetry/opentelemetry-demo/pull/150))
-* Added manual instrumentation to email service
-([#158](https://github.com/open-telemetry/opentelemetry-demo/pull/158))
-* Added basic metric support and Prometheus storage
-([#160](https://github.com/open-telemetry/opentelemetry-demo/pull/160))
-* Added manual instrumentation to recommendation service
-([#163](https://github.com/open-telemetry/opentelemetry-demo/pull/163))
-* Added manual instrumentation to checkout service
-([#164](https://github.com/open-telemetry/opentelemetry-demo/pull/164))
-* Added Grafana service and enhanced metric experience
-([#175](https://github.com/open-telemetry/opentelemetry-demo/pull/175))
+* [chore] add GOMEMLIMIT to all Go services
+  ([#2148](https://github.com/open-telemetry/opentelemetry-demo/pull/2148))
+* [product-catalog] Simplify span event name
+  ([#2150](https://github.com/open-telemetry/opentelemetry-demo/pull/2150))
+* [cartservice] Refactor OpenFeature integration and add Dependency Injection support
+  ([#2160](https://github.com/open-telemetry/opentelemetry-demo/pull/2160))
+* [checkout]: change image from alpine to distroless to reduce size
+  ([#2161](https://github.com/open-telemetry/opentelemetry-demo/pull/2161))
+* [product-catalog]: change image from alpine to distroless to reduce size
+  ([#2161](https://github.com/open-telemetry/opentelemetry-demo/pull/2161))
+* [grafana] configure `traceToLogs` integration
+  ([#2162](https://github.com/open-telemetry/opentelemetry-demo/pull/2162))
+* [recommendation] change image from bookworm to alpine to reduce size
+  ([#2164](https://github.com/open-telemetry/opentelemetry-demo/pull/2164))
+* [fraud-detection] update distroless to debian12
+  ([#2170](https://github.com/open-telemetry/opentelemetry-demo/pull/2170))
+* [chore] bump dependent images
+  ([#2179](https://github.com/open-telemetry/opentelemetry-demo/pull/2179))
+* [image-provider]: replace bookworm image with nonroot alpine image
+  ([#2193](https://github.com/open-telemetry/opentelemetry-demo/pull/2193))
+* [kafka] update image to latest
+  ([#2194](https://github.com/open-telemetry/opentelemetry-demo/pull/2194))
+* [email] bump ruby and dependencies to latest and switch to alpine
+  ([#2196](https://github.com/open-telemetry/opentelemetry-demo/pull/2196))
+* [cartservice] Upgrade OpenFeature version and change Hooks integration
+  ([#2199](https://github.com/open-telemetry/opentelemetry-demo/pull/2199))
+* [shipping] refactor service to use actix-web and demo instrumentation library
+  ([#2214](https://github.com/open-telemetry/opentelemetry-demo/pull/2214))
+* [quote] replace debian image with latest alpine image
+  ([#2216](https://github.com/open-telemetry/opentelemetry-demo/pull/2216))
+* [payment] change image from alpine to distroless to reduce size
+  ([#2224](https://github.com/open-telemetry/opentelemetry-demo/pull/2224))
+* [frontend] change image from alpine to distroless to reduce size
+  ([#2224](https://github.com/open-telemetry/opentelemetry-demo/pull/2224))
+* [flagd-ui] change image from alpine to distroless to reduce size
+  ([#2224](https://github.com/open-telemetry/opentelemetry-demo/pull/2224))
+* [load-generator] Update locustfile for logging with TraceContext
+  ([#2265](https://github.com/open-telemetry/opentelemetry-demo/pull/2265))
+* [product-catalog] Add OTel grpc Logs to Product Catalog
+  ([#2285](https://github.com/open-telemetry/opentelemetry-demo/pull/2285))
+* [currency] update alpine to 3.21
+  ([#2291](https://github.com/open-telemetry/opentelemetry-demo/pull/2291))
+* [shipping]: replace debian image with distroless image
+  ([#2294](https://github.com/open-telemetry/opentelemetry-demo/pull/2294))
+* [currency] update alpine to 3.21
+  ([#2291](https://github.com/open-telemetry/opentelemetry-demo/pull/2291))
+* [currency] Update code to use new semconv and remove unused file
+  ([#2319](https://github.com/open-telemetry/opentelemetry-demo/pull/2319))
+* [load-generator] Split trace grouping based on workflow context
+  ([#2321](https://github.com/open-telemetry/opentelemetry-demo/pull/2321))
+* [image-provider] Add nginx metrics receiver and dashboard
+  ([#2330](https://github.com/open-telemetry/opentelemetry-demo/pull/2330))
+* [react-native-app] Update how resource attributes are set up
+  ([#2331](https://github.com/open-telemetry/opentelemetry-demo/pull/2331))
+* [cartservice] Upgrade OpenFeature and add new telemetry Hooks
+  ([#2332](https://github.com/open-telemetry/opentelemetry-demo/pull/2332))
+* [checkout] Add OTel grpc Logs to checkout
+  ([#2336](https://github.com/open-telemetry/opentelemetry-demo/pull/2336))
+
+## 2.0.2
+
+* [frontend] Update OpenTelemetry Browser SDK initialization
+  ([#2092](https://github.com/open-telemetry/opentelemetry-demo/pull/2092))
+* [quote] Updated open-telemetry/exporter-otlp to 1.2.1 which includes the
+  fix for `IS_REMOTE` flag feature
+  ([#2112](https://github.com/open-telemetry/opentelemetry-demo/pull/2112))
+* [load-generator] Change OpenFeature Evaluation to Remote Evaluation Protocol,
+  based on [this issue in OpenFeature/python-sdk-contrib](https://github.com/open-feature/python-sdk-contrib/issues/198)
+  ([#2114](https://github.com/open-telemetry/opentelemetry-demo/pull/2114))
+* [flagd-ui] increase memory to 100MB
+  ([#2120](https://github.com/open-telemetry/opentelemetry-demo/pull/2120))
+* [cartservice] change custom metrics to use seconds
+  ([#2135](https://github.com/open-telemetry/opentelemetry-demo/pull/2135))
+
+## 2.0.1
+
+* [chore] Use Linkspector to check links
+  ([#2070](https://github.com/open-telemetry/opentelemetry-demo/pull/2070))
+* [frontend] Cypress tests base image updated to 14.0.3
+  ([#2072](https://github.com/open-telemetry/opentelemetry-demo/pull/2072))
+* [grafana] Update dashboards with service map
+  ([#2085](https://github.com/open-telemetry/opentelemetry-demo/pull/2085))
+
+## 2.0.0
+
+* [grafana] Update grafana to 11.3.0
+  ([#1764](https://github.com/open-telemetry/opentelemetry-demo/pull/1764))
+* [chore] Move build args to .env file
+  ([#1767](https://github.com/open-telemetry/opentelemetry-demo/pull/1767))
+* [frontendproxy] add access logs
+  ([#1768](https://github.com/open-telemetry/opentelemetry-demo/pull/1768))
+* [grafana] Fix Dashboards
+  ([#1779](https://github.com/open-telemetry/opentelemetry-demo/pull/1779))
+* [accountingservice] bump OpenTelemetry .NET Automatic Instrumentation
+  to 1.9.0 ([#1780](https://github.com/open-telemetry/opentelemetry-demo/pull/1780))
+* [react-native-app] Add React Native example app
+  ([#1781](https://github.com/open-telemetry/opentelemetry-demo/pull/1781))
+* [chore] Add multi-platform build support
+  ([#1785](https://github.com/open-telemetry/opentelemetry-demo/pull/1785))
+* [chore] update memory limits for flagd, flagdui, and loadgenerator
+  ([#1786](https://github.com/open-telemetry/opentelemetry-demo/pull/1786))
+* [chore] Generate protobuf code for Go and Python services
+  ([#1794](https://github.com/open-telemetry/opentelemetry-demo/pull/1784))
+* [paymentservice] Add nodejs instrumentation for runtime metrics
+  ([#1797](https://github.com/open-telemetry/opentelemetry-demo/pull/1797))
+* [flagd and paymentservice] Update `paymentServiceFailure` to use a list of
+  variants and add loyalty level attributes to spans. Added `service.name` to logs.
+  ([#1815](https://github.com/open-telemetry/opentelemetry-demo/pull/1815))
+* [accounting] rename accountingservice to accounting
+  ([#1827](https://github.com/open-telemetry/opentelemetry-demo/pull/1827))
+* [cartservice] - Add Exemplars to Cart Service
+  ([#1830](https://github.com/open-telemetry/opentelemetry-demo/pull/1830))
+* [ad] rename adservice to ad
+  ([#1832](https://github.com/open-telemetry/opentelemetry-demo/pull/1832))
+* [grafana] Add Exemplars Dashboard
+  ([#1836](https://github.com/open-telemetry/opentelemetry-demo/pull/1836))
+* [quote] rename quoteservice to quote
+  ([#1838](https://github.com/open-telemetry/opentelemetry-demo/pull/1838))
+* [cart] rename cartservice to cart
+  ([#1839](https://github.com/open-telemetry/opentelemetry-demo/pull/1839))
+* [flagd-ui] rename flagdui to flagd-ui
+  ([#1840](https://github.com/open-telemetry/opentelemetry-demo/pull/1840))
+* [otel-collector] rename otelcol to otel-collector
+  ([#1841](https://github.com/open-telemetry/opentelemetry-demo/pull/1841))
+* [shipping] rename shippingservice to shipping
+  ([#1842](https://github.com/open-telemetry/opentelemetry-demo/pull/1842))
+* [chore] Update demo Dependencies (Collector, Grafana, FlagD, Jaeger, Prometheus)
+  ([#1855](https://github.com/open-telemetry/opentelemetry-demo/pull/1855))
+* [load-generator] rename loadgenerator to load-generator
+  ([#1856](https://github.com/open-telemetry/opentelemetry-demo/pull/1856))
+* [image-provider] rename imageprovider to image-provider
+  ([#1857](https://github.com/open-telemetry/opentelemetry-demo/pull/1857))
+* [currency] rename currencyservice to currency
+  ([#1858](https://github.com/open-telemetry/opentelemetry-demo/pull/1858))
+* [email] rename emailservice to email
+  ([#1861](https://github.com/open-telemetry/opentelemetry-demo/pull/1861))
+* [fraud-detection] rename frauddetectionservice to fraud-detection
+  ([#1862](https://github.com/open-telemetry/opentelemetry-demo/pull/1862))
+* [payment] rename paymentservice to payment
+  ([#1863](https://github.com/open-telemetry/opentelemetry-demo/pull/1863))
+* [recommendation] rename recommendationservice to recommendation
+  ([#1865](https://github.com/open-telemetry/opentelemetry-demo/pull/1865))
+* [product-catalog] rename productcatalogservice to product-catalog
+  ([#1864](https://github.com/open-telemetry/opentelemetry-demo/pull/1864))
+* [checkout] rename checkoutservice to checkout
+  ([#1867](https://github.com/open-telemetry/opentelemetry-demo/pull/1867))
+* [chore] remove `SERVICE_` from environment variables
+  ([#1897](https://github.com/open-telemetry/opentelemetry-demo/pull/1897))
+* [frontend-proxy] rename frontendproxy to frontend-proxy
+  ([#1910](https://github.com/open-telemetry/opentelemetry-demo/pull/1910))
+* [product-catalog] load product list on a periodic timer
+  ([#1919](https://github.com/open-telemetry/opentelemetry-demo/pull/1919))
+* [flagd-ui] fixed eslint ignore comment with useCallback
+  ([#1923](https://github.com/open-telemetry/opentelemetry-demo/pull/1923))
+* [frontend-proxy] fix envoy access logs
+  ([#1930](https://github.com/open-telemetry/opentelemetry-demo/pull/1930))
+* [chore] Add memory for frontend-proxy, kafka, grafana, opensearch
+  ([#1931](https://github.com/open-telemetry/opentelemetry-demo/pull/1931))
+* [frontendproxy] fix Docker compose DNS resolver with envoy 1.32
+  ([#1936](https://github.com/open-telemetry/opentelemetry-demo/pull/1936))
+* [chore] Generate protobuf code for Typescript service - Frontend
+  ([#1954](https://github.com/open-telemetry/opentelemetry-demo/pull/1954))
+* [accounting] bump OpenTelemetry .NET Automatic Instrumentation to 1.10.0
+  ([#1998](https://github.com/open-telemetry/opentelemetry-demo/pull/1998))
+* [frontend] update to Node 22
+  ([#2025](https://github.com/open-telemetry/opentelemetry-demo/pull/2025))
+* [frontend] move page titles to individual pages
+  ([#2025](https://github.com/open-telemetry/opentelemetry-demo/pull/2025))
+
+## 1.12.0
+
+* [accountingservice] allow running the container with non root user
+  ([#1692](https://github.com/open-telemetry/opentelemetry-demo/pull/1692))
+* [chore] Add yamllint to `make all`
+  ([#1707](https://github.com/open-telemetry/opentelemetry-demo/pull/1707))
+* [chore] Fix gen-proto for accountingservice
+  ([#1709](https://github.com/open-telemetry/opentelemetry-demo/pull/1709))
+* [chore] Add depends on to otelcol to wait on healthy opensearch
+  ([#1724](https://github.com/open-telemetry/opentelemetry-demo/pull/1724))
+* [flagd-ui] Add UI for managing Flagd feature flags
+  ([#1725](https://github.com/open-telemetry/opentelemetry-demo/pull/1725))
+* [accountingservice] bump OpenTelemetry .NET Automatic Instrumentation
+  to 1.8.0 together with other dependencies
+  ([#1727](https://github.com/open-telemetry/opentelemetry-demo/pull/1727))
+* [frontend] fix imageSlowLoad headers not applied
+  to 1.8.0 together with other dependencies
+  ([#1733](https://github.com/open-telemetry/opentelemetry-demo/pull/1733))
+* [cartservice] Propagate cartservice exceptions
+  ([#1744](https://github.com/open-telemetry/opentelemetry-demo/pull/1744))
+* [cartservice] Update cart service to fail when cartServiceFailure is enabled
+  ([#1748](https://github.com/open-telemetry/opentelemetry-demo/pull/1748))
+
+## 1.11.1
+
+* [otel-col] Add docker stats receiver
+  ([#1650](https://github.com/open-telemetry/opentelemetry-demo/pull/1650))
+* [otel-col] strip high-cardinality segments of span names
+  ([#1668](https://github.com/open-telemetry/opentelemetry-demo/pull/1668))
+* [tests] run trace based tests concurrently
+  ([#1659](https://github.com/open-telemetry/opentelemetry-demo/pull/1659))
+* [otel-col] Set OTLP receiver endpoint to avoid breaking changes
+  ([#1662](https://github.com/open-telemetry/opentelemetry-demo/pull/1662))
+* [accountingservice] increase memory to 120MB
+  ([#1666](https://github.com/open-telemetry/opentelemetry-demo/pull/1666))
+* [frontend] Update nodejs to latest LTS and bump dependencies
+  ([#1670](https://github.com/open-telemetry/opentelemetry-demo/pull/1670))
+* [otel-col] Add host metrics receiver
+  ([#1675](https://github.com/open-telemetry/opentelemetry-demo/pull/1675))
+* [adservice] bump dependencies & gradle version
+  ([#1681](https://github.com/open-telemetry/opentelemetry-demo/pull/1681))
+
+## 1.11.0
+
+* [accountingservice] convert from Go service to .NET service, uses
+  OpenTelemetry .NET Automatic Instrumentation.
+  ([#1538](https://github.com/open-telemetry/opentelemetry-demo/pull/1538))
+* [frontend] fixed default flagd port for HTTPS connections
+  ([#1609](https://github.com/open-telemetry/opentelemetry-demo/pull/1609))
+* [cartservice] bump .NET package to 1.9.0 release
+  ([#1610](https://github.com/open-telemetry/opentelemetry-demo/pull/1610))
+* [Valkey] Replace Redis with Valkey
+  ([#1619](https://github.com/open-telemetry/opentelemetry-demo/pull/1619))
+* [recommendation] updated flag name to match flagd configuration
+  ([#1634](https://github.com/open-telemetry/opentelemetry-demo/pull/1634))
+
+## 1.10.0
+
+* [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))
+* [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))
+* [kafka] add kafkaQueueProblems feature flag
+  ([#1528](https://github.com/open-telemetry/opentelemetry-demo/pull/1528))
+* [otelcollector] Add `redisreceiver`
+  ([#1537](https://github.com/open-telemetry/opentelemetry-demo/pull/1537))
+* [traceBasedTests] update to v1.0.0
+  ([#1551](https://github.com/open-telemetry/opentelemetry-demo/pull/1551))
+* [flagd] update to 0.10.1 and set 50M memory limit
+  ([#1554](https://github.com/open-telemetry/opentelemetry-demo/pull/1554))
+* [loadgenerator] Configure feature flag evaluation tracing
+  ([#1553](https://github.com/open-telemetry/opentelemetry-demo/pull/1553))
+* [recommendationservice] Configure feature flag evaluation tracing
+  ([#1553](https://github.com/open-telemetry/opentelemetry-demo/pull/1553))
+* [loadgenerator] Fix feature flag hooks setter method
+  ([#1556](https://github.com/open-telemetry/opentelemetry-demo/pull/1556))
+* [frontend] Slowloading of images based on imageSlowLoad flag
+  ([#1515](https://github.com/open-telemetry/opentelemetry-demo/pull/1486))
+* [frontend] Fix imageloading issues on optimized images. bump next.js version
+  ([#1571](https://github.com/open-telemetry/opentelemetry-demo/pull/1571))
+* [cartservice] bump .NET package to 1.8.1 release
+  ([#1514](https://github.com/open-telemetry/opentelemetry-demo/pull/1514),
+   [#1580](https://github.com/open-telemetry/opentelemetry-demo/pull/1580))
+* [kafka] Fix permission issue with the telemetry agent when running in docker compose
+  ([#1574](https://github.com/open-telemetry/opentelemetry-demo/pull/1574))
+* [flagd] Add flagd service to minimal docker compose deployment
+  ([#1585](https://github.com/open-telemetry/opentelemetry-demo/pull/1585))
+* [kafka] Increase memory and Java heap limits
+  ([#1592](https://github.com/open-telemetry/opentelemetry-demo/pull/1592))
+* chore: Add service version to OTEL_RESOURCE_ATTRIBUTES
+  ([#1594](https://github.com/open-telemetry/opentelemetry-demo/pull/1594))
+* [checkout] increase Kafka resiliency and observability
+  ([#1590](https://github.com/open-telemetry/opentelemetry-demo/pull/1590))
+
+## 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
+  ([#1400](https://github.com/open-telemetry/opentelemetry-demo/pull/1400))
+* [chore] increase memory for Collector and Jaeger
+  ([#1396](https://github.com/open-telemetry/opentelemetry-demo/pull/1396))
+* [chore] fix Make targets for restart and redeploy
+  ([#1397](https://github.com/open-telemetry/opentelemetry-demo/pull/1397))
+* [chore] add nightly releases
+  ([#1398](https://github.com/open-telemetry/opentelemetry-demo/pull/1398))
+* [checkoutservice] add producer interceptor for tracing
+  ([#1400](https://github.com/open-telemetry/opentelemetry-demo/pull/1400))
+* [productcatalogservice] fix graceful shutdown issues
+  ([#1402](https://github.com/open-telemetry/opentelemetry-demo/pull/1402))
+* [chore] remove unused integration test
+  ([#1406](https://github.com/open-telemetry/opentelemetry-demo/pull/1406))
+* [CartService] - Add Host Detector
+  ([#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
+  ([#1449](https://github.com/open-telemetry/opentelemetry-demo/pull/1449))
+* [Frontend-proxy] Add restart policy to compose file
+  ([#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
+
+* [grafana] update grafana to 10.2.3
+  ([#1332](https://github.com/open-telemetry/opentelemetry-demo/pull/1332))
+* [frontendproxy] Enable envoy environment resource detector
+  ([#1291](https://github.com/open-telemetry/opentelemetry-demo/pull/1291))
+* [currencyservice] - add package name prefix to `rpc.service` attribute
+  ([#1333](https://github.com/open-telemetry/opentelemetry-demo/pull/1333))
+* [currency] fix metric exporter options
+  ([#1335](https://github.com/open-telemetry/opentelemetry-demo/pull/1335))
+* [ffspostgres] define and use demo specific postgres image
+  ([#1338](https://github.com/open-telemetry/opentelemetry-demo/pull/1338))
+* [loadgenerator, frontend] enable browser traffic in loadgenerator using playwright
+  ([#1345](https://github.com/open-telemetry/opentelemetry-demo/pull/1345))
+* [accountingservice] update wiki link
+  ([#1346](https://github.com/open-telemetry/opentelemetry-demo/pull/1346))
+* [checkoutservice] update wiki link
+  ([#1346](https://github.com/open-telemetry/opentelemetry-demo/pull/1346))
+* [productcatalogservice] update wiki link
+  ([#1346](https://github.com/open-telemetry/opentelemetry-demo/pull/1346))
+* [adservice] added group and anonymous read permission to
+  opentelemetry-javaagent.jar
+  ([#1348](https://github.com/open-telemetry/opentelemetry-demo/pull/1348))
+* [frauddetectionservice] added group and anonymous read permission to
+  opentelemetry-javaagent.jar
+  ([#1348](https://github.com/open-telemetry/opentelemetry-demo/pull/1348))
+* [adservice] Major version update for Java instrumentation, version 2.0.0
+  ([#1352](https://github.com/open-telemetry/opentelemetry-demo/pull/1352))
+* [frauddetectionservice] Major version update for Java instrumentation,
+  version 2.0.0
+  ([#1352](https://github.com/open-telemetry/opentelemetry-demo/pull/1352))
+* [kafka] Major version update for Java instrumentation, version 2.0.0
+  ([#1352](https://github.com/open-telemetry/opentelemetry-demo/pull/1352))
+* Align env variables for OTLP ports
+  ([#1353](https://github.com/open-telemetry/opentelemetry-demo/pull/1353))
+* Update dependent services - Collector, Grafana, Jaeger, Prometheus, etc.
+  ([#1354](https://github.com/open-telemetry/opentelemetry-demo/pull/1354))
+* [OpenSearch] Use native OpenSearch exporter from Collector
+  ([#1356](https://github.com/open-telemetry/opentelemetry-demo/pull/1356))
+* Update GO SDKs & fix metrics config
+  ([#1357](https://github.com/open-telemetry/opentelemetry-demo/pull/1357))
+* Update Python SDKs
+  ([#1358](https://github.com/open-telemetry/opentelemetry-demo/pull/1358))
+* [loadgenerator] fix browser traffic enabled flag
+  ([#1359](https://github.com/open-telemetry/opentelemetry-demo/pull/1359))
+* [productcatalog] allow products to be extended
+  ([#1363](https://github.com/open-telemetry/opentelemetry-demo/pull/1363))
+* [tests] update trace based tests for semantic conventions
+  ([#1377](https://github.com/open-telemetry/opentelemetry-demo/pull/1377))
+* [currencyservice] Add OTLP logs
+  ([#1378](https://github.com/open-telemetry/opentelemetry-demo/pull/1378))
+* [cartservice] update .NET to .NET 8.0.2
+  ([#1380](https://github.com/open-telemetry/opentelemetry-demo/pull/1380))
+
+## 1.7.2
+
+* [cartservice] update .NET package to 1.7.0 release
+  ([#1326](https://github.com/open-telemetry/opentelemetry-demo/pull/1326))
+* [loadgenerator and recommendationservice] Update python base image
+  ([#1329](https://github.com/open-telemetry/opentelemetry-demo/pull/1329))
+
+## 1.7.1
+
+* [grafana] revert to 10.2.0
+* [cartservice] disable config reload
+  ([#1312](https://github.com/open-telemetry/opentelemetry-demo/pull/1312))
+* [cartservice] fixed cartServiceFailure feature flag
+  ([#1313](https://github.com/open-telemetry/opentelemetry-demo/pull/1313))
+* [accountingservice] Update dependencies and semconv
+* ([#1316](https://github.com/open-telemetry/opentelemetry-demo/pull/1316))
+* [featureflagservice] Allow setting initial feature flag values
+  ([#1319](https://github.com/open-telemetry/opentelemetry-demo/pull/1319))
+
+## 1.7.0
+
+* update PHP quoteservice to use 1.0.0
+  ([#1236](https://github.com/open-telemetry/opentelemetry-demo/pull/1236))
+* Add ability to do probabilistic A/B testing with feature flags
+  ([#1237](https://github.com/open-telemetry/opentelemetry-demo/pull/1237))
+* add env var for pinning trace-based test tool version
+  ([#1239](https://github.com/open-telemetry/opentelemetry-demo/pull/1239))
+* [cartservice] Add .NET memory, CPU, and thread metrics
+  ([#1265](https://github.com/open-telemetry/opentelemetry-demo/pull/1265))
+* [cartservice] update .NET to .NET 8.0
+  ([#1272](https://github.com/open-telemetry/opentelemetry-demo/pull/1272))
+* update loadgenerator dependencies and the base image
+  ([#1274](https://github.com/open-telemetry/opentelemetry-demo/pull/1274))
+* [currencyservice]: update opentelemetry-cpp to 1.12.0
+  ([#1275](https://github.com/open-telemetry/opentelemetry-demo/pull/1275))
+* [currencyservice] bring back multistage build
+  ([#1276](https://github.com/open-telemetry/opentelemetry-demo/pull/1276))
+* fix env var for pinning trace-based test tool version
+  ([#1283](https://github.com/open-telemetry/opentelemetry-demo/pull/1283))
+* [accountingservice] Add additional attributes to Kafka spans
+  ([#1286](https://github.com/open-telemetry/opentelemetry-demo/pull/1286))
+* [shippingservice] update Rust OTel libraries to 0.21
+  ([#1287](https://github.com/open-telemetry/opentelemetry-demo/pull/1287))
+
+## 1.6.0
+
+* update PHP quoteservice to use RC1
+  ([#1114](https://github.com/open-telemetry/opentelemetry-demo/pull/1114))
+* [cartservice] update .NET package to 1.6.0 release
+  ([#1115](https://github.com/open-telemetry/opentelemetry-demo/pull/1115))
+* Set metric description to blank for rpc.server.duration and queueSize
+  ([#1120](https://github.com/open-telemetry/opentelemetry-demo/pull/1120))
+* sluggify Grafana dashboard name
+  ([#1121](https://github.com/open-telemetry/opentelemetry-demo/pull/1121))
+* [kafka frauddetection adservice] update java agent versions
+  ([#1132](https://github.com/open-telemetry/opentelemetry-demo/pull/1132))
+* update dependent components to latest versions
+  ([#1146](https://github.com/open-telemetry/opentelemetry-demo/pull/1146))
+* [prometheus] Enabled support for the OTLP write receiver
+  ([#1149](https://github.com/open-telemetry/opentelemetry-demo/pull/1149))
+* [grafana] fix dashboard metric names and update settings
+  ([#1150](https://github.com/open-telemetry/opentelemetry-demo/pull/1150))
+* [otelcol] add httpcheck receiver for synthetic check of frontendproxy
+  ([#1162](https://github.com/open-telemetry/opentelemetry-demo/pull/1162))
+* pinning trace-based test tool version and adding files as volumes
+  ([#1182](https://github.com/open-telemetry/opentelemetry-demo/pull/1182))
+* [jaeger] fix Jager SPM / Monitor support
+  ([#1174](https://github.com/open-telemetry/opentelemetry-demo/pull/1174))
+* [otelcol] merge configuration files for base and observability configs
+  ([#1173](https://github.com/open-telemetry/opentelemetry-demo/pull/1173))
+* [frontendproxy] Fix service graph by enabling client spans in envoy proxy
+  ([#1180](https://github.com/open-telemetry/opentelemetry-demo/pull/1180))
+* [java-services] Update java, gradle and OTel agent versions
+  ([#1183](https://github.com/open-telemetry/opentelemetry-demo/pull/1183))
+* [opensearch] Add OpenSearch as an OTLP Logging backend
+  ([#1151](https://github.com/open-telemetry/opentelemetry-demo/pull/1151))
+* [opensearch] Add Grafana dashboard panels for OpenSearch log data
+  ([#1193](https://github.com/open-telemetry/opentelemetry-demo/pull/1193))
+* [go-sdk] Workaround: disable gRPC metrics in Go services
+  ([#1205](https://github.com/open-telemetry/opentelemetry-demo/pull/1205))
+
+## 1.5.0
+
+* update trace-based tests to test stream events
+  ([#1072](https://github.com/open-telemetry/opentelemetry-demo/pull/1072))
+* Add cartServiceFailure feature flag triggering Cart Service errors
+  ([#824](https://github.com/open-telemetry/opentelemetry-demo/pull/824))
+* [paymentservice] update JS SDKs to 1.12.0/0.38.0
+  ([#853](https://github.com/open-telemetry/opentelemetry-demo/pull/853))
+* [frontend] update JS SDKs to 1.12.0/0.38.0
+  ([#853](https://github.com/open-telemetry/opentelemetry-demo/pull/853))
+* [chore] use `otel-demo` namespace for generated kubernetes manifests
+  ([#848](https://github.com/open-telemetry/opentelemetry-demo/pull/848))
+* [collector] update collector version to 0.76.1 and remove connectors feature gate.
+  ([#857](https://github.com/open-telemetry/opentelemetry-demo/pull/857))
+* [shippingservice] update rust version and dependencies
+  ([#865](https://github.com/open-telemetry/opentelemetry-demo/pull/865))
+* [load generator] Bump loagen dependencies
+  ([#869](https://github.com/open-telemetry/opentelemetry-demo/pull/869))
+* [grafana] fix demo dashboard to be compatible with spanmetrics connector
+  ([#874](https://github.com/open-telemetry/opentelemetry-demo/pull/874))
+* [quoteservice] enabling batch span processor metrics
+  ([#878](https://github.com/open-telemetry/opentelemetry-demo/pull/878))
+* [kafka] remove KRaft mode support workarounds
+  ([#880](https://github.com/open-telemetry/opentelemetry-demo/pull/880))
+* [currencyservice] Fix OTel C++ build and update OTel version to 1.9.0
+  ([#886](https://github.com/open-telemetry/opentelemetry-demo/pull/886))
+* [featureflagservice] Upgrade opentelemetry_ecto to 1.1.1
+  ([#899](https://github.com/open-telemetry/opentelemetry-demo/pull/899))
+* [currencyservice] Fix OTLP export to use default env vars
+  ([#904](https://github.com/open-telemetry/opentelemetry-demo/pull/904))
+* [featureflagservice] Bump OTP version to 26.0
+  ([#903](https://github.com/open-telemetry/opentelemetry-demo/pull/903))
+* Regenerate kubernetes manifest and add auto-generate comment
+  ([#909](https://github.com/open-telemetry/opentelemetry-demo/pull/909))
+* [loadgenerator] fix redirect on recommendations load
+  ([#913](https://github.com/open-telemetry/opentelemetry-demo/pull/913))
+* [loadgenerator] run load through frontend proxy (Envoy)
+  ([#914](https://github.com/open-telemetry/opentelemetry-demo/pull/914))
+* [cartservice] update .NET package to 1.5.0 release
+  ([#935](https://github.com/open-telemetry/opentelemetry-demo/pull/935))
+* [cartservice] update service to .NET 7
+  ([#942](https://github.com/open-telemetry/opentelemetry-demo/pull/942))
+* [tests] Add trace-based testing examples
+  ([#877](https://github.com/open-telemetry/opentelemetry-demo/pull/877))
+* Introduce minimal mode to run demo
+  ([#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))
+* [FeatureFlagService] Update dependencies
+  ([#992](https://github.com/open-telemetry/opentelemetry-demo/pull/992))
+* [currencyService] Update OTel dependency
+  ([#991](https://github.com/open-telemetry/opentelemetry-demo/pull/991))
+* [LoadGenerator & RecommendatationService] update dependencies
+  ([#988](https://github.com/open-telemetry/opentelemetry-demo/pull/988))
+* [FraudDetectionService] Updated Kotlin version and OTel dependencies
+  ([#987](https://github.com/open-telemetry/opentelemetry-demo/pull/987))
+* [quoteservice] update php dependencies
+  ([#1009](https://github.com/open-telemetry/opentelemetry-demo/pull/1009))
+* [tests] Update trace-based tests run script
+  ([#1018](https://github.com/open-telemetry/opentelemetry-demo/pull/1018))
+* [PaymentService] Update node to LTS version and bump deps
+  ([#1029](https://github.com/open-telemetry/opentelemetry-demo/pull/1029))
+* [frontend] Update dependencies
+  ([#1054](https://github.com/open-telemetry/opentelemetry-demo/pull/1054))
+* [frontendproxy] Fix typo URL endpoint for FrontendProxy
+  ([#1075](https://github.com/open-telemetry/opentelemetry-demo/pull/1075))
+* [checkoutservice] Upgrade Shopify/sarama to IBM/sarama
+  ([#1083](https://github.com/open-telemetry/opentelemetry-demo/pull/1083))
+* [accountingservice] Upgrade Shopify/sarama to IBM/sarama
+  ([#1083](https://github.com/open-telemetry/opentelemetry-demo/pull/1083))
+* Update Telemetry Components
+  ([#1085](https://github.com/open-telemetry/opentelemetry-demo/pull/1085))
+* [cartservice] Support for logs
+  ([#1086](https://github.com/open-telemetry/opentelemetry-demo/pull/1086))
+* [TraceTests] Update span attributes to align with new IBM/sarama instrumentation
+  ([#1096](https://github.com/open-telemetry/opentelemetry-demo/pull/1096))
+
+## 1.4.0
+
+* [cart] use 60m TTL for cart entries in redis
+  ([#779](https://github.com/open-telemetry/opentelemetry-demo/pull/779))
+* spanmetrics dashboard service&operation rates & latencies
+  ([#787](https://github.com/open-telemetry/opentelemetry-demo/pull/787))
+* Adds Kubernetes manifests for the demo
+  ([#791](https://github.com/open-telemetry/opentelemetry-demo/pull/791))
+* [bug] fixing quoteservice metrics exporting (PHP)
+  ([#793](https://github.com/open-telemetry/opentelemetry-demo/pull/793))
+* Added app.session.id attribute to frontend spans
+  ([#795](https://github.com/open-telemetry/opentelemetry-demo/pull/795))
+* Add logs for Ad service and Recommendation service
+  ([#796](https://github.com/open-telemetry/opentelemetry-demo/pull/796))
+* Opentelemetry Collector Data Flow Dashboard
+  ([#797](https://github.com/open-telemetry/opentelemetry-demo/pull/797))
+* Fixed shipping update in the frontend UI when number of products in cart
+  changes
+  ([#799](https://github.com/open-telemetry/opentelemetry-demo/pull/799))
+* Update frontend JavaScript SDKs to: 1.10.1/0.36.x
+  ([#805](https://github.com/open-telemetry/opentelemetry-demo/pull/805))
+* Fix http.status_code on error in frontend
+  ([#810](https://github.com/open-telemetry/opentelemetry-demo/pull/810))
+* Fix bug in shipping calculation
+  ([#814](https://github.com/open-telemetry/opentelemetry-demo/pull/814))
+* Reduce Kafka mem allocation
+  ([#798](https://github.com/open-telemetry/opentelemetry-demo/pull/798))
+* Updated frontend web tracer to us batch processor
+  ([#819](https://github.com/open-telemetry/opentelemetry-demo/pull/819))
+* Moved env platform flag to the footer, changed it to free text
+  ([#818](https://github.com/open-telemetry/opentelemetry-demo/pull/818))
+* Update OTel Collector
+  ([#822](https://github.com/open-telemetry/opentelemetry-demo/pull/822))
+* Update OTel Collector to use spanmetrics connector instead of spanmetrics
+  processors
+  ([#829](https://github.com/open-telemetry/opentelemetry-demo/pull/829))
+
+## 1.3.1
+
+* [docs] Drop docs folder as step in migration to OTel website
+  ([#729](https://github.com/open-telemetry/opentelemetry-demo/issues/729))
+* rename proto package from hipstershop to oteldemo
+  ([#740](https://github.com/open-telemetry/opentelemetry-demo/pull/740))
+* Removed unnecessary code from Program.cs
+  ([#754](https://github.com/open-telemetry/opentelemetry-demo/pull/754))
+* feature flag service: update the dependency tls_certificate_check and bump to
+  OTP-25 ([#756](https://github.com/open-telemetry/opentelemetry-demo/pull/756))
+* Bump up OTEL Java Agent version to 1.23.0
+  ([#757](https://github.com/open-telemetry/opentelemetry-demo/pull/757))
+* Add counter metric to currency service (C++)
+  ([#759](https://github.com/open-telemetry/opentelemetry-demo/issues/759))
+* Use browserDetector to populate browser info to frontend-web telemetry
+  ([#760](https://github.com/open-telemetry/opentelemetry-demo/pull/760))
+* [chore] update for Mac M2 architecture
+  ([#764](https://github.com/open-telemetry/opentelemetry-demo/pull/764))
+* [chore] align memory limits with Helm chart
+  ([#781](https://github.com/open-telemetry/opentelemetry-demo/pull/781))
+* Use an async PHP runtime, bump versions to latest betas
+  ([#823](https://github.com/open-telemetry/opentelemetry-demo/pull/823))
+
+## 1.3.0
+
+* Use `frontend-web` as service name for browser/web requests
+([#628](https://github.com/open-telemetry/opentelemetry-demo/pull/628))
+* Update `quoteservice` to use opentelemetry-php beta release
+([#644](https://github.com/open-telemetry/opentelemetry-demo/pull/644))
+* Add build for arm64 arch
+([#644](https://github.com/open-telemetry/opentelemetry-demo/pull/657))
+* Add synthetic attribute flag to front end instrumentation
+([#631](https://github.com/open-telemetry/opentelemetry-demo/pull/631))
+* Fix the total sum on the cart page
+([#633](https://github.com/open-telemetry/opentelemetry-demo/pull/633))
+* Add OTel java agent with JMX Metric Insights to kafka
+([#654](https://github.com/open-telemetry/opentelemetry-demo/pull/654))
+* Add resource detectors to payment service
+([#651](https://github.com/open-telemetry/opentelemetry-demo/pull/651))
+* Add resource detectors to frontend service
+([#648](https://github.com/open-telemetry/opentelemetry-demo/pull/648))
+* Add Jaeger-SPM-Config
+([#655](https://github.com/open-telemetry/opentelemetry-demo/pull/655))
+* Add healthcheck to featureflagservice
+([#661](https://github.com/open-telemetry/opentelemetry-demo/pull/661)
+* Add resource detectors to checkout service
+([#662](https://github.com/open-telemetry/opentelemetry-demo/pull/662))
+* Add resource detectors to cart service
+([#663](https://github.com/open-telemetry/opentelemetry-demo/pull/663))
+* Add `OTEL_RESOURCE_ATTRIBUTES` to docker compose setup
+([#664](https://github.com/open-telemetry/opentelemetry-demo/pull/664))
+* Update loadgenerator python base image and dependencies
+([#669](https://github.com/open-telemetry/opentelemetry-demo/pull/669))
+* Add basic metric support to productcatalog service
+([#674](https://github.com/open-telemetry/opentelemetry-demo/pull/674))
+* Add resource detectors to accounting service
+([#676](https://github.com/open-telemetry/opentelemetry-demo/pull/676))
+* Add resource detectors to product catalog service
+([#677](https://github.com/open-telemetry/opentelemetry-demo/pull/677))
+* Add custom metrics to ads service
+([#678](https://github.com/open-telemetry/opentelemetry-demo/pull/678))
+* Rebuild currency service Dockerfile with alpine
+([#687](https://github.com/open-telemetry/opentelemetry-demo/pull/687))
+* Remove grpc from loadgenerator
+([#688](https://github.com/open-telemetry/opentelemetry-demo/pull/688))
+* Update docker-compose services to restart unless stopped
+([#690](https://github.com/open-telemetry/opentelemetry-demo/pull/690))
+* Use different docker base images for frauddetection service
+([#691](https://github.com/open-telemetry/opentelemetry-demo/pull/691))
+* Fix payment service version to support temporality environment variable
+([#693](https://github.com/open-telemetry/opentelemetry-demo/pull/693))
+* Update recommendationservice python base image and dependencies
+([#700](https://github.com/open-telemetry/opentelemetry-demo/pull/700))
+* Add adServiceFailure feature flag triggering Ad Service errors
+([#694](https://github.com/open-telemetry/opentelemetry-demo/pull/694))
+* Reduce spans generated from quote service
+([#702](https://github.com/open-telemetry/opentelemetry-demo/pull/702))
+* Update emailservice Dockerfile to use alpine and multistage build
+([#703](https://github.com/open-telemetry/opentelemetry-demo/pull/703))
+* Update dockerfile for adservice to use different base images
+([#705](https://github.com/open-telemetry/opentelemetry-demo/pull/705))
+* Enable exemplar support in the metrics exporter, Prometheus, and Grafana
+([#704](https://github.com/open-telemetry/opentelemetry-demo/pull/704))
+* Add cross-compilation for shipping service
+([#715](https://github.com/open-telemetry/opentelemetry-demo/issues/715))
+
+## 1.2.0
+
+* Change ZipCode data type from int to string
+([#587](https://github.com/open-telemetry/opentelemetry-demo/pull/587))
+* Pass product's `categories` as an input for the Ad service
+([#600](https://github.com/open-telemetry/opentelemetry-demo/pull/600))
+* Add HTTP client instrumentation to shippingservice
+([#610](https://github.com/open-telemetry/opentelemetry-demo/pull/610))
+* Added Kafka, accountingservice and frauddetectionservice for async workflows
+([#512](https://github.com/open-telemetry/opentelemetry-demo/pull/457))
+* Added support for non-root containers
+([#615](https://github.com/open-telemetry/opentelemetry-demo/pull/615))
+* Add tracing to Envoy (frontend-proxy)
+([#613](https://github.com/open-telemetry/opentelemetry-demo/pull/613))
+* Build Kafka image
+([#617](https://github.com/open-telemetry/opentelemetry-demo/pull/617))
+
+## v1.1.0
+
+* Replaced PHP-CLI to PHP-Apache for a more realistic service
+([#563](https://github.com/open-telemetry/opentelemetry-demo/pull/563))
+* Optimize currencyservice build time with parallel build jobs
+([#569](https://github.com/open-telemetry/opentelemetry-demo/pull/569))
+* Optimize GitHub Builds and fix broken emulation of featureflag
+([#536](https://github.com/open-telemetry/opentelemetry-demo/pull/536))
+* Add basic metrics support for payment service
+([#583](https://github.com/open-telemetry/opentelemetry-demo/pull/583))
+
+## v1.0.0
+
+* Add component owners for adservice Java app by @trask in
+  ([519](https://github.com/open-telemetry/opentelemetry-demo/pull/519))
+* Add gradle wrapper validation by @trask in
+  ([518](https://github.com/open-telemetry/opentelemetry-demo/pull/518))
+* fix currency bug by @cartersocha in
+  ([522](https://github.com/open-telemetry/opentelemetry-demo/pull/522))
+* Final Docs Review by @austinlparker in
+  ([515](https://github.com/open-telemetry/opentelemetry-demo/pull/515))
+* Front End -> Frontend by @austinlparker in
+  ([537](https://github.com/open-telemetry/opentelemetry-demo/pull/537))
+* [docs] kubernetes by @puckpuck in
+  ([521](https://github.com/open-telemetry/opentelemetry-demo/pull/521))
+* bump to v1.0 for release by @austinlparker in
+  ([538](https://github.com/open-telemetry/opentelemetry-demo/pull/538))
+
+## v0.7.0-beta
+
+* Update shippingservice to add resource data to spans
+([#504](https://github.com/open-telemetry/opentelemetry-demo/pull/504))
+* Add Envoy as reverse proxy for all user-facing services
+([#508](https://github.com/open-telemetry/opentelemetry-demo/pull/508))
+* Envoy: Grafana, Load Generator, Jaeger exposed.
+([#513](https://github.com/open-telemetry/opentelemetry-demo/pull/513))
+* Added frontend instrumentation exporter custom url
+([#512](https://github.com/open-telemetry/opentelemetry-demo/pull/512))
+
+## v0.6.1-beta
+
+* Set resource memory limits for all services
+([#460](https://github.com/open-telemetry/opentelemetry-demo/pull/460))
+* Added cache scenario to recommendation service
+([#455](https://github.com/open-telemetry/opentelemetry-demo/pull/455))
+* Update cartservice Dockerfile to support ARM64
+([#439](https://github.com/open-telemetry/opentelemetry-demo/pull/439))
+
+## v0.6.0-beta
+
+* Added basic metrics support for recommendation service (Python)
+([#416](https://github.com/open-telemetry/opentelemetry-demo/pull/416))
+* Added metrics auto-instrumentation + minor metrics refactor for recommendation
+ service (Python)
+ [#432](https://github.com/open-telemetry/opentelemetry-demo/pull/432)
+* Replaced the Jaeger exporter to the OTLP exporter in the OTel Collector
+([#435](https://github.com/open-telemetry/opentelemetry-demo/pull/435))
+
+## v0.5.0
+
+* Add custom span and custom span attributes for Feature Flag Service
+([#371](https://github.com/open-telemetry/opentelemetry-demo/pull/371))
+* Change Cart Service to be async
+([#372](https://github.com/open-telemetry/opentelemetry-demo/pull/372))
+* Removed Postgres error on startup
+([#378](https://github.com/open-telemetry/opentelemetry-demo/pull/378))
+* Fixed traffic to Ad and Recommendation Service
+([#379](https://github.com/open-telemetry/opentelemetry-demo/pull/379))
+* Add dotnet runtime metrics to the Cart Service
+([#393](https://github.com/open-telemetry/opentelemetry-demo/pull/393))
+* Add dotnet instrumentation libraries to the Cart Service
+([#394](https://github.com/open-telemetry/opentelemetry-demo/pull/394))
+* Fixed Feature Flag Service error on start up
+([#402](https://github.com/open-telemetry/opentelemetry-demo/pull/402))
+* Update Checkout Service Go version to 1.19 once OTel Go Metrics require 1.18+
+([#409](https://github.com/open-telemetry/opentelemetry-demo/pull/409))
+* Added hero scenario metric to Checkout Service on cache leak
+([#339](https://github.com/open-telemetry/opentelemetry-demo/pull/339))
+
+## v0.4.0
+
+* Add span events to shipping service
+([#344](https://github.com/open-telemetry/opentelemetry-demo/pull/344))
+* Add PHP quote service
+([#345](https://github.com/open-telemetry/opentelemetry-demo/pull/345))
+* Improve initial run time, without a build
+([#362](https://github.com/open-telemetry/opentelemetry-demo/pull/362))
+
+## v0.3.0
+
 * Enhanced cart service attributes
 ([#183](https://github.com/open-telemetry/opentelemetry-demo/pull/183))
 * Re-implemented currency service using C++
@@ -87,46 +832,37 @@ significant modifications will be credited to OpenTelemetry Authors.
 ([#332](https://github.com/open-telemetry/opentelemetry-demo/pull/332))
 * Add `synthetic_request=true` baggage to load generator requests
 ([#331](https://github.com/open-telemetry/opentelemetry-demo/pull/331))
-* Add span events to shipping service
-([#344](https://github.com/open-telemetry/opentelemetry-demo/pull/344))
-* Add PHP quote service
-([#345](https://github.com/open-telemetry/opentelemetry-demo/pull/345))
-* Improve initial run time, without a build
-([#362](https://github.com/open-telemetry/opentelemetry-demo/pull/362))
-* Add custom span and custom span attributes for Feature Flag Service
-([#371](https://github.com/open-telemetry/opentelemetry-demo/pull/371))
-* Change Cart Service to be async
-([#372](https://github.com/open-telemetry/opentelemetry-demo/pull/372))
-* Removed Postgres error on startup
-([#378](https://github.com/open-telemetry/opentelemetry-demo/pull/378))
-* Fixed traffic to Ad and Recommendation Service
-([#379](https://github.com/open-telemetry/opentelemetry-demo/pull/379))
-* Add dotnet runtime metrics to the Cart Service
-([#393](https://github.com/open-telemetry/opentelemetry-demo/pull/393))
-* Add dotnet instrumentation libraries to the Cart Service
-([#394](https://github.com/open-telemetry/opentelemetry-demo/pull/394))
-* Fixed Feature Flag Service error on start up
-([#402](https://github.com/open-telemetry/opentelemetry-demo/pull/402))
-* Update Checkout Service Go version to 1.19 once OTel Go Metrics require 1.18+
-([#409](https://github.com/open-telemetry/opentelemetry-demo/pull/409))
-* Added hero scenario metric to Checkout Service on cache leak
-([#339](https://github.com/open-telemetry/opentelemetry-demo/pull/339))
-* Added basic metrics support for recommendation service (Python)
-([#416](https://github.com/open-telemetry/opentelemetry-demo/pull/416))
-* Added metrics auto-instrumentation + minor metrics refactor for recommendation
- service (Python)
- [#432](https://github.com/open-telemetry/opentelemetry-demo/pull/432)
-* Replaced the Jaeger exporter to the OTLP exporter in the OTel Collector
-([#435](https://github.com/open-telemetry/opentelemetry-demo/pull/435))
-* Set resource memory limits for all services
-([#460](https://github.com/open-telemetry/opentelemetry-demo/pull/460))
-* Added cache scenario to recommendation service
-([#455](https://github.com/open-telemetry/opentelemetry-demo/pull/455))
-* Update cartservice Dockerfile to support ARM64
-([#439](https://github.com/open-telemetry/opentelemetry-demo/pull/439))
-* Add Envoy as reverse proxy for all user-facing services
-([#508](https://github.com/open-telemetry/opentelemetry-demo/pull/508))
-* Envoy: Grafana, Load Generator, Jaeger exposed.
-([#513](https://github.com/open-telemetry/opentelemetry-demo/pull/513))
-* Added frontend instrumentation exporter custom url
-([#512](https://github.com/open-telemetry/opentelemetry-demo/pull/512))
+
+## v0.2.0
+
+* Added feature flag service implementation
+([#141](https://github.com/open-telemetry/opentelemetry-demo/pull/141))
+* Added additional attributes to productcatalog service
+([#143](https://github.com/open-telemetry/opentelemetry-demo/pull/143))
+* Added manual instrumentation to ad service
+([#150](https://github.com/open-telemetry/opentelemetry-demo/pull/150))
+* Added manual instrumentation to email service
+([#158](https://github.com/open-telemetry/opentelemetry-demo/pull/158))
+* Added basic metric support and Prometheus storage
+([#160](https://github.com/open-telemetry/opentelemetry-demo/pull/160))
+* Added manual instrumentation to recommendation service
+([#163](https://github.com/open-telemetry/opentelemetry-demo/pull/163))
+* Added manual instrumentation to checkout service
+([#164](https://github.com/open-telemetry/opentelemetry-demo/pull/164))
+* Added Grafana service and enhanced metric experience
+([#175](https://github.com/open-telemetry/opentelemetry-demo/pull/175))
+
+## v0.1.0
+
+* The initial code base is donated from a
+[fork](https://github.com/julianocosta89/opentelemetry-microservices-demo) of
+the [Google microservices
+demo](https://github.com/GoogleCloudPlatform/microservices-demo) with express
+knowledge of the owners. The pre-existing copyrights will remain. Any future
+significant modifications will be credited to OpenTelemetry Authors.
+* Added feature flag service protos
+([#26](https://github.com/open-telemetry/opentelemetry-demo/pull/26))
+* Added span attributes to frontend service
+([#82](https://github.com/open-telemetry/opentelemetry-demo/pull/82))
+* Rewrote shipping service in Rust
+([#35](https://github.com/open-telemetry/opentelemetry-demo/issues/35))

CONTRIBUTING.md

@@ -1,35 +1,39 @@
-# Contributing
+# Contributing to OpenTelemetry Demo Webstore
 
-Welcome to OpenTelemetry Demo Webstore repository!
+Welcome to the OpenTelemetry Demo repository! We appreciate your interest in
+contributing. Whether you're fixing a bug, improving documentation, or adding a
+new feature, we value your contribution.
 
-Before you start - see OpenTelemetry general
-[contributing](https://github.com/open-telemetry/community/blob/main/CONTRIBUTING.md)
-requirements and recommendations.
+Before getting started, please review the
+[OpenTelemetry Contributor Guide](https://github.com/open-telemetry/community/blob/main/guides/contributor/README.md)
+for details on code attribution and best practices.
 
-## Join a SIG Call
+## Getting Started
 
-We meet weekly Monday's at 8:15 AM PT. The meeting is subject to change
-depending on contributors' availability. Check the [OpenTelemetry community
-calendar](https://calendar.google.com/calendar/embed?src=google.com_b79e3e90j7bbsa2n2p5an5lf60%40group.calendar.google.com)
-for specific dates and Zoom meeting links.
+### Join a SIG Call
 
-Meeting notes are available as a public [Google
-doc](https://docs.google.com/document/d/16f-JOjKzLgWxULRxY8TmpM_FjlI1sthvKurnqFz9x98/edit).
-For edit access, get in touch on
-[Slack](https://cloud-native.slack.com/archives/C03B4CWV4DA).
+We meet every other Wednesday at 8:00 PT. The schedule may change based on
+contributors' availability. Check the [OpenTelemetry Community Calendar](https://github.com/open-telemetry/community?tab=readme-ov-file#special-interest-groups)
+for specific dates and Zoom links.
 
-## Sign the CLA
+See the
+[public meeting notes](https://docs.google.com/document/d/16f-JOjKzLgWxULRxY8TmpM_FjlI1sthvKurnqFz9x98/edit)
+for a summary description of past meetings.
+For edit access, ask in our
+[Slack channel](https://cloud-native.slack.com/archives/C03B4CWV4DA).
 
-Before you can contribute, you will need to sign the [Contributor License
-Agreement](https://identity.linuxfoundation.org/projects/cncf).
+### Sign the Contributor License Agreement (CLA)
 
-## Find a Buddy and Get Started Quickly
+Before contributing, sign the [CLA](https://identity.linuxfoundation.org/projects/cncf)
 
-If you are looking for someone to help you find a starting point and be a
-resource for your first contribution, join our Slack channel and find a buddy!
+### Find a Mentor (Buddy System)
 
-1. Create your [CNCF Slack account](http://slack.cncf.io/) and join the
-   [otel-community-demo](https://app.slack.com/client/T08PSQ7BQ/C03B4CWV4DA) channel.
+New to OpenTelemetry? We encourage you to find a mentor who can guide you
+through your first contribution.
+
+1. Create your [CNCF Slack account](https://slack.cncf.io/) and join the
+   [otel-community-demo](https://app.slack.com/client/T08PSQ7BQ/C03B4CWV4DA)
+   channel.
 2. Post in the room with an introduction to yourself, what area you are
    interested in (check issues marked with [help
    wanted](https://github.com/open-telemetry/opentelemetry-demo/labels/help%20wanted)),
@@ -41,61 +45,109 @@ contributing to OpenTelemetry: providing context, reviewing PRs, and helping
 those get merged. Buddies will not be available 24/7, but is committed to
 responding during their normal contribution hours.
 
-## Development Environment
+## Setting Up Your Development Environment
 
-You can contribute to this project from a Windows, macOS or Linux machine. The
-first step to contributing is ensuring you can run the demo successfully from
-your local machine.
+### Prerequisites
 
-On all platforms, the minimum requirements are:
+Ensure you have the following installed:
 
-- Docker
+- [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
+- [Make](https://www.gnu.org/software/make/)
+- [Docker](https://www.docker.com/get-started/)
 - [Docker Compose](https://docs.docker.com/compose/install/#install-compose) v2.0.0+
 
-### Clone Repo
+### Clone the Repository
 
-- Clone the Webstore Demo repository:
-
-```shell
+```sh
 git clone https://github.com/open-telemetry/opentelemetry-demo.git
-```
-
-### Open Folder
-
-- Navigate to the cloned folder:
-
-```shell
 cd opentelemetry-demo/
 ```
 
-### Gradle Update [Windows Only]
+### Run the Demo
 
-- Navigate to the Java Ad Service folder to install and update Gradle:
-
-```shell
-cd .\src\adservice\
-.\gradlew installDist
-.\gradlew wrapper --gradle-version 7.4.2
+```sh
+make start
 ```
 
-### Run Docker Compose
+### Verify the Webstore & Telemetry
 
-- Start the demo (It can take ~20min the first time the command is executed as
-all the images will be build):
+Once the images are built and containers are started, visit:
 
-```shell
-docker compose up -d
+- **Webstore**: [http://localhost:8080/](http://localhost:8080/)
+- **Jaeger**: [http://localhost:8080/jaeger/ui/](http://localhost:8080/jaeger/ui/)
+- **Grafana**: [http://localhost:8080/grafana/](http://localhost:8080/grafana/)
+- **Feature Flags UI**: [http://localhost:8080/feature/](http://localhost:8080/feature/)
+- **Load Generator UI**: [http://localhost:8080/loadgen/](http://localhost:8080/loadgen/)
+
+## Troubleshooting Common Issues
+
+### Docker Not Running
+
+**Error:** `Error response from daemon: Docker daemon is not running.`
+
+**Solution:**
+
+- **Windows/macOS**: Open Docker Desktop and ensure it's running.
+- **Linux**: Check Docker status:
+
+```sh
+systemctl status docker
 ```
 
-### Verify the Webstore & the Telemetry
+If inactive, start it:
 
-Once the images are built and containers are started you can access:
+```sh
+sudo systemctl start docker
+  ```
 
-- Webstore: <http://localhost:8080/>
-- Jaeger: <http://localhost:8080/jaeger/ui/>
-- Grafana: <http://localhost:8080/grafana/>
-- Feature Flags UI: <http://localhost:8080/feature/>
-- Load Generator UI: <http://localhost:8080/loadgen//>
+### Gradle Issues (Windows)
+
+If you encounter Gradle issues, run:
+
+```sh
+cd src/ad/
+./gradlew installDist
+./gradlew wrapper --gradle-version 7.4.2
+```
+
+### Docker build cache issues
+
+While developing, you may encounter issues with Docker build cache. To clear the
+cache:
+
+```sh
+docker system prune -a
+```
+
+Warning: This removes all unused Docker data, including images, containers,
+volumes, and networks. Use with caution.
+
+### Debugging Tips
+
+- Use `docker ps` to check running containers.
+- View logs for services:
+
+```sh
+docker logs <container_id>
+```
+
+- Restart containers if needed:
+
+```sh
+docker-compose restart
+```
+
+### Review the Documentation
+
+The Demo team is committed to keeping the demo up to date. That means the
+documentation as well as the code. When making changes to any service or feature
+remember to find the related docs and update those as well. Most (but not all)
+documentation can be found on the OTel website under [Demo docs][docs].
+
+### Running the React Native example
+
+If you are interested in running the React Native example app in this repo
+please review [these instructions](src/react-native-app/README.md).
 
 ## Create Your First Pull Request
 
@@ -106,6 +158,11 @@ GitHub pull requests (PRs).
 
 To create a new PR, fork the project in GitHub and clone the upstream repo:
 
+> [!NOTE]
+> Please fork to a personal GitHub account rather than a corporate/enterprise
+> one so maintainers can push commits to your branch.
+> **Pull requests from protected forks will not be accepted.**
+
 ```sh
 git clone https://github.com/open-telemetry/opentelemetry-demo.git
 ```
@@ -119,7 +176,7 @@ cd opentelemetry-demo
 Add your fork as an origin:
 
 ```sh
-git remote add fork https://github.com/open-telemetry/opentelemetry-demo.git
+git remote add fork https://github.com/YOUR_GITHUB_USERNAME/opentelemetry-demo.git
 ```
 
 Check out a new branch, make modifications and push the branch to your fork:
@@ -131,7 +188,7 @@ $ git checkout -b feature
 $ docker compose up -d --build
 # Go to Webstore, Jaeger or docker container logs etc. as appropriate to make sure your changes are working correctly.
 $ git add my/changed/files
-$ git commit -m "short discription of the change"
+$ git commit -m "short description of the change"
 $ git push fork feature
 ```
 
@@ -155,13 +212,15 @@ Open a pull request against the main `opentelemetry-demo` repo.
 A PR is considered to be **ready to merge** when:
 
 - It has received approval from
-  [Approvers](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver)
+  [Approvers](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#approver)
   /
-  [Maintainers](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).
+  [Maintainers](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#maintainer).
 - Major feedbacks are resolved.
 - It has been open for review for at least one working day. This gives people
   reasonable time to review.
-- Trivial change (typo, cosmetic, doc, etc.) doesn't have to wait for one day.
+- The [documentation][docs] and [Changelog](./CHANGELOG.md) have been updated
+  to reflect the new changes.
+- Trivial changes (typo, cosmetic, doc, etc.) don't have to wait for one day.
 
 Any Maintainer can merge the PR once it is **ready to merge**. Note, that some
 PRs may not be merged immediately if the repo is in the process of a release and
@@ -182,3 +241,75 @@ on each other), the owner should try to get people aligned by:
 - If none of the above worked and the PR has been stuck for more than 2 weeks,
   the owner should bring it to the OpenTelemetry Community Demo SIG
   [meeting](README.md#contributing).
+
+## Multi-platform Builds
+
+Creating multi-platform builds requires docker buildx to be installed. This
+is part of Docker Desktop for macOS, or can be installed using
+`apt install docker-buildx` on Ubuntu.
+
+To build and load the multi-platform images locally you will need to configure
+docker to use `containerd`. This can be done in Docker Desktop settings on MacOS
+or Windows. Please follow
+[these instructions](https://docs.docker.com/engine/storage/containerd/#enable-containerd-image-store-on-docker-engine)
+to configure Docker Engine on Linux/Ubuntu.
+
+You will need a multi-platform capable builder with a limiter set on parallelism
+to avoid errors while building the images. It is recommended to limit the
+parallelism to 4. This can be done by specifying a configuration file when
+creating the builder. The `buildkitd.toml` file in this repository can be used
+as the builder configuration file.
+
+To create a multi-platform builder with a parallelism limit of 4, use the
+following command:
+
+```shell
+make create-multiplatform-builder
+```
+
+A builder will be created and set as the active builder. You can check the
+builder status with `docker buildx inspect`. To build multi-platform images for
+linux/amd64 and linux/arm64, use the following command:
+
+```shell
+make build-multiplatform
+```
+
+To build and push multi-platform images to a registry, ensure to set
+`IMAGE_NAME` to the name of the registry and image repository to use in the
+`.env.override` file and run:
+
+```shell
+make build-multiplatform-and-push
+```
+
+## Making a new release
+
+Maintainers can create a new release when desired by following these steps.
+
+1. Create a Pull Request that updates the `IMAGE_VERSION` environment variable
+   in `.env` to the _new_ version number based on the format `x.x.x` and merge
+   it.
+2. [Create a new
+   release](https://github.com/open-telemetry/opentelemetry-demo/releases/new),
+   creating a new tag for the _new_ version number based on main. Automatically
+   generate release notes. Prepend a summary of the major changes to the release
+   notes.
+3. After images for the new release are built and published, create a new Pull
+   Request that updates the `CHANGELOG.md` with the new version leaving the
+   `Unreleased` section for the next release. Merge the Pull Request.
+4. Create a new Pull Request to update the deployment of the demo in the
+   [OpenTelemetry Helm
+   Charts](https://github.com/open-telemetry/opentelemetry-helm-charts) repo.
+   Merge the Pull Request.
+5. After the Helm chart is released, create a new Pull Request which updates the
+   Demo's Kubernetes manifest by running `make generate-kubernetes-manifests`.
+   Merge the Pull Request.
+6. Create a new Tag for the _new_ version with a suffix of `-k8s`. This tag
+   will be used to deploy the new version of the demo to Kubernetes using the
+   supplied manifests.
+
+[docs]: https://opentelemetry.io/docs/demo/
+
+By following this guide, you'll have a smoother onboarding experience as a
+contributor. Happy coding!

Makefile

@@ -1,18 +1,34 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+
 # All documents to be used in spell check.
-ALL_DOCS := $(shell find . -type f -name '*.md' -not -path './.github/*' -not -path '*/node_modules/*' -not -path '*/_build/*' -not -path '*/deps/*' | sort)
+ALL_DOCS := $(shell find . -type f -name '*.md' -not -path './.github/*' -not -path '*/node_modules/*' -not -path '*/_build/*' -not -path '*/deps/*' -not -path */Pods/* -not -path */.expo/* | sort)
 PWD := $(shell pwd)
 
 TOOLS_DIR := ./internal/tools
 MISSPELL_BINARY=bin/misspell
 MISSPELL = $(TOOLS_DIR)/$(MISSPELL_BINARY)
 
+DOCKER_COMPOSE_CMD ?= docker compose
+DOCKER_COMPOSE_ENV=--env-file .env --env-file .env.override
+DOCKER_COMPOSE_BUILD_ARGS=
+
+# Java Workaround for macOS 15.2+ and M4 chips (see https://bugs.openjdk.org/browse/JDK-8345296)
+ifeq ($(shell uname -m),arm64)
+	ifeq ($(shell uname -s),Darwin)
+		DOCKER_COMPOSE_ENV+= --env-file .env.arm64
+		DOCKER_COMPOSE_BUILD_ARGS+= --build-arg=_JAVA_OPTIONS=-XX:UseSVE=0
+	endif
+endif
+
 # see https://github.com/open-telemetry/build-tools/releases for semconvgen updates
 # Keep links in semantic_conventions/README.md and .vscode/settings.json in sync!
 SEMCONVGEN_VERSION=0.11.0
+YAMLLINT_VERSION=1.30.0
 
-# TODO: add `yamllint` step to `all` after making sure it works on Mac.
 .PHONY: all
-all: install-tools markdownlint misspell
+all: install-tools markdownlint misspell yamllint
 
 $(MISSPELL):
 	cd $(TOOLS_DIR) && go build -o $(MISSPELL_BINARY) github.com/client9/misspell/cmd/misspell
@@ -37,15 +53,33 @@ markdownlint:
 .PHONY: install-yamllint
 install-yamllint:
     # Using a venv is recommended
-	pip install -U yamllint~=1.26.1
+	yamllint --version >/dev/null 2>&1 || pip install -U yamllint~=$(YAMLLINT_VERSION)
 
 .PHONY: yamllint
-yamllint:
+yamllint: install-yamllint
 	yamllint .
 
+.PHONY: checklicense
+checklicense:
+	@echo "Checking license headers..."
+	@if ! npm ls @kt3k/license-checker; then npm install; fi
+	npx @kt3k/license-checker -q
+
+.PHONY: addlicense
+addlicense:
+	@echo "Adding license headers..."
+	@if ! npm ls @kt3k/license-checker; then npm install; fi
+	npx @kt3k/license-checker -q -i
+
+.PHONY: checklinks
+checklinks:
+	@echo "Checking links..."
+	@if ! npm ls @umbrelladocs/linkspector; then npm install; fi
+	linkspector check
+
 # Run all checks in order of speed / likely failure.
 .PHONY: check
-check: misspell markdownlint
+check: misspell markdownlint checklicense checklinks
 	@echo "All checks complete"
 
 # Attempt to fix issues / regenerate tables.
@@ -58,25 +92,161 @@ install-tools: $(MISSPELL)
 	npm install
 	@echo "All tools installed"
 
-.PHONY: build-and-push-dockerhub
-build-and-push-dockerhub:
-	docker compose --env-file .dockerhub.env -f docker-compose.yml build
-	docker compose --env-file .dockerhub.env -f docker-compose.yml push
+.PHONY: build
+build:
+	$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) build $(DOCKER_COMPOSE_BUILD_ARGS)
 
-.PHONY: build-and-push-ghcr
-build-and-push-ghcr:
-	docker compose --env-file .ghcr.env -f docker-compose.yml build
-	docker compose --env-file .ghcr.env -f docker-compose.yml push
+.PHONY: build-and-push
+build-and-push:
+	$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) build $(DOCKER_COMPOSE_BUILD_ARGS) --push
 
-.PHONY: build-env-file
-build-env-file:
-	cp .env .dockerhub.env
-	sed -i '/IMAGE_VERSION=.*/c\IMAGE_VERSION=${RELEASE_VERSION}' .dockerhub.env
-	sed -i '/IMAGE_NAME=.*/c\IMAGE_NAME=${DOCKERHUB_REPO}' .dockerhub.env
-	cp .env .ghcr.env
-	sed -i '/IMAGE_VERSION=.*/c\IMAGE_VERSION=${RELEASE_VERSION}' .ghcr.env
-	sed -i '/IMAGE_NAME=.*/c\IMAGE_NAME=${GHCR_REPO}' .ghcr.env
+# Create multiplatform builder for buildx
+.PHONY: create-multiplatform-builder
+create-multiplatform-builder:
+	docker buildx create --name otel-demo-builder --bootstrap --use --driver docker-container --config ./buildkitd.toml
 
+# Remove multiplatform builder for buildx
+.PHONY: remove-multiplatform-builder
+remove-multiplatform-builder:
+	docker buildx rm otel-demo-builder
+
+# Build and push multiplatform images (linux/amd64, linux/arm64) using buildx.
+# Requires docker with buildx enabled and a multi-platform capable builder in use.
+# Docker needs to be configured to use containerd storage for images to be loaded into the local registry.
+.PHONY: build-multiplatform
+build-multiplatform:
+	# Because buildx bake does not support --env-file yet, we need to load it into the environment first.
+	set -a; . ./.env.override; set +a && docker buildx bake -f docker-compose.yml --load --set "*.platform=linux/amd64,linux/arm64"
+
+.PHONY: build-multiplatform-and-push
+build-multiplatform-and-push:
+    # Because buildx bake does not support --env-file yet, we need to load it into the environment first.
+	set -a; . ./.env.override; set +a && docker buildx bake -f docker-compose.yml --push --set "*.platform=linux/amd64,linux/arm64"
+
+.PHONY: clean-images
+clean-images:
+	@docker rmi $(shell docker images --filter=reference="ghcr.io/open-telemetry/demo:latest-*" -q); \
+    if [ $$? -ne 0 ]; \
+    then \
+    	echo; \
+        echo "Failed to removed 1 or more OpenTelemetry Demo images."; \
+        echo "Check to ensure the Demo is not running by executing: make stop"; \
+        false; \
+    fi
+
+.PHONY: run-tests
 run-tests:
-	docker compose run frontendTests
-	docker compose run integrationTests
+	$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) -f docker-compose-tests.yml run frontendTests
+	$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) -f docker-compose-tests.yml run traceBasedTests
+
+.PHONY: run-tracetesting
+run-tracetesting:
+	$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) -f docker-compose-tests.yml run traceBasedTests ${SERVICES_TO_TEST}
+
+.PHONY: generate-protobuf
+generate-protobuf:
+	./ide-gen-proto.sh
+
+.PHONY: generate-kubernetes-manifests
+generate-kubernetes-manifests:
+	helm repo add open-telemetry https://open-telemetry.github.io/opentelemetry-helm-charts
+	helm repo update
+	echo "# Copyright The OpenTelemetry Authors" > kubernetes/opentelemetry-demo.yaml
+	echo "# SPDX-License-Identifier: Apache-2.0" >> kubernetes/opentelemetry-demo.yaml
+	echo "# This file is generated by 'make generate-kubernetes-manifests'" >> kubernetes/opentelemetry-demo.yaml
+	echo "---" >> kubernetes/opentelemetry-demo.yaml
+	echo "apiVersion: v1" >> kubernetes/opentelemetry-demo.yaml
+	echo "kind: Namespace" >> kubernetes/opentelemetry-demo.yaml
+	echo "metadata:" >> kubernetes/opentelemetry-demo.yaml
+	echo "  name: otel-demo" >> kubernetes/opentelemetry-demo.yaml
+	helm template opentelemetry-demo open-telemetry/opentelemetry-demo --namespace otel-demo | sed '/helm.sh\/chart\:/d' | sed '/helm.sh\/hook/d' | sed '/managed-by\: Helm/d' >> kubernetes/opentelemetry-demo.yaml
+
+.PHONY: docker-generate-protobuf
+docker-generate-protobuf:
+	./docker-gen-proto.sh
+
+.PHONY: clean
+clean:
+	rm -rf ./src/{checkout,product-catalog}/genproto/oteldemo/
+	rm -rf ./src/recommendation/{demo_pb2,demo_pb2_grpc}.py
+	rm -rf ./src/frontend/protos/demo.ts
+
+.PHONY: check-clean-work-tree
+check-clean-work-tree:
+	@if ! git diff --quiet; then \
+	  echo; \
+	  echo 'Working tree is not clean, did you forget to run "make docker-generate-protobuf"?'; \
+	  echo; \
+	  git status; \
+	  exit 1; \
+	fi
+
+.PHONY: start
+start:
+	$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) up --force-recreate --remove-orphans --detach
+	@echo ""
+	@echo "OpenTelemetry Demo is running."
+	@echo "Go to http://localhost:8080 for the demo UI."
+	@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 http://localhost:8080/feature/ to change feature flags."
+
+.PHONY: start-minimal
+start-minimal:
+	$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) -f docker-compose.minimal.yml up --force-recreate --remove-orphans --detach
+	@echo ""
+	@echo "OpenTelemetry Demo in minimal mode is running."
+	@echo "Go to http://localhost:8080 for the demo UI."
+	@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: stop
+stop:
+	$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) down --remove-orphans --volumes
+	$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) -f docker-compose-tests.yml down --remove-orphans --volumes
+	@echo ""
+	@echo "OpenTelemetry Demo is stopped."
+
+# Use to restart a single service component
+# Example: make restart service=frontend
+.PHONY: restart
+restart:
+# work with `service` or `SERVICE` as input
+ifdef SERVICE
+	service := $(SERVICE)
+endif
+
+ifdef service
+	$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) stop $(service)
+	$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) rm --force $(service)
+	$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) create $(service)
+	$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) start $(service)
+else
+	@echo "Please provide a service name using `service=[service name]` or `SERVICE=[service name]`"
+endif
+
+# Use to rebuild and restart (redeploy) a single service component
+# Example: make redeploy service=frontend
+.PHONY: redeploy
+redeploy:
+# work with `service` or `SERVICE` as input
+ifdef SERVICE
+	service := $(SERVICE)
+endif
+
+ifdef service
+	$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) build $(DOCKER_COMPOSE_BUILD_ARGS) $(service)
+	$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) stop $(service)
+	$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) rm --force $(service)
+	$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) create $(service)
+	$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) start $(service)
+else
+	@echo "Please provide a service name using `service=[service name]` or `SERVICE=[service name]`"
+endif
+
+.PHONY: build-react-native-android
+build-react-native-android:
+	docker build -f src/react-native-app/android.Dockerfile --platform=linux/amd64 --output=. src/react-native-app

README.md

@@ -1,38 +1,54 @@
-# ![otel-photo](./docs/img/opentelemetry-logo-nav.png) OpenTelemetry Demo
+<!-- markdownlint-disable-next-line -->
+# <img src="https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png" alt="OTel logo" width="45"> OpenTelemetry Demo
 
 [![Slack](https://img.shields.io/badge/slack-@cncf/otel/demo-brightgreen.svg?logo=slack)](https://cloud-native.slack.com/archives/C03B4CWV4DA)
 [![Version](https://img.shields.io/github/v/release/open-telemetry/opentelemetry-demo?color=blueviolet)](https://github.com/open-telemetry/opentelemetry-demo/releases)
 [![Commits](https://img.shields.io/github/commits-since/open-telemetry/opentelemetry-demo/latest?color=ff69b4&include_prereleases)](https://github.com/open-telemetry/opentelemetry-demo/graphs/commit-activity)
 [![Downloads](https://img.shields.io/docker/pulls/otel/demo)](https://hub.docker.com/r/otel/demo)
 [![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg?color=red)](https://github.com/open-telemetry/opentelemetry-demo/blob/main/LICENSE)
+[![Integration Tests](https://github.com/open-telemetry/opentelemetry-demo/actions/workflows/run-integration-tests.yml/badge.svg)](https://github.com/open-telemetry/opentelemetry-demo/actions/workflows/run-integration-tests.yml)
+[![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/opentelemetry-demo)](https://artifacthub.io/packages/helm/opentelemetry-helm/opentelemetry-demo)
+[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/9247/badge)](https://www.bestpractices.dev/en/projects/9247)
 
 ## Welcome to the OpenTelemetry Astronomy Shop Demo
 
-We started this project to provide developers, vendors, and OpenTelemetry
-SIG teams with a robust demo application that demonstrates the full feature
-set OpenTelemetry offers.
+This repository contains the OpenTelemetry Astronomy Shop, a microservice-based
+distributed system intended to illustrate the implementation of OpenTelemetry in
+a near real-world environment.
+
+Our goals are threefold:
+
+- Provide a realistic example of a distributed system that can be used to
+  demonstrate OpenTelemetry instrumentation and observability.
+- Build a base for vendors, tooling authors, and others to extend and
+  demonstrate their OpenTelemetry integrations.
+- Create a living example for OpenTelemetry contributors to use for testing new
+  versions of the API, SDK, and other components or enhancements.
 
 We've already made [huge
-progress](https://github.com/open-telemetry/opentelemetry-demo/blob/main/CHANGELOG.md)
-since we've started the project in May 2022 but we're not stopping there. The
-demo is intended to be a living artifact that will be kept up to date and we
-have exciting new features planned as we continue to mature the webstore.
+progress](https://github.com/open-telemetry/opentelemetry-demo/blob/main/CHANGELOG.md),
+and development is ongoing. We hope to represent the full feature set of
+OpenTelemetry across its languages in the future.
 
 If you'd like to help (**which we would love**), check out our [contributing
 guidance](./CONTRIBUTING.md).
 
+If you'd like to extend this demo or maintain a fork of it, read our
+[fork guidance](https://opentelemetry.io/docs/demo/forking/).
+
 ## Quick start
 
-If you want to just dive in start here.
+You can be up and running with the demo in a few minutes. Check out the docs for
+your preferred deployment method:
 
-- [Docker](./docs/docker_deployment.md)
-- [Kubernetes](./docs/kubernetes_deployment.md)
+- [Docker](https://opentelemetry.io/docs/demo/docker_deployment/)
+- [Kubernetes](https://opentelemetry.io/docs/demo/kubernetes_deployment/)
 
 ## Documentation
 
-We have detailed documentation available in the [docs](./docs/) folder. If you're
-curious about a specific feature the docs [README](./docs/README.md) can point
-you in the right direction.
+For detailed documentation, see [Demo Documentation][docs]. If you're curious
+about a specific feature, the [docs landing page][docs] can point you in the
+right direction.
 
 ## Demos featuring the Astronomy Shop
 
@@ -40,40 +56,90 @@ We welcome any vendor to fork the project to demonstrate their services and
 adding a link below. The community is committed to maintaining the project and
 keeping it up to date for you.
 
-- [Datadog](https://github.com/DataDog/opentelemetry-demo)
-- [Dynatrace](https://www.dynatrace.com/news/blog/opentelemetry-demo-application-with-dynatrace/)
-- [Honeycomb.io](https://github.com/honeycombio/opentelemetry-demo)
-- [Lightstep](https://github.com/lightstep/opentelemetry-demo)
-- [New Relic](https://github.com/newrelic/opentelemetry-demo)
-
-See [Forking](./docs/forking.md) for more information about creating your own fork.
+|                           |                |                                  |
+|---------------------------|----------------|----------------------------------|
+| [AlibabaCloud LogService] | [Google Cloud] |  [Oracle]                        |
+| [AppDynamics]             | [Grafana Labs] |  [Sentry]                        |
+| [Aspecto]                 | [Guance]       |  [ServiceNow Cloud Observability]|
+| [Axiom]                   | [Honeycomb.io] |  [SigNoz]                        |
+| [Axoflow]                 | [Instana]      |  [Splunk]                        |
+| [Azure Data Explorer]     | [Kloudfuse]    |  [Sumo Logic]                    |
+| [Coralogix]               | [Last9]        |  [TelemetryHub]                  |
+| [Dash0]                   | [Liatrio]      |  [Teletrace]                     |
+| [Datadog]                 | [Logz.io]      |  [Tracetest]                     |
+| [Dynatrace]               | [New Relic]    |  [Uptrace]                       |
+| [Elastic]                 | [OpenSearch]   |                                  |
 
 ## Contributing
 
 To get involved with the project see our [CONTRIBUTING](CONTRIBUTING.md)
-documentation. Our [SIG Calls](CONTRIBUTING.md#join-a-sig-call) are Mondays at
-8:15 AM PST and anyone is welcome.
+documentation. Our [SIG Calls](CONTRIBUTING.md#join-a-sig-call) are every other
+Wednesday at 8:30 AM PST and anyone is welcome.
 
-## Project leadership
+### Maintainers
 
-[Maintainers](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer)
-([@open-telemetry/demo-maintainers](https://github.com/orgs/open-telemetry/teams/demo-maintainers)):
-
-- [Austin Parker](https://github.com/austinlparker), Lightstep
-- [Carter Socha](https://github.com/cartersocha), Lightstep
-- [Morgan McLean](https://github.com/mtwo), Splunk
-- [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)):
-
-- [Juliano Costa](https://github.com/julianocosta89), Dynatrace
-- [Michael Maxwell](https://github.com/mic-max), Microsoft
+- [Juliano Costa](https://github.com/julianocosta89), Datadog
 - [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
+- [Pierre Tessier](https://github.com/puckpuck), Honeycomb
+- [Roger Coll](https://github.com/rogercoll), Elastic
+
+For more information about the maintainer role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#maintainer).
+
+### Approvers
+
+- [Cedric Ziel](https://github.com/cedricziel), Grafana Labs
+
+For more information about the approver role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#approver).
+
+### Emeritus
+
+- [Austin Parker](https://github.com/austinlparker)
+- [Carter Socha](https://github.com/cartersocha)
+- [Michael Maxwell](https://github.com/mic-max)
+- [Morgan McLean](https://github.com/mtwo)
+- [Penghan Wang](https://github.com/wph95)
+- [Reiley Yang](https://github.com/reyang)
+- [Ziqi Zhao](https://github.com/fatsheep9146)
+
+For more information about the emeritus role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager).
 
 ### Thanks to all the people who have contributed
 
 [![contributors](https://contributors-img.web.app/image?repo=open-telemetry/opentelemetry-demo)](https://github.com/open-telemetry/opentelemetry-demo/graphs/contributors)
+
+[docs]: https://opentelemetry.io/docs/demo/
+
+<!-- Links for Demos featuring the Astronomy Shop section -->
+
+[AlibabaCloud LogService]: https://github.com/aliyun-sls/opentelemetry-demo
+[AppDynamics]: https://community.splunk.com/t5/AppDynamics-Knowledge-Base/How-to-observe-Kubernetes-deployment-of-OpenTelemetry-demo-app/ta-p/741454
+[Aspecto]: https://github.com/aspecto-io/opentelemetry-demo
+[Axiom]: https://play.axiom.co/axiom-play-qf1k/dashboards/otel.traces.otel-demo-traces
+[Axoflow]: https://axoflow.com/opentelemetry-support-in-more-detail-in-axosyslog-and-syslog-ng/
+[Azure Data Explorer]: 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://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
+[Google Cloud]: https://github.com/GoogleCloudPlatform/opentelemetry-demo
+[Grafana Labs]: https://github.com/grafana/opentelemetry-demo
+[Guance]: https://github.com/GuanceCloud/opentelemetry-demo
+[Honeycomb.io]: https://github.com/honeycombio/opentelemetry-demo
+[Instana]: https://github.com/instana/opentelemetry-demo
+[Kloudfuse]: https://github.com/kloudfuse/opentelemetry-demo
+[Last9]: https://last9.io/docs/integrations-opentelemetry-demo/
+[Liatrio]: https://github.com/liatrio/opentelemetry-demo
+[Logz.io]: https://logz.io/learn/how-to-run-opentelemetry-demo-with-logz-io/
+[New Relic]: https://github.com/newrelic/opentelemetry-demo
+[OpenSearch]: https://github.com/opensearch-project/opentelemetry-demo
+[Oracle]: https://github.com/oracle-quickstart/oci-o11y-solutions/blob/main/knowledge-content/opentelemetry-demo
+[Sentry]: https://github.com/getsentry/opentelemetry-demo
+[ServiceNow Cloud Observability]: https://docs.lightstep.com/otel/quick-start-operator#send-data-from-the-opentelemetry-demo
+[SigNoz]: https://signoz.io/blog/opentelemetry-demo/
+[Splunk]: https://github.com/signalfx/opentelemetry-demo
+[Sumo Logic]: https://www.sumologic.com/blog/common-opentelemetry-demo-application/
+[TelemetryHub]: https://github.com/TelemetryHub/opentelemetry-demo/tree/telemetryhub-backend
+[Teletrace]: https://github.com/teletrace/opentelemetry-demo
+[Tracetest]: https://github.com/kubeshop/opentelemetry-demo
+[Uptrace]: https://github.com/uptrace/uptrace/tree/master/example/opentelemetry-demo

buildkitd.toml

@@ -0,0 +1,5 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+[worker.oci]
+max-parallelism = 4

docker-compose-tests.yml

@@ -0,0 +1,130 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+include:
+  - path:
+      - docker-compose.yml     # depend on the main docker-compose file
+      - docker-compose-tests_include-override.yml  # include override for tests
+
+services:
+  # *****
+  # Tests
+  # *****
+  # Frontend Tests
+  frontendTests:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-frontend-tests
+    container_name: frontend-tests
+    build:
+      context: ./
+      dockerfile: ./src/frontend/Dockerfile.cypress
+    volumes:
+      - ./src/frontend/cypress/videos:/app/cypress/videos
+      - ./src/frontend/cypress/screenshots:/app/cypress/screenshots
+    environment:
+      - CYPRESS_baseUrl=http://${FRONTEND_ADDR}
+      - FRONTEND_ADDR
+      - NODE_ENV=production
+    depends_on:
+      - frontend
+
+  # Tracebased Tests
+  traceBasedTests:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-traceBasedTests
+    container_name: traceBasedTests
+    build:
+      context: ./
+      dockerfile: ./test/tracetesting/Dockerfile
+      args:
+        TRACETEST_IMAGE_VERSION: ${TRACETEST_IMAGE_VERSION}
+    environment:
+      - AD_ADDR
+      - CART_ADDR
+      - CHECKOUT_ADDR
+      - CURRENCY_ADDR
+      - EMAIL_ADDR
+      - FRONTEND_ADDR
+      - PAYMENT_ADDR
+      - PRODUCT_CATALOG_ADDR
+      - RECOMMENDATION_ADDR
+      - SHIPPING_ADDR
+      - KAFKA_ADDR
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+    volumes:
+      - ./test/tracetesting:/app/test/tracetesting
+      - ./pb:/app/pb
+    depends_on:
+      tracetest-server:
+        condition: service_healthy
+      # adding demo services as dependencies
+      accounting:
+        condition: service_started
+      ad:
+        condition: service_started
+      cart:
+        condition: service_started
+      checkout:
+        condition: service_started
+      currency:
+        condition: service_started
+      email:
+        condition: service_started
+      fraud-detection:
+        condition: service_started
+      frontend:
+        condition: service_started
+      payment:
+        condition: service_started
+      product-catalog:
+        condition: service_started
+      quote:
+        condition: service_started
+      recommendation:
+        condition: service_started
+      shipping:
+        condition: service_started
+      flagd:
+        condition: service_started
+      kafka:
+        condition: service_started
+
+  tracetest-server:
+    image: ${TRACETEST_IMAGE}
+    platform: linux/amd64
+    container_name: tracetest-server
+    volumes:
+      - type: bind
+        source: ./test/tracetesting/tracetest-config.yaml
+        target: /app/tracetest.yaml
+      - type: bind
+        source: ./test/tracetesting/tracetest-provision.yaml
+        target: /app/provision.yaml
+    command: --provisioning-file /app/provision.yaml
+    ports:
+      - 11633:11633
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+    depends_on:
+      tracetest-postgres:
+        condition: service_healthy
+      otel-collector:
+        condition: service_started
+    healthcheck:
+      test: [ "CMD", "wget", "--spider", "localhost:11633" ]
+      interval: 1s
+      timeout: 3s
+      retries: 60
+
+  tracetest-postgres:
+    image: ${POSTGRES_IMAGE}
+    container_name: tracetest-postgres
+    environment:
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_USER: postgres
+    healthcheck:
+      test: pg_isready -U "$$POSTGRES_USER" -d "$$POSTGRES_DB"
+      interval: 1s
+      timeout: 5s
+      retries: 60
+    ports:
+      - 5432

docker-compose-tests_include-override.yml

@@ -0,0 +1,17 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+services:
+
+  otel-collector:
+    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
+      - ./test/tracetesting/otelcol-config-tracetest.yml:/etc/otelcol-config-tracetest.yml
+    depends_on: []

docker-compose.minimal.yml

@@ -0,0 +1,693 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+x-default-logging: &logging
+  driver: "json-file"
+  options:
+    max-size: "5m"
+    max-file: "2"
+    tag: "{{.Name}}"
+
+networks:
+  default:
+    name: opentelemetry-demo
+    driver: bridge
+
+services:
+  # ******************
+  # Core Demo Services
+  # ******************
+
+  # AdService
+  ad:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-ad
+    container_name: ad
+    build:
+      context: ./
+      dockerfile: ${AD_DOCKERFILE}
+      cache_from:
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-ad
+      args:
+        OTEL_JAVA_AGENT_VERSION: ${OTEL_JAVA_AGENT_VERSION}
+    deploy:
+      resources:
+        limits:
+          memory: 300M
+    restart: unless-stopped
+    ports:
+      - "${AD_PORT}"
+    environment:
+      - AD_PORT
+      - FLAGD_HOST
+      - OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_HTTP}
+      - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
+      - OTEL_RESOURCE_ATTRIBUTES
+      - OTEL_LOGS_EXPORTER=otlp
+      - OTEL_SERVICE_NAME=ad
+      # Workaround on OSX for https://bugs.openjdk.org/browse/JDK-8345296
+      - _JAVA_OPTIONS
+    depends_on:
+      otel-collector:
+        condition: service_started
+    logging: *logging
+
+  # Cart service
+  cart:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-cart
+    container_name: cart
+    build:
+      context: ./
+      dockerfile: ${CART_DOCKERFILE}
+      cache_from:
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-cart
+    deploy:
+      resources:
+        limits:
+          memory: 160M
+    restart: unless-stopped
+    ports:
+      - "${CART_PORT}"
+    environment:
+      - CART_PORT
+      - FLAGD_HOST
+      - VALKEY_ADDR
+      - OTEL_EXPORTER_OTLP_ENDPOINT
+      - OTEL_RESOURCE_ATTRIBUTES
+      - OTEL_SERVICE_NAME=cart
+      - ASPNETCORE_URLS=http://*:${CART_PORT}
+    depends_on:
+      valkey-cart:
+        condition: service_started
+      otel-collector:
+        condition: service_started
+    logging: *logging
+
+  # Checkout service
+  checkout:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-checkout
+    container_name: checkout
+    build:
+      context: ./
+      dockerfile: ${CHECKOUT_DOCKERFILE}
+      cache_from:
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-checkout
+    deploy:
+      resources:
+        limits:
+          memory: 20M
+    restart: unless-stopped
+    ports:
+      - "${CHECKOUT_PORT}"
+    environment:
+      - CHECKOUT_PORT
+      - CART_ADDR
+      - CURRENCY_ADDR
+      - EMAIL_ADDR
+      - FLAGD_HOST
+      - PAYMENT_ADDR
+      - PRODUCT_CATALOG_ADDR
+      - SHIPPING_ADDR
+      - GOMEMLIMIT=16MiB
+      - OTEL_EXPORTER_OTLP_ENDPOINT
+      - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
+      - OTEL_RESOURCE_ATTRIBUTES
+      - OTEL_SERVICE_NAME=checkout
+    depends_on:
+      cart:
+        condition: service_started
+      currency:
+        condition: service_started
+      email:
+        condition: service_started
+      payment:
+        condition: service_started
+      product-catalog:
+        condition: service_started
+      shipping:
+        condition: service_started
+      otel-collector:
+        condition: service_started
+    logging: *logging
+
+  # Currency service
+  currency:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-currency
+    container_name: currency
+    build:
+      context: ./
+      dockerfile: ${CURRENCY_DOCKERFILE}
+      cache_from:
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-currency
+      args:
+        OPENTELEMETRY_CPP_VERSION: ${OPENTELEMETRY_CPP_VERSION}
+    deploy:
+      resources:
+        limits:
+          memory: 20M
+    restart: unless-stopped
+    ports:
+      - "${CURRENCY_PORT}"
+    environment:
+      - CURRENCY_PORT
+      - VERSION=${IMAGE_VERSION}
+      - OTEL_EXPORTER_OTLP_ENDPOINT
+      - OTEL_RESOURCE_ATTRIBUTES=${OTEL_RESOURCE_ATTRIBUTES},service.name=currency   # The C++ SDK does not support OTEL_SERVICE_NAME
+    depends_on:
+      otel-collector:
+        condition: service_started
+    logging: *logging
+
+  # Email service
+  email:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-email
+    container_name: email
+    build:
+      context: ./src/email
+      cache_from:
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-email
+    deploy:
+      resources:
+        limits:
+          memory: 100M
+    restart: unless-stopped
+    ports:
+      - "${EMAIL_PORT}"
+    environment:
+      - APP_ENV=production
+      - EMAIL_PORT
+      - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_HTTP}/v1/traces
+      - OTEL_RESOURCE_ATTRIBUTES
+      - OTEL_SERVICE_NAME=email
+    depends_on:
+      otel-collector:
+        condition: service_started
+    logging: *logging
+
+  # Frontend
+  frontend:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-frontend
+    container_name: frontend
+    build:
+      context: ./
+      dockerfile: ${FRONTEND_DOCKERFILE}
+      cache_from:
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-frontend
+    deploy:
+      resources:
+        limits:
+          memory: 250M
+    restart: unless-stopped
+    ports:
+      - "${FRONTEND_PORT}"
+    environment:
+      - PORT=${FRONTEND_PORT}
+      - FRONTEND_ADDR
+      - AD_ADDR
+      - CART_ADDR
+      - CHECKOUT_ADDR
+      - CURRENCY_ADDR
+      - PRODUCT_CATALOG_ADDR
+      - RECOMMENDATION_ADDR
+      - SHIPPING_ADDR
+      - OTEL_EXPORTER_OTLP_ENDPOINT
+      - OTEL_RESOURCE_ATTRIBUTES=${OTEL_RESOURCE_ATTRIBUTES}
+      - ENV_PLATFORM
+      - OTEL_SERVICE_NAME=frontend
+      - PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
+      - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
+      - WEB_OTEL_SERVICE_NAME=frontend-web
+      - OTEL_COLLECTOR_HOST
+      - FLAGD_HOST
+      - FLAGD_PORT
+    depends_on:
+      ad:
+        condition: service_started
+      cart:
+        condition: service_started
+      checkout:
+        condition: service_started
+      currency:
+        condition: service_started
+      product-catalog:
+        condition: service_started
+      quote:
+        condition: service_started
+      recommendation:
+        condition: service_started
+      shipping:
+        condition: service_started
+      otel-collector:
+        condition: service_started
+      image-provider:
+        condition: service_started
+    logging: *logging
+
+  # Frontend Proxy (Envoy)
+  frontend-proxy:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-frontend-proxy
+    container_name: frontend-proxy
+    build:
+      context: ./
+      dockerfile: ${FRONTEND_PROXY_DOCKERFILE}
+    deploy:
+      resources:
+        limits:
+          memory: 65M
+    restart: unless-stopped
+    ports:
+      - "${ENVOY_PORT}:${ENVOY_PORT}"
+      - 10000:10000
+    environment:
+      - FRONTEND_PORT
+      - FRONTEND_HOST
+      - LOCUST_WEB_HOST
+      - LOCUST_WEB_PORT
+      - GRAFANA_PORT
+      - GRAFANA_HOST
+      - JAEGER_PORT
+      - JAEGER_HOST
+      - OTEL_COLLECTOR_HOST
+      - IMAGE_PROVIDER_HOST
+      - IMAGE_PROVIDER_PORT
+      - OTEL_COLLECTOR_PORT_GRPC
+      - OTEL_COLLECTOR_PORT_HTTP
+      - OTEL_RESOURCE_ATTRIBUTES
+      - OTEL_SERVICE_NAME=frontend-proxy
+      - ENVOY_PORT
+      - FLAGD_HOST
+      - FLAGD_PORT
+      - FLAGD_UI_HOST
+      - FLAGD_UI_PORT
+    depends_on:
+      frontend:
+        condition: service_started
+      load-generator:
+        condition: service_started
+      jaeger:
+        condition: service_started
+      grafana:
+        condition: service_started
+    dns_search: ""
+
+  # image-provider
+  image-provider:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-image-provider
+    container_name: image-provider
+    build:
+      context: ./
+      dockerfile: ${IMAGE_PROVIDER_DOCKERFILE}
+      cache_from:
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-image-provider
+    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=image-provider
+      - OTEL_RESOURCE_ATTRIBUTES
+    depends_on:
+      otel-collector:
+        condition: service_started
+    logging: *logging
+
+  # Load Generator
+  load-generator:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-load-generator
+    container_name: load-generator
+    build:
+      context: ./
+      dockerfile: ${LOAD_GENERATOR_DOCKERFILE}
+      cache_from:
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-load-generator
+    deploy:
+      resources:
+        limits:
+          memory: 120M
+    restart: unless-stopped
+    ports:
+      - "${LOCUST_WEB_PORT}"
+    environment:
+      - LOCUST_WEB_PORT
+      - LOCUST_USERS
+      - LOCUST_HOST
+      - LOCUST_HEADLESS
+      - LOCUST_AUTOSTART
+      - LOCUST_BROWSER_TRAFFIC_ENABLED=false
+      - OTEL_EXPORTER_OTLP_ENDPOINT
+      - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
+      - OTEL_RESOURCE_ATTRIBUTES
+      - OTEL_SERVICE_NAME=load-generator
+      - PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
+      - LOCUST_WEB_HOST=0.0.0.0
+      - FLAGD_HOST
+      - FLAGD_OFREP_PORT
+    depends_on:
+      frontend:
+        condition: service_started
+      flagd:
+        condition: service_started
+    logging: *logging
+
+  # Payment service
+  payment:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-payment
+    container_name: payment
+    build:
+      context: ./
+      dockerfile: ${PAYMENT_DOCKERFILE}
+      cache_from:
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-payment
+    deploy:
+      resources:
+        limits:
+          memory: 120M
+    restart: unless-stopped
+    ports:
+      - "${PAYMENT_PORT}"
+    environment:
+      - FLAGD_HOST
+      - PAYMENT_PORT
+      - OTEL_EXPORTER_OTLP_ENDPOINT
+      - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
+      - OTEL_RESOURCE_ATTRIBUTES
+      - OTEL_SERVICE_NAME=payment
+    depends_on:
+      otel-collector:
+        condition: service_started
+    logging: *logging
+
+  # Product Catalog service
+  product-catalog:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-product-catalog
+    container_name: product-catalog
+    build:
+      context: ./
+      dockerfile: ${PRODUCT_CATALOG_DOCKERFILE}
+      cache_from:
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-product-catalog
+    deploy:
+      resources:
+        limits:
+          memory: 20M
+    restart: unless-stopped
+    ports:
+      - "${PRODUCT_CATALOG_PORT}"
+    environment:
+      - FLAGD_HOST
+      - PRODUCT_CATALOG_PORT
+      - PRODUCT_CATALOG_RELOAD_INTERVAL
+      - GOMEMLIMIT=16MiB
+      - OTEL_EXPORTER_OTLP_ENDPOINT
+      - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
+      - OTEL_RESOURCE_ATTRIBUTES
+      - OTEL_SERVICE_NAME=product-catalog
+    volumes:
+      - ./src/product-catalog/products:/usr/src/app/products
+    depends_on:
+      otel-collector:
+        condition: service_started
+    logging: *logging
+
+  # Quote service
+  quote:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-quote
+    container_name: quote
+    build:
+      context: ./
+      dockerfile: ${QUOTE_DOCKERFILE}
+      cache_from:
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-quote
+    deploy:
+      resources:
+        limits:
+          memory: 40M
+    restart: unless-stopped
+    ports:
+      - "${QUOTE_PORT}"
+    environment:
+      - OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_HTTP}
+      - OTEL_PHP_AUTOLOAD_ENABLED=true
+      - QUOTE_PORT
+      - OTEL_RESOURCE_ATTRIBUTES
+      - OTEL_SERVICE_NAME=quote
+      - OTEL_PHP_INTERNAL_METRICS_ENABLED=true
+    depends_on:
+      otel-collector:
+        condition: service_started
+    logging: *logging
+
+  # Recommendation service
+  recommendation:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-recommendation
+    container_name: recommendation
+    build:
+      context: ./
+      dockerfile: ${RECOMMENDATION_DOCKERFILE}
+      cache_from:
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-recommendation
+    deploy:
+      resources:
+        limits:
+          memory: 50M
+    restart: unless-stopped
+    ports:
+      - "${RECOMMENDATION_PORT}"
+    environment:
+      - FLAGD_HOST
+      - RECOMMENDATION_PORT
+      - PRODUCT_CATALOG_ADDR
+      - OTEL_PYTHON_LOG_CORRELATION=true
+      - OTEL_EXPORTER_OTLP_ENDPOINT
+      - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
+      - OTEL_RESOURCE_ATTRIBUTES
+      - OTEL_SERVICE_NAME=recommendation
+      - PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
+    depends_on:
+      product-catalog:
+        condition: service_started
+      otel-collector:
+        condition: service_started
+    logging: *logging
+
+  # Shipping service
+  shipping:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-shipping
+    container_name: shipping
+    build:
+      context: ./
+      dockerfile: ${SHIPPING_DOCKERFILE}
+      cache_from:
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-shipping
+    deploy:
+      resources:
+        limits:
+          memory: 20M
+    restart: unless-stopped
+    ports:
+      - "${SHIPPING_PORT}"
+    environment:
+      - SHIPPING_PORT
+      - QUOTE_ADDR
+      - OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_GRPC}
+      - OTEL_RESOURCE_ATTRIBUTES
+      - OTEL_SERVICE_NAME=shipping
+    healthcheck:
+      test: ["CMD-SHELL", "timeout 1 bash -c '>/dev/tcp/localhost/${SHIPPING_PORT}'"]
+      start_period: 10s
+      interval: 5s
+      timeout: 10s
+      retries: 10
+    depends_on:
+      otel-collector:
+        condition: service_started
+    logging: *logging
+
+  # ******************
+  # Dependent Services
+  # ******************
+  # Flagd, feature flagging service
+  flagd:
+    image: ${FLAGD_IMAGE}
+    container_name: flagd
+    deploy:
+      resources:
+        limits:
+          memory: 75M
+    environment:
+      - FLAGD_OTEL_COLLECTOR_URI=${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_GRPC}
+      - FLAGD_METRICS_EXPORTER=otel
+      - GOMEMLIMIT=60MiB
+      - OTEL_RESOURCE_ATTRIBUTES
+      - OTEL_SERVICE_NAME=flagd
+    command: [
+      "start",
+      "--uri",
+      "file:./etc/flagd/demo.flagd.json"
+    ]
+    ports:
+      - "${FLAGD_PORT}"
+      - "${FLAGD_OFREP_PORT}"
+    volumes:
+      - ./src/flagd:/etc/flagd
+    logging:
+      *logging
+
+  # Valkey used by Cart service
+  valkey-cart:
+    image: ${VALKEY_IMAGE}
+    container_name: valkey-cart
+    user: valkey
+    deploy:
+      resources:
+        limits:
+          memory: 20M
+    restart: unless-stopped
+    ports:
+      - "${VALKEY_PORT}"
+    logging: *logging
+
+
+  # ********************
+  # Telemetry Components
+  # ********************
+  # Jaeger
+  jaeger:
+    image: ${JAEGERTRACING_IMAGE}
+    container_name: jaeger
+    command:
+      - "--memory.max-traces=5000"
+      - "--query.base-path=/jaeger/ui"
+      - "--prometheus.server-url=http://${PROMETHEUS_ADDR}"
+      - "--prometheus.query.normalize-calls=true"
+      - "--prometheus.query.normalize-duration=true"
+    deploy:
+      resources:
+        limits:
+          memory: 400M
+    restart: unless-stopped
+    ports:
+      - "${JAEGER_PORT}"         # Jaeger UI
+      - "${OTEL_COLLECTOR_PORT_GRPC}"
+    environment:
+      - METRICS_STORAGE_TYPE=prometheus
+    logging: *logging
+
+  # Grafana
+  grafana:
+    image: ${GRAFANA_IMAGE}
+    container_name: grafana
+    deploy:
+      resources:
+        limits:
+          memory: 120M
+    restart: unless-stopped
+    environment:
+      - "GF_INSTALL_PLUGINS=grafana-opensearch-datasource"
+    volumes:
+      - ./src/grafana/grafana.ini:/etc/grafana/grafana.ini
+      - ./src/grafana/provisioning/:/etc/grafana/provisioning/
+    ports:
+      - "${GRAFANA_PORT}"
+    logging: *logging
+
+  # OpenTelemetry Collector
+  otel-collector:
+    image: ${COLLECTOR_CONTRIB_IMAGE}
+    container_name: otel-collector
+    deploy:
+      resources:
+        limits:
+          memory: 200M
+    restart: unless-stopped
+    command: [ "--config=/etc/otelcol-config.yml", "--config=/etc/otelcol-config-extras.yml" ]
+    user: 0:0
+    volumes:
+      - ${HOST_FILESYSTEM}:/hostfs:ro
+      - ${DOCKER_SOCK}:/var/run/docker.sock:ro
+      - ${OTEL_COLLECTOR_CONFIG}:/etc/otelcol-config.yml
+      - ${OTEL_COLLECTOR_CONFIG_EXTRAS}:/etc/otelcol-config-extras.yml
+    ports:
+      - "${OTEL_COLLECTOR_PORT_GRPC}"
+      - "${OTEL_COLLECTOR_PORT_HTTP}"
+    depends_on:
+      jaeger:
+        condition: service_started
+      opensearch:
+        condition: service_healthy
+    logging: *logging
+    environment:
+      - FRONTEND_PROXY_ADDR
+      - IMAGE_PROVIDER_HOST
+      - IMAGE_PROVIDER_PORT
+      - HOST_FILESYSTEM
+      - OTEL_COLLECTOR_HOST
+      - OTEL_COLLECTOR_PORT_GRPC
+      - OTEL_COLLECTOR_PORT_HTTP
+      - GOMEMLIMIT=160MiB
+
+  # Prometheus
+  prometheus:
+    image: ${PROMETHEUS_IMAGE}
+    container_name: prometheus
+    command:
+      - --web.console.templates=/etc/prometheus/consoles
+      - --web.console.libraries=/etc/prometheus/console_libraries
+      - --storage.tsdb.retention.time=1h
+      - --config.file=/etc/prometheus/prometheus-config.yaml
+      - --storage.tsdb.path=/prometheus
+      - --web.enable-lifecycle
+      - --web.route-prefix=/
+      - --web.enable-otlp-receiver
+      - --enable-feature=exemplar-storage
+    volumes:
+      - ./src/prometheus/prometheus-config.yaml:/etc/prometheus/prometheus-config.yaml
+    deploy:
+      resources:
+        limits:
+          memory: 300M
+    restart: unless-stopped
+    ports:
+      - "${PROMETHEUS_PORT}:${PROMETHEUS_PORT}"
+    logging: *logging
+
+  # OpenSearch
+  opensearch:
+    image: ${OPENSEARCH_IMAGE}
+    container_name: opensearch
+    deploy:
+      resources:
+        limits:
+          memory: 1.1G
+    restart: unless-stopped
+    environment:
+      - cluster.name=demo-cluster
+      - node.name=demo-node
+      - bootstrap.memory_lock=true
+      - discovery.type=single-node
+      - OPENSEARCH_JAVA_OPTS=-Xms300m -Xmx300m
+      - DISABLE_INSTALL_DEMO_CONFIG=true
+      - DISABLE_SECURITY_PLUGIN=true
+      # Workaround on OSX for https://bugs.openjdk.org/browse/JDK-8345296
+      - _JAVA_OPTIONS
+    ulimits:
+      memlock:
+        soft: -1
+        hard: -1
+      nofile:
+        soft: 65536
+        hard: 65536
+    ports:
+      - "9200"
+    healthcheck:
+      test: curl -s http://localhost:9200/_cluster/health | grep -E '"status":"(green|yellow)"'
+      start_period: 10s
+      interval: 5s
+      timeout: 10s
+      retries: 10
+    logging: *logging

docker-gen-proto.sh

@@ -0,0 +1,61 @@
+#!/bin/sh
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+set -e # Exit immediately if a command exits with a non-zero status.
+set -x # Print commands and their arguments as they are executed
+
+# This script is used to generate protobuf files for all services with Docker.
+
+. ./.env
+
+gen_proto_go() {
+  echo "Generating Go protobuf files for $1"
+  docker build -f "src/$1/genproto/Dockerfile" -t "$1-genproto" .
+  docker run --rm -v $(pwd):/build "$1-genproto" \
+    protoc -I /build/pb /build/pb/demo.proto --go_out="./src/$1/" --go-grpc_out="./src/$1/"
+}
+
+gen_proto_cpp() {
+  echo "Generating Cpp protobuf files for $1"
+  docker build --build-arg OPENTELEMETRY_CPP_VERSION=${OPENTELEMETRY_CPP_VERSION} -f "src/$1/genproto/Dockerfile" -t "$1-genproto" .
+  docker run --rm -v $(pwd):/build "$1-genproto" \
+    cp -r "/$1/build/generated" "/build/src/$1/build/"
+}
+
+gen_proto_python() {
+  echo "Generating Python protobuf files for $1"
+  docker build -f "src/$1/genproto/Dockerfile" -t "$1-genproto" .
+  docker run --rm -v $(pwd):/build "$1-genproto" \
+    python -m grpc_tools.protoc -I /build/pb/ --python_out="./src/$1/" --grpc_python_out="./src/$1/" /build/pb/demo.proto
+}
+
+gen_proto_ts() {
+  echo "Generating Typescript protobuf files for $1"
+  docker build -f "src/$1/genproto/Dockerfile" -t "$1-genproto" .
+  docker run --rm -e SERVICE=$1 -v $(pwd):/build "$1-genproto" /bin/sh -c '
+    mkdir -p /build/src/$SERVICE/protos && \
+    protoc -I /build/pb \
+    --plugin=protoc-gen-ts_proto=/app/node_modules/.bin/protoc-gen-ts_proto \
+    --ts_proto_opt=esModuleInterop=true \
+    --ts_proto_out="/build/src/$SERVICE/protos" \
+    --ts_proto_opt=outputServices=grpc-js \
+    /build/pb/demo.proto'
+}
+
+if [ -z "$1" ]; then
+  #gen_proto_dotnet accounting
+  #gen_proto_java ad
+  #gen_proto_dotnet cart
+  gen_proto_go checkout
+  gen_proto_cpp currency
+  #gen_proto_ruby email
+  gen_proto_ts frontend
+  #gen_proto_js payment
+  gen_proto_go product-catalog
+  #gen_proto_php quote
+  gen_proto_python recommendation
+  #gen_proto_rust shipping
+else
+  "gen_proto_$1" "$2"
+fi

docs/README.md

@@ -1,81 +0,0 @@
-# OpenTelemetry Demo Documentation
-
-Welcome to the OpenTelemetry Demo! This folder contains overall documentation
-for the project, how to install and run it, and some scenarios you can use to
-view OpenTelemetry in action.
-
-## Table of Contents
-
-- [Guided Scenarios](#scenarios)
-- [Language Instrumentation Examples](#language-feature-reference)
-- [Quick Start](#running-the-demo)
-- [References](#reference)
-- [Service Documentation](#service-documentation)
-
-### Running the Demo
-
-Want to deploy the demo and see it in action? Start here.
-
-- [Docker](./docker_deployment.md)
-- [Kubernetes](./kubernetes_deployment.md)
-
-### Language Feature Reference
-
-Want to understand how a particular language's instrumentation works? Start
-here.
-
-| Language      | Auto Instrumentation                                                                                                | Manual Instrumentation                                                                                              |
-|---------------|---------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------|
-| .NET          | [Cart Service](./services/cartservice.md)                                                                           | [Cart Service](./services/cartservice.md)                                                                           |
-| C++           |                                                                                                                     |                                                                                                                     |
-| Erlang/Elixir | [Feature Flag Service](./services/featureflagservice.md)                                                            | [Feature Flag Service](./services/featureflagservice.md)                                                            |
-| Go            | [Checkout Service](./services/checkoutservice.md), [Product Catalog Service]( ./services/productcatalogservice.md ) | [Checkout Service](./services/checkoutservice.md), [Product Catalog Service]( ./services/productcatalogservice.md ) |
-| Java          | [Ad Service](./services/adservice.md)                                                                               | [Ad Service](./services/adservice.md)                                                                               |
-| JavaScript    | [Frontend]( ./services/frontend.md )                                                                                | [Frontend](./services/frontend.md), [Payment Service](./services/paymentservice.md)                                 |
-| PHP           | [Quote Service](./services/quoteservice.md)                                                                         | [Quote Service](./services/quoteservice.md)                                                                         |
-| Python        | [Recommendation Service](./services/recommendationservice.md)                                                       | [Recommendation Service](./services/recommendationservice.md)                                                       |
-| Ruby          | [Email Service](./services/emailservice.md)                                                                         | [Email Service](./services/emailservice.md)                                                                         |
-| Rust          | [Shipping Service](./services/shippingservice.md)                                                                   | [Shipping Service](./services/shippingservice.md)                                                                   |
-
-### Service Documentation
-
-Specific information about how OpenTelemetry is deployed in each service can be
-found here:
-
-- [Ad Service](./services/adservice.md)
-- [Cart Service](./services/cartservice.md)
-- [Checkout Service](./services/checkoutservice.md)
-- [Email Service](./services/emailservice.md)
-- [Feature Flag Service](./services/featureflagservice.md)
-- [Frontend](./services/frontend.md)
-- [Load Generator](./services/loadgenerator.md)
-- [Payment Service](./services/paymentservice.md)
-- [Product Catalog Service](./services/productcatalogservice.md)
-- [Quote Service](./services/quoteservice.md)
-- [Recommendation Service](./services/recommendationservice.md)
-- [Shipping Service](./services/shippingservice.md)
-
-### Scenarios
-
-How can you solve problems with OpenTelemetry? These scenarios walk you through
-some pre-configured problems and show you how to interpret OpenTelemetry data to
-solve them.
-
-We'll be adding more scenarios over time.
-
-- Generate a [Product Catalog error](feature_flags.md) for `GetProduct` requests
-  with product id: `OLJCESPC7Z` using the Feature Flag service
-
-### Reference
-
-Project reference documentation, like requirements and feature matrices.
-
-- [Architecture](./current_architecture.md)
-- [Feature Flags Reference](./feature_flags.md)
-- [Metric Feature Matrix](./metric_service_features.md)
-- [Requirements](./requirements/)
-- [Screenshots](./demo_screenshots.md)
-- [Service Roles Table](./service_table.md)
-- [Span Attributes Reference](./manual_span_attributes.md)
-- [Tests](./tests.md)
-- [Trace Feature Matrix](./trace_service_features.md)

docs/current_architecture.md

@@ -1,94 +0,0 @@
-# Demo Architecture
-
-**Online Boutique** is composed of microservices written in different programming
-languages that talk to each other over gRPC and HTTP; and a load generator which
-uses [Locust](https://locust.io/) to fake user traffic.
-
-```mermaid
-graph TD
-
-subgraph Service Diagram
-adservice(Ad Service):::java
-cache[(Cache<br/>&#40redis&#41)]
-cartservice(Cart Service):::dotnet
-checkoutservice(Checkout Service):::golang
-currencyservice(Currency Service):::cpp
-emailservice(Email Service):::ruby
-frontend(Frontend):::javascript
-frontendproxy(Frontend Proxy <br/>&#40Envoy&#41):::cpp
-loadgenerator([Load Generator]):::python
-paymentservice(Payment Service):::javascript
-productcatalogservice(Product Catalog Service):::golang
-quoteservice(Quote Service):::php
-recommendationservice(Recommendation Service):::python
-shippingservice(Shipping Service):::rust
-featureflagservice(Feature Flag Service):::erlang
-featureflagstore[(Feature Flag Store<br/>&#40PostgreSQL DB&#41)]
-
-Internet -->|HTTP| frontendproxy
-frontendproxy -->|HTTP| frontend
-frontendproxy -->|HTTP| featureflagservice
-loadgenerator -->|HTTP| frontend
-
-checkoutservice --->|gRPC| cartservice --> cache
-checkoutservice --->|gRPC| productcatalogservice
-checkoutservice --->|gRPC| currencyservice
-checkoutservice --->|HTTP| emailservice
-checkoutservice --->|gRPC| paymentservice
-checkoutservice -->|gRPC| shippingservice
-
-frontend -->|gRPC| adservice
-frontend -->|gRPC| cartservice
-frontend -->|gRPC| productcatalogservice
-frontend -->|gRPC| checkoutservice
-frontend -->|gRPC| currencyservice
-frontend -->|gRPC| recommendationservice -->|gRPC| productcatalogservice
-frontend -->|gRPC| shippingservice -->|HTTP| quoteservice
-
-productcatalogservice -->|gRPC| featureflagservice
-
-shippingservice -->|gRPC| featureflagservice
-
-featureflagservice --> featureflagstore
-
-end
-classDef java fill:#b07219,color:white;
-classDef dotnet fill:#178600,color:white;
-classDef golang fill:#00add8,color:black;
-classDef cpp fill:#f34b7d,color:white;
-classDef ruby fill:#701516,color:white;
-classDef python fill:#3572A5,color:white;
-classDef javascript fill:#f1e05a,color:black;
-classDef rust fill:#dea584,color:black;
-classDef erlang fill:#b83998,color:white;
-classDef php fill:#4f5d95,color:white;
-```
-
-```mermaid
-graph TD
-subgraph Service Legend
-  javasvc(Java):::java
-  dotnetsvc(.NET):::dotnet
-  golangsvc(Go):::golang
-  cppsvc(C++):::cpp
-  rubysvc(Ruby):::ruby
-  pythonsvc(Python):::python
-  javascriptsvc(JavaScript):::javascript
-  rustsvc(Rust):::rust
-  erlangsvc(Erlang/Elixir):::erlang
-  phpsvc(PHP):::php
-end
-
-classDef java fill:#b07219,color:white;
-classDef dotnet fill:#178600,color:white;
-classDef golang fill:#00add8,color:black;
-classDef cpp fill:#f34b7d,color:white;
-classDef ruby fill:#701516,color:white;
-classDef python fill:#3572A5,color:white;
-classDef javascript fill:#f1e05a,color:black;
-classDef rust fill:#dea584,color:black;
-classDef erlang fill:#b83998,color:white;
-classDef php fill:#4f5d95,color:white;
-```
-
-Find the **Protocol Buffer Definitions** in the `/pb/` directory.

docs/demo_features.md

@@ -1,28 +0,0 @@
-# Features
-
-- **[Kubernetes](https://kubernetes.io)**: the app is designed to run on
-  Kubernetes (both locally, as well as on the cloud) using a Helm chart.
-- **[Docker](https://docs.docker.com)**: this forked sample can also be executed
-  only with Docker.
-- **[gRPC](https://grpc.io)**: microservices use a high volume of gRPC calls to
-  communicate to each other.
-- **[HTTP](https://www.rfc-editor.org/rfc/rfc9110.html)**: microservices use HTTP
-  where gRPC is unavailable or not well supported.
-- **[OpenTelemetry Traces](https://opentelemetry.io)**: all services are
-  instrumented using OpenTelemetry available instrumentation libraries.
-- **[OpenTelemetry Metrics](https://opentelemetry.io)**: Select services are
-instrumented using OpenTelemetry available instrumentation libraries. More will
-be added as the relevant SDKs are released.
-- **[OpenTelemetry
-  Collector](https://opentelemetry.io/docs/collector/getting-started)**: all
-  services are instrumented and sending the generated traces and metrics to the
-  OpenTelemetry Collector via gRPC. The received traces are then exported to the
-  logs and to Jaeger.
-- **[Jaeger](https://www.jaegertracing.io)**: all generated traces are being
-  sent to Jaeger.
-- **Synthetic Load Generation**: the application demo comes with a background
-  job that creates realistic usage patterns on the website using
-  [Locust](https://locust.io/) load generator.
-- **[Prometheus](https://prometheus.io/)**: all generated metrics are scraped by
-  Prometheus.
-- **[Grafana](https://grafana.com/)**: all metric dashboards are stored in Grafana.

docs/demo_screenshots.md

@@ -1,43 +0,0 @@
-# Demo Screenshots
-
-- [Demo Screenshots](#demo-screenshots)
-  - [Webstore](#webstore)
-  - [Jaeger](#jaeger)
-  - [Prometheus](#prometheus)
-  - [Grafana](#grafana)
-  - [Feature Flag UI](#feature-flag-ui)
-  - [Load Generator UI](#load-generator-ui)
-
-## Webstore
-
-| Home Page                                                                                                         | Checkout Screen                                                                                                    |
-| ----------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------ |
-| ![frontend-1](https://user-images.githubusercontent.com/15364991/194416314-d8210de5-814a-45b8-a47c-9d6bace51fa5.png) | ![frontend-2](https://user-images.githubusercontent.com/15364991/194416580-7f7ac8fe-85c0-462d-a896-6e0f6c95afac.png) |
-
-## Jaeger
-
-| Jaeger UI                                                                                                         | Trace View                                                                                                    |
-| ----------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------ |
-| ![jaeger-ui](https://user-images.githubusercontent.com/15364991/194417029-1e40f276-8785-47fb-b645-c90820c0ff52.png) | ![jaeger-trace-view](https://user-images.githubusercontent.com/15364991/194416769-188acc26-71c9-4611-8150-aa8639f11217.png) |
-
-| System Architecture|
-| --- |
-|![jaeger-system-architecture](https://user-images.githubusercontent.com/47896520/196496223-6d6ea729-5bea-4a8c-a2c6-cd51cce386ae.png)|
-
-## Prometheus
-
-![prometheus](https://user-images.githubusercontent.com/47896520/196564627-ba9f5e91-a0fa-4bf0-beb1-f3a79ca309b5.png)
-
-## Grafana
-
-| Prometheus Data Source |Jaeger Data Source |
-| --- | --- |
-| ![grafana-prometheus](https://user-images.githubusercontent.com/47896520/196495466-86d3ce33-def4-4808-a6d9-3e32934bbf03.png) | ![gragana-jaeger](https://user-images.githubusercontent.com/47896520/196495509-c233d0d9-5e4c-4607-b609-dbf7869298d9.png) |
-
-## Feature Flag UI
-
-![feature-flag-ui](https://user-images.githubusercontent.com/47896520/196496050-22fbbb56-9e62-46dd-a23c-c34c5566f7d2.png)
-
-## Load Generator UI
-
-![load-generator-ui](https://user-images.githubusercontent.com/47896520/196496589-bda802fc-aada-4e72-a184-93bb4711abca.png)

docs/docker_deployment.md

@@ -1,92 +0,0 @@
-# Docker
-
-## Prerequisites
-
-- Docker
-- [Docker Compose](https://docs.docker.com/compose/install/#install-compose) v2.0.0+
-- 4 GB of RAM
-
-## Clone Repo
-
-- Clone the Webstore Demo repository:
-
-```shell
-git clone https://github.com/open-telemetry/opentelemetry-demo.git
-```
-
-## Open Folder
-
-- Navigate to the cloned folder:
-
-```shell
-cd opentelemetry-demo/
-```
-
-## Run Docker Compose
-
-- Start the demo:
-
-```shell
-docker compose up --no-build
-```
-
-**Note:** The `--no-build` flag is used to fetch released docker images from
-[ghcr](http://ghcr.io/open-telemetry/demo) instead of building from source.
-Removing the `--no-build` command line option will rebuild all images from
-source. It may take more than 20 minutes to build if the flag is omitted.
-
-## Verify the Webstore & the Telemetry
-
-Once the images are built and containers are started you can access:
-
-- Webstore: <http://localhost:8080/>
-- Grafana: <http://localhost:8080/grafana/>
-- Feature Flags UI: <http://localhost:8080/feature/>
-- Load Generator UI: <http://localhost:8080/loadgen/>
-- Jaeger UI: <http://localhost:8080/jaeger/ui/>
-
-## Bring your own backend
-
-Likely you want to use the Webstore as a demo application for an observability
-backend you already have (e.g. an existing instance of Jaeger, Zipkin, or one
-of the [vendor of your choice](https://opentelemetry.io/vendors/).
-
-OpenTelemetry Collector can be used to export telemetry data to multiple
-backends. By default, the collector in the demo application will merge the
-configuration from two files:
-
-- otelcol-config.yml
-- otelcol-config-extras.yml
-
-To add your backend, open the file
-[src/otelcollector/otelcol-config-extras.yml](../src/otelcollector/otelcol-config-extras.yml)
-with an editor.
-
-- Start by adding a new exporter. For example, if your backend supports
-  OTLP over HTTP, add the following:
-
-```yaml
-exporters:
-  otlphttp/example:
-    endpoint: <your-endpoint-url>
-```
-
-- Then add a new pipeline with your new exporter:
-
-```yaml
-service:
-  pipelines:
-    traces:
-      receivers: [otlp]
-      processors: [batch]
-      exporters: [otlphttp/example]
-```
-
-Vendor backends might require you to add additional parameters for
-authentication, please check their documentation. Some backends require
-different exporters, you may find them and their documentation available at
-[opentelemetry-collector-contrib/exporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter).
-
-After updating the `otelcol-config-extras.yml`, start the demo by running
-`docker compose up`. After a while, you should see the traces flowing into
-your backend as well.

docs/feature_flags.md

@@ -1,10 +0,0 @@
-# Feature Flags
-
-This demo comes with several feature flags which can control failure conditions
-in specific services. By default the flags are disabled. Using the Feature Flags
-UI <http://localhost:8080/feature> you will be able to control the status of these
-feature flags.
-
-| Feature Flag            | Service(s)      | Description                                                               |
-|-------------------------|-----------------|---------------------------------------------------------------------------|
-| `productCatalogFailure` | Product Catalog | Generate an error for `GetProduct` requests with product id: `OLJCESPC7Z` |

docs/forking.md

@@ -1,76 +0,0 @@
-# Forking this Repository
-
-This repository is designed to be forked and used as a tool to show off what you
-are doing with OpenTelemetry.
-
-Setting up a fork or a demo usually only requires overriding some environment
-variables and possibly replacing some container images.
-
-Live demos can be added to the [README](https://github.com/open-telemetry/opentelemetry-demo/blob/main/README.md?plain=1#L186)
-
-## Building Custom Images
-
-Docker Compose uses  `IMAGE_VERSION`  and `IMAGE_NAME` from `.env`  to tag all
-images. Modify these values in order to push or pull custom images from your
-container registry of choice.
-
-## Configuring the Collector
-
-The collector is configured to export traces to jaeger and metrics to prometheus
-in
-[otelcol-config.yml](https://github.com/open-telemetry/opentelemetry-demo/blob/main/src/otelcollector/otelcol-config.yml)
-
-You may wish to make a copy of
-[otelcol-config-extras.yml](https://github.com/open-telemetry/opentelemetry-demo/blob/main/src/otelcollector/otelcol-config-extras.yml)
-for your fork and to modify the relevant volume mounts for the collector in
-[docker-compose.yaml](https://github.com/open-telemetry/opentelemetry-demo/blob/main/docker-compose.yml)
-
-## Configuring the Collector [Helm/Kubernetes]
-
-The [helm
-charts](https://github.com/open-telemetry/opentelemetry-helm-charts/tree/main/charts/opentelemetry-demo)
-allow for easy customization of collector configuration using a custom values
-file:
-
-```yaml
-opentelemetry-collector:
-  config:
-    exporters:
-      otlp:
-        endpoint: "your-otlp-endpoint.com:4317"
-        headers:
-          "x-vendor-api-key": "YOUR_API_KEY"
-    service:
-      pipelines:
-        metrics:
-          exporters:
-            - otlp
-        traces:
-          exporters:
-            - otlp
-            - jaeger
-```
-
-Save this file and pass it into helm:
-
-```shell
-helm install opentelemetry-demo
-open-telemetry/opentelemetry-demo --values opentelemetry-demo-values.yaml
-```
-
-Values provided in this way will be merged with the default values.
-
-## Image Overrides [Helm/Kubernetes]
-
-Each service has a key `imageOverride` which accepts a map of image override
-options, for example:
-
-```yaml
-components:
-  adService:
-    imageOverride:
-      repository: "my-repo"
-      tag: "my-tag"
-      pullSecrets: {}
-      pullPolicy: Always
-```

docs/kubernetes_deployment.md

@@ -1,27 +0,0 @@
-# Kubernetes
-
-We provide a [OpenTelemetry Demo Helm
-chart](https://github.com/open-telemetry/opentelemetry-helm-charts/tree/main/charts/opentelemetry-demo)
-to help deploy the demo to an existing Kubernetes cluster.
-
-[Helm](https://helm.sh) must be installed to use the charts.
-Please refer to Helm's [documentation](https://helm.sh/docs/) to get started.
-
-## Prerequisites
-
-- Pre-existing Kubernetes Cluster
-- Helm 3.0+
-
-## Install the Chart
-
-Add OpenTelemetry Helm repository:
-
-```console
-helm repo add open-telemetry https://open-telemetry.github.io/opentelemetry-helm-charts
-```
-
-To install the chart with the release name my-otel-demo, run the following command:
-
-```console
-helm install my-otel-demo open-telemetry/opentelemetry-demo
-```

docs/manual_span_attributes.md

@@ -1,123 +0,0 @@
-# Manual Span Attributes
-
-This document contains the list of manual Span Attributes used throughout the demo:
-
-## AdService
-
-| Name                        | Type   | Description                           |
-|-----------------------------|--------|---------------------------------------|
-| `app.ads.category`          | string | Category for returned ad              |
-| `app.ads.contextKeys`       | string | Context keys used to find related ads |
-| `app.ads.contextKeys.count` | number | Count of unique context keys used     |
-| `app.ads.count`             | number | Count of ads returned to user         |
-
-## CartService
-
-| Name                   | Type   | Description                    |
-|------------------------|--------|--------------------------------|
-| `app.cart.items.count` | number | Number of unique items in cart |
-| `app.product.id`       | string | Product Id for cart item       |
-| `app.product.quantity` | string | Quantity for cart item         |
-| `app.user.id`          | string | User Id                        |
-
-## CheckoutService
-
-| Name                         | Type   | Description                     |
-|------------------------------|--------|---------------------------------|
-| `app.cart.items.count`       | number | Total number of items in cart   |
-| `app.order.amount`           | number | Order amount                    |
-| `app.order.id`               | string | Order Id                        |
-| `app.order.items.count`      | number | Number of unique items in order |
-| `app.payment.transaction.id` | string | Payment transaction Id          |
-| `app.shipping.amount`        | number | Shipping amount                 |
-| `app.shipping.tracking.id`   | string | Shipping tracking Id            |
-| `app.user.currency`          | string | User currency                   |
-| `app.user.id`                | string | User Id                         |
-
-## CurrencyService
-
-| Name                           | Type   | Description                   |
-|--------------------------------|--------|-------------------------------|
-| `app.currency.conversion.from` | string | Currency code to convert from |
-| `app.currency.conversion.to`   | string | Currency code to convert to   |
-
-## EmailService
-
-| Name                  | Type   | Description                       |
-|-----------------------|--------|-----------------------------------|
-| `app.email.recipient` | string | Email used for order confirmation |
-| `app.order.id`        | string | Order Id                          |
-
-## FeatureFlagService
-
-| Name                          | Type   | Description              |
-|-------------------------------|--------|--------------------------|
-| `app.featureflag.name`        | string | Name of the feature flag |
-| `app.featureflag.description` | string | Admin description        |
-| `app.featureflag.enabled`     | boolean | The feature flag status  |             |
-
-## Frontend
-
-| Name                     | Type   | Description                   |
-|--------------------------|--------|-------------------------------|
-| `app.cart.size`          | number | Total number of items in cart |
-| `app.cart.items.count`   | number | Count of unique items in cart |
-| `app.cart.shipping.cost` | number | Cart shipping cost            |
-| `app.cart.total.price`   | number | Cart total price              |
-| `app.currency`           | string | User currency                 |
-| `app.currency.new`       | string | New currency to set           |
-| `app.order.total`        | number | Order total cost              |
-| `app.product.id`         | string | Product Id                    |
-| `app.product.quantity`   | number | Product quantity              |
-| `app.products.count`     | number | Total products displayed      |
-| `app.request.id`         | string | Request Id                    |
-| `app.session.id`         | string | Session Id                    |
-| `app.user.id`            | string | User Id                       |
-
-## LoadGenerator
-
-| Name     | Type | Description |
-|----------|------|-------------|
-| None yet |      |             |
-
-## PaymentService
-
-| Name                     | Type    | Description                                          |
-|--------------------------|---------|------------------------------------------------------|
-| `app.payment.amount`     | number  | Total payment amount                                 |
-| `app.payment.card_type`  | string  | Type of card used for payment                        |
-| `app.payment.card_valid` | boolean | Was the card used valid                              |
-| `app.payment.charged`    | boolean | Was the charge successful (false with loadgenerator) |
-
-## ProductCatalogService
-
-| Name                        | Type   | Description                           |
-|-----------------------------|--------|---------------------------------------|
-| `app.product.id`            | string | Product Id                            |
-| `app.product.name`          | string | Product name                          |
-| `app.products.count`        | number | Number of products in catalog         |
-| `app.products_search.count` | number | Number of products returned in search |
-
-## QuoteService
-
-| Name                    | Type   | Description          |
-|-------------------------|--------|----------------------|
-| `app.quote.items.count` | number | Total items to ship  |
-| `app.quote.cost.total`  | number | Total shipping quote |
-
-## RecommendationService
-
-| Name                             | Type    | Description                             |
-|----------------------------------|---------|-----------------------------------------|
-| `app.filtered_products.count`    | number  | Number of filtered products returned    |
-| `app.products.count`             | number  | Number of products in catalog           |
-| `app.products_recommended.count` | number  | Number of recommended products returned |
-| `app.cache_hit`                  | boolean | If cache was accessed or not            |
-
-## ShippingService
-
-| Name                       | Type   | Description          |
-|----------------------------|--------|----------------------|
-| `app.shipping.cost.total`  | number | Total shipping cost  |
-| `app.shipping.items.count` | number | Total items to ship  |
-| `app.shipping.tracking.id` | string | Shipping tracking Id |

docs/metric_service_features.md

@@ -1,21 +0,0 @@
-# Metric Feature Coverage by Service
-
-Emoji Legend
-
-- Completed: :100:
-- Not Applicable: :no_bell:
-- Not Present (Yet): :construction:
-
-| Service         | Language        | Auto Instrumentation | Manual Metric Creation | Collector Agent Metric Transformation | Push Metrics   | SLO Metrics    | Multiple Manual Metric Instruments |
-|-----------------|-----------------|----------------------|------------------------|---------------------------------------|----------------|----------------|------------------------------------|
-| Ad              | Java            | :100:                | :construction:         | :construction:                        | :construction: | :construction: | :construction:                     |
-| Cart            | .NET            | :100:                | :construction:         | :construction:                        | :construction: | :construction: | :construction:                     |
-| Checkout        | Go              | :100:                | :construction:         | :construction:                        | :construction: | :construction: | :construction:                     |
-| Currency        | C++             | :no_bell:            | :construction:         | :construction:                        | :construction: | :construction: | :construction:                     |
-| Email           | Ruby            | :construction:       | :construction:         | :construction:                        | :construction: | :construction: | :construction:                     |
-| Feature Flag    | Erlang / Elixir | :construction:       | :construction:         | :construction:                        | :construction: | :construction: | :construction:                     |
-| Frontend        | JavaScript      | :construction:       | :construction:         | :construction:                        | :construction: | :construction: | :construction:                     |
-| Payment         | JavaScript      | :construction:       | :construction:         | :construction:                        | :construction: | :construction: | :construction:                     |
-| Product Catalog | Go              | :construction:       | :construction:         | :construction:                        | :construction: | :construction: | :construction:                     |
-| Recommendation  | Python          | :100:       | :100:                  | :construction:                        | :construction: | :construction: | :construction:                     |
-| Shipping        | Rust            | :construction:       | :construction:         | :construction:                        | :construction: | :construction: | :construction:                     |

docs/requirements/README.md

@@ -1,27 +0,0 @@
-# OpenTelemetry Community Demo Requirements
-
-The following documents capture the Application, OpenTelemetry (OTel), and System
-requirements for our shared demo application. These were decided upon in the
-ongoing SIG meeting.
-
-1. [Application Requirements](./application_requirements.md)
-
-2. [OpenTelemetry Requirements](./opentelemetry_requirements.md)
-
-3. [System Requirements](./system_requirements.md)
-
-## Target Personas
-
-We're building the demo application with several different target personas in mind:
-
-1. **Enthusiasts** at a company that can use the demo app as an individual to
-   advocate for OTel within their organization.
-
-2. **Developers** with specific language skills who want to see a larger picture
-   view.
-
-3. **APM Vendors** who can evaluate OTel in general or need to produce a demo of
-   their OTel capabilities for customers.
-
-4. **Enterprises** considering adopting OTel and interested in understanding
-   what a production-lite experience would be.

docs/requirements/application_requirements.md

@@ -1,28 +0,0 @@
-# Application Requirements
-
-The following requirements were decided upon to define what OpenTelemetry (OTel)
-signals the application will produce & when support for future SDKs should be
-added:
-
-1. Every supported language that has a GA Traces or Metrics SDK must have at
-   least 1 service example.
-
-    * Mobile support (Swift) is not an initial priority and not included in the
-      above requirement.
-
-2. Application processes must be language independent.
-
-    * gRPC is preferred where available and HTTP is to be used where it is not.
-
-3. Services should be architected to be modular components that can be switched out.
-
-    * Individual services can and should be encouraged to have multiple language
-      options available.
-
-4. The architecture must allow for the possible integration of platform generic
-   components like a database, queue, or blob storage.
-
-    * There is no requirement for a particular component type - at least 1 generic
-      component should be present in general.
-
-5. A load generator must be provided to simulate user load against the demo.

docs/requirements/architecture_requirements.md

@@ -1,92 +0,0 @@
-# Demo Architecture
-
-## Summary
-
-The OpenTelemetry Community Demo application is intended to be a 'showcase' for
-OpenTelemetry API, SDK, and tools in a production-lite cloud native
-application. The overall goal of this application is not only to provide a
-canonical 'demo' of OpenTelemetry components, but also to act as a framework for
-further customization by end-users, vendors, and other stakeholders.
-
-### Requirements
-
-- [Application Requirements](./application_requirements.md)
-- [OpenTelemetry Requirements](./opentelemetry_requirements.md)
-- [System Requirements](./system_requirements.md)
-
-### Application Goals
-
-- Provide developers with a robust sample application they can use in learning
-OpenTelemetry instrumentation.
-- Provide observability vendors with a single,
-well-supported, demo platform that they can further customize (or simply use
-OOB).
-- Provide the OpenTelemetry community with a living artifact that
-demonstrates the features and capabilities of OTel APIs, SDKs, and tools.
-- Provide OpenTelemetry maintainers and WGs a platform to demonstrate new
-features/concepts 'in the wild'.
-
-The following is a general description of the logical components of the demo
-application.
-
-## Main Application
-
-The bulk of the demo app is a self-contained
-microservice-based application that does some useful 'real-world' work, such as
-an eCommerce site. This application is composed of multiple services that
-communicate with each other over gRPC and HTTP and runs on Kubernetes (or
-Docker, locally).
-
-Each service shall be instrumented with OpenTelemetry for traces, metrics, and
-logs (as applicable/available).
-
-Each service should be 'swappable' with a service that performs the same
-business logic, implementing the same gRPC endpoints, but written in a different
-language/implementation. For the initial implementation of the demo, we should
-focus on adding as many missing languages as possible by swapping out existing
-services with implementations in un-represented languages. For future versions
-we will look to add more distinct language options per service.
-
-Each service should communicate with a feature flag service in order to
-enable/disable 'faults' that can be used to illustrate how telemetry helps solve
-problems in distributed applications.
-
-A PHP service should be added to the main application as an 'admin service'. A
-Database should be added to enable CRUD functionality on the Product Catalog.
-
-The 'shippingservice' should be reimplemented in Rust.
-
-The 'currencyservice' should be reimplemented in C++.
-
-The 'emailservice' should be reimplemented in Ruby.
-
-For future iterations, the 'frontend' service can be extended with a mobile
-application written in Swift.
-
-## Feature Flag Component
-
-This component should consist of one (or more) services
-that provides a simple feature flag configuration utility for the main
-application. It is made up of a browser-based client/admin interface and a
-backend service or services. The role of the client is to allow an operator to
-visualize the available feature flags and toggle their state. The server should
-provide a catalog of feature flags that main application services can register
-with and interrogate for their current status and targeting rules.
-
-The feature flag component should be implemented as an Erlang+Elixir/Phoenix
-service. The catalog of feature flags should be stored in a Database.
-
-## Orchestration and Deployment
-
-All services should run on Kubernetes. The
-OpenTelemetry Collector should be deployed via the OpenTelemetry Operator, and
-run in a sidecar + gateway mode. Telemetry from each pod should be routed from
-agents to a gateway, and the gateway should export telemetry by default to an
-open-source trace + metrics visualizer.
-
-For local/non-kubernetes deployment, the Collector should be deployed via
-compose file and monitor not only traces/metrics from applications, but also the
-docker containers via dockerstatsreceiver.
-
-A design goal of this project is to include a CI/CD pipeline for self-deployment
-into cloud environments. This could be skipped for local development.

docs/requirements/opentelemetry_requirements.md

@@ -1,24 +0,0 @@
-# OpenTelemetry Requirements
-
-The following requirements were decided upon to define what OpenTelemetry (OTel)
-signals the application will produce & when support for future SDKs should be
-added:
-
-1. The demo must produce OTel logs, traces, & metrics out of the box for
-   languages that have a GA SDK.
-
-2. Languages that have a Beta SDK available may be included but are not required
-   like GA SDKs.
-
-3. Native OTel metrics should be produced where possible.
-
-4. Both manual instrumentation and instrumentation libraries
-   (auto-instrumentation) should be demonstrated in each language.
-
-5. All data should be exported to the Collector first.
-
-6. The Collector must be configurable to allow for a variety of consumption
-   experiences but default tools must be selected for each signal.
-
-7. The demo application architecture using the Collector should be designed to
-   be a best practices reference architecture.

docs/requirements/system_requirements.md

@@ -1,10 +0,0 @@
-# System Requirements
-
-To ensure the demo runs correctly please ensure your environment meets the
-following system requirements:
-
-1. Your system must meet [Docker Desktop](https://docs.docker.com/desktop)
-   system requirements or you should use your preferred Cloud Service.
-
-2. The demo must be able to work on the following Operating Systems (OS):
-   Linux, macOS and Windows with documentation provided for each OS.

docs/service_table.md

@@ -1,19 +0,0 @@
-# Service Roles
-
-View [Service Graph](./current_architecture.md) to visualize request flows.
-
-| Service                                                      | Language      | Description                                                                                                                                  |
-|--------------------------------------------------------------|---------------|----------------------------------------------------------------------------------------------------------------------------------------------|
-| [adservice](./services/adservice.md)                         | Java          | Provides text ads based on given context words.                                                                                              |
-| [cartservice](./services/cartservice.md)                     | DotNet        | Stores the items in the user's shopping cart in Redis and retrieves it.                                                                      |
-| [checkoutservice](./services/checkoutservice.md)             | Go            | Retrieves user cart, prepares order and orchestrates the payment, shipping and the email notification.                                       |
-| [currencyservice](../src/currencyservice/README.md)          | C++           | Converts one money amount to another currency. Uses real values fetched from European Central Bank. It's the highest QPS service.            |
-| [emailservice](./services/emailservice.md)                   | Ruby          | Sends users an order confirmation email (mock).                                                                                              |
-| [featureflagservice](./services/featureflagservice.md)       | Erlang/Elixir | CRUD feature flag service to demonstrate various scenarios like fault injection & how to emit telemetry from a feature flag reliant service. |
-| [frontend](./services/frontend.md)                           | JavaScript    | Exposes an HTTP server to serve the website. Does not require signup/login and generates session IDs for all users automatically.            |
-| [loadgenerator](./services/loadgenerator.md)                 | Python/Locust | Continuously sends requests imitating realistic user shopping flows to the frontend.                                                         |
-| [paymentservice](./services/paymentservice.md)               | JavaScript    | Charges the given credit card info (mock) with the given amount and returns a transaction ID.                                                |
-| [productcatalogservice](./services/productcatalogservice.md) | Go            | Provides the list of products from a JSON file and ability to search products and get individual products.                                   |
-| [quoteservice](./services/quoteservice.md)                   | PHP           | Calculates the shipping costs, based on the number of items to be shipped.                                                                   |
-| [recommendationservice](./services/recommendationservice.md) | Python        | Recommends other products based on what's given in the cart.                                                                                 |
-| [shippingservice](./services/shippingservice.md)             | Rust          | Gives shipping cost estimates based on the shopping cart. Ships items to the given address (mock).                                           |

docs/services/adservice.md

@@ -1,93 +0,0 @@
-# Ad Service
-
-This service determines appropriate ads to serve to users based on context
-keys. The ads will be for products available in the store.
-
-[Ad service source](../../src/adservice/)
-
-## Auto-instrumentation
-
-This Java based service, makes use of the OpenTelemetry Java agent to accomplish
-auto-instrumention, by leveraging the `-javaagent` command line argument when
-starting the service. This service adds the command line option as part of the
-`JAVA_TOOL_OPTIONS` environment variable definition in the service's
-`Dockerfile`. This environment variable is leveraged as part of the service's
-gradle generated startup script.
-
-```dockerfile
-ENV JAVA_TOOL_OPTIONS=-javaagent:/app/opentelemetry-javaagent.jar
-```
-
-## Traces
-
-### Add attributes to auto-instrumented spans
-
-Within the execution of auto-instrumented code you can get current span from
-context.
-
-```java
-    Span span = Span.current();
-```
-
-Adding attributes to a span is accomplished using `setAttribute` on the span
-object. In the `getAds` function multiples attribute are added to the span.
-
-```java
-    span.setAttribute("app.ads.contextKeys", req.getContextKeysList().toString());
-    span.setAttribute("app.ads.contextKeys.count", req.getContextKeysCount());
-```
-
-### Add span events
-
-Adding an event to a span is accomplished using `addEvent` on the span object.
-In the `getAds` function an event with an attribute is added when an exception
-is caught.
-
-```java
-    span.addEvent("Error", Attributes.of(AttributeKey.stringKey("exception.message"), e.getMessage()));
-```
-
-### Setting span status
-
-If the result of the operation is an error, the span status is should be set
-accordingly using `setStatus` on the span object. In the `getAds` function the
-span status is set when an exception is caught.
-
-```java
-    span.setStatus(StatusCode.ERROR);
-```
-
-### Create new spans
-
-New spans can be created and started using
-`Tracer.spanBuilder("spanName").startSpan()`. Newly created spans should be set
-into context using `Span.makeCurrent()`. The `getRandomAds` function will
-create a new span, set it into context, perform an operation, and finally end
-the span.
-
-```java
-    // create and start a new span manually
-    Tracer tracer = GlobalOpenTelemetry.getTracer("adservice");
-    Span span = tracer.spanBuilder("getRandomAds").startSpan();
-
-    // put the span into context, so if any child span is started the parent will be set properly
-    try (Scope ignored = span.makeCurrent()) {
-
-      Collection<Ad> allAds = adsMap.values();
-      for (int i = 0; i < MAX_ADS_TO_SERVE; i++) {
-        ads.add(Iterables.get(allAds, random.nextInt(allAds.size())));
-      }
-      span.setAttribute("app.ads.count", ads.size());
-
-    } finally {
-      span.end();
-    }
-```
-
-## Metrics
-
-TBD
-
-## Logs
-
-TBD

docs/services/cartservice.md

@@ -1,82 +0,0 @@
-# Cart Service
-
-This service maintains items placed in the shopping cart by users. It interacts
-with a Redis caching service for fast access to shopping cart data.
-
-[Cart service source](../../src/cartservice/)
-
-## Traces
-
-### Initialize TracerProvider
-
-`TracerProvider` is initialized in the application startup. The required
-instrumentation libraries, the exporter to use (OTLP), etc. are enabled as part
-of this initialization. Resource attributes and exporter endpoint are
-automatically read from OpenTelemetry standard environment variables.
-
-```cs
-services.AddOpenTelemetryTracing((builder) => builder
-    .ConfigureResource(r => r.AddTelemetrySdk())
-    .AddRedisInstrumentation(
-        cartStore.GetConnection(),
-        options => options.SetVerboseDatabaseStatements = true)
-    .AddAspNetCoreInstrumentation()
-    .AddGrpcClientInstrumentation()
-    .AddHttpClientInstrumentation()
-    .AddOtlpExporter());
-```
-
-Note:
-OpenTelemetry Tracing in .NET leverages the existing `Activity` class to
-represent OpenTelemetry Span.
-
-### Add attributes to auto-instrumented spans
-
-Within the execution of auto-instrumented code you can get current span
-(activity) from context.
-
-```cs
-    var activity = Activity.Current;
-```
-
-Adding attributes (tags in .NET) to a span (activity) is accomplished using
-`SetTag` on the activity object. In the `AddItem` function from
-`services/CartService.cs` several attributes are added to the auto-instrumented
-span.
-
-```cs
-    activity?.SetTag("app.user.id", request.UserId);
-    activity?.SetTag("app.product.quantity", request.Item.Quantity);
-    activity?.SetTag("app.product.id", request.Item.ProductId);
-```
-
-### Add span events
-
-Adding span (activity) events is accomplished using `AddEvent` on the activity
-object. In the `GetCart` function from `services/CartService.cs` a span event is
-added.
-
-```cs
-    activity?.AddEvent(new("Fetch cart"));
-```
-
-## Metrics
-
-### Initialize MeterProvider
-
-`MeterProvider` is initialized in the application startup. The required
-instrumentation libraries, the exporter to use (OTLP), etc. are enabled as part
-of this initialization. Resource attributes and exporter endpoint are
-automatically read from OpenTelemetry standard environment variables.
-
-```cs
-services.AddOpenTelemetryMetrics(builder => builder
-    .ConfigureResource(r => r.AddTelemetrySdk())
-    .AddRuntimeInstrumentation()
-    .AddAspNetCoreInstrumentation()
-    .AddOtlpExporter());
-```
-
-## Logs
-
-TBD

docs/services/checkoutservice.md

@@ -1,158 +0,0 @@
-# Checkout Service
-
-This service is responsible to process a checkout order from the user. The
-checkout service will call many other services in order to process an order.
-
-[Checkout service source](../../src/checkoutservice/)
-
-## Traces
-
-### Initialize tracer provider
-
-The OpenTelemetry SDK is initialized from `main` using the `initTracerProvider`
-function.
-
-```go
-func initTracerProvider() *sdktrace.TracerProvider {
-    ctx := context.Background()
-
-    exporter, err := otlptracegrpc.New(ctx)
-    if err != nil {
-        log.Fatal(err)
-    }
-    tp := sdktrace.NewTracerProvider(
-        sdktrace.WithBatcher(exporter),
-    )
-    otel.SetTracerProvider(tp)
-    otel.SetTextMapPropagator(propagation.NewCompositeTextMapPropagator(propagation.TraceContext{}, propagation.Baggage{}))
-    return tp
-}
-```
-
-You should call `TracerProvider.Shutdown()` when your service is shutdown to
-ensure all spans are exported. This service makes that call as part of a
-deferred function in main
-
-```go
-    tp := initTracerProvider()
-    defer func() {
-        if err := tp.Shutdown(context.Background()); err != nil {
-            log.Printf("Error shutting down tracer provider: %v", err)
-        }
-    }()
-```
-
-### Adding gRPC auto-instrumentation
-
-This service receives gRPC requests, which are instrumented in the main function
-as part of the gRPC server creation.
-
-```go
-    var srv = grpc.NewServer(
-        grpc.UnaryInterceptor(otelgrpc.UnaryServerInterceptor()),
-        grpc.StreamInterceptor(otelgrpc.StreamServerInterceptor()),
-    )
-```
-
-This service will issue several outgoing gRPC calls, which are all instrumented
-by wrapping the gRPC client with instrumentation
-
-```go
-func createClient(ctx context.Context, svcAddr string) (*grpc.ClientConn, error) {
-    return grpc.DialContext(ctx, svcAddr,
-        grpc.WithTransportCredentials(insecure.NewCredentials()),
-        grpc.WithUnaryInterceptor(otelgrpc.UnaryClientInterceptor()),
-        grpc.WithStreamInterceptor(otelgrpc.StreamClientInterceptor()),
-    )
-}
-```
-
-### Add attributes to auto-instrumented spans
-
-Within the execution of auto-instrumented code you can get current span from
-context.
-
-```go
-    span := trace.SpanFromContext(ctx)
-```
-
-Adding attributes to a span is accomplished using `SetAttributes` on the span
-object. In the `PlaceOrder` function several attributes are added to the span.
-
-```go
-    span.SetAttributes(
-        attribute.String("app.order.id", orderID.String()), shippingTrackingAttribute,
-        attribute.Float64("app.shipping.amount", shippingCostFloat),
-        attribute.Float64("app.order.amount", totalPriceFloat),
-        attribute.Int("app.order.items.count", len(prep.orderItems)),
-    )
-```
-
-### Add span events
-
-Adding span events is accomplished using `AddEvent` on the span object. In the
-`PlaceOrder` function several span events are added. Some events have
-additional attributes, others do not.
-
-Adding a span event without attributes:
-
-```go
-    span.AddEvent("prepared")
-```
-
-Adding a span event with additional attributes:
-
-```go
-    span.AddEvent("charged",
-        trace.WithAttributes(attribute.String("app.payment.transaction.id", txID)))
-```
-
-## Metrics
-
-### Initialize meter provider
-
-The OpenTelemetry SDK is initialized from `main` using the `initMeterProvider`
-function.
-
-```go
-func initMeterProvider() *sdkmetric.MeterProvider {
-    ctx := context.Background()
-
-    exporter, err := otlpmetricgrpc.New(ctx)
-    if err != nil {
-        log.Fatalf("new otlp metric grpc exporter failed: %v", err)
-    }
-
-    mp := sdkmetric.NewMeterProvider(sdkmetric.WithReader(sdkmetric.NewPeriodicReader(exporter)))
-    global.SetMeterProvider(mp)
-    return mp
-}
-```
-
-You should call `MeterProvider.Shutdown()` when your service is shutdown to
-ensure all records are exported. This service makes that call as part of a
-deferred function in main
-
-```go
-    mp := initMeterProvider()
-    defer func() {
-        if err := mp.Shutdown(context.Background()); err != nil {
-            log.Printf("Error shutting down meter provider: %v", err)
-        }
-    }()
-```
-
-### Adding golang runtime auto-instrumentation
-
-Golang runtime are instrumented in the main function
-
-```go
-    err := runtime.Start(runtime.WithMinimumReadMemStatsInterval(time.Second))
-    if err != nil {
-        log.Fatal(err)
-    }
-```
-
-## Logs
-
-TBD

docs/services/emailservice.md

@@ -1,76 +0,0 @@
-# Email Service
-
-This service will send a confirmation email to the user when an order is placed.
-
-[Email service source](../../src/emailservice/)
-
-## Initialize SDK
-
-You will need to require the core OpenTelemetry SDK and exporter Ruby gems, as
-well as any gem that will be needed for auto-instrumentation libraries
-(ie: Sinatra)
-
-```ruby
-require "opentelemetry/sdk"
-require "opentelemetry/exporter/otlp"
-require "opentelemetry/instrumentation/sinatra"
-```
-
-The Ruby SDK uses OpenTelemetry standard environment variables to configure
-OTLP export, resource attributes, and service name automatically. When
-initializing the OpenTelemetry SDK, you will also specify which
-auto-instrumentation libraries to leverage (ie: Sinatra)
-
-```ruby
-OpenTelemetry::SDK.configure do |c|
-  c.use "OpenTelemetry::Instrumentation::Sinatra"
-end
-```
-
-## Traces
-
-### Add attributes to auto-instrumented spans
-
-Within the execution of auto-instrumented code you can get current span from
-context.
-
-```ruby
-  current_span = OpenTelemetry::Trace.current_span
-```
-
-Adding multiple attributes to a span is accomplished using `add_attributes` on
-the span object.
-
-```ruby
-  current_span.add_attributes({
-    "app.order.id" => data.order.order_id,
-  })
-```
-
-Adding only a single attribute can be accomplished using `set_attribute` on the
-span object.
-
-```ruby
-    span.set_attribute("app.email.recipient", data.email)
-```
-
-### Create new spans
-
-New spans can be created and placed into active context using `in_span` from an
-OpenTelemetry Tracer object. When used in conjunction with a `do..end` block,
-the span will automatically be ended when the block ends execution.
-
-```ruby
-  tracer = OpenTelemetry.tracer_provider.tracer('emailservice')
-  tracer.in_span("send_email") do |span|
-    # logic in context of span here
-  end
-```
-
-## Metrics
-
-TBD
-
-## Logs
-
-TBD

docs/services/featureflagservice.md

@@ -1,110 +0,0 @@
-# Feature Flag Service
-
-This service is written in Erlang/Elixir and it is responsible for creating,
-reading, updating and deleting feature flags in a PostgreSQL DB.
-It is called by Product Catalog and Shipping services.
-
-[Feature Flag Service Source](../../src/featureflagservice/)
-
-## Traces
-
-### Initialize OpenTelemetry Phoenix instrumentation
-
-Traces of interaction with the web interface are provided by the OpenTelemetry
-[Phoenix
-instrumentation](https://github.com/open-telemetry/opentelemetry-erlang-contrib/tree/main/instrumentation/opentelemetry_phoenix)
-with Spans for database queries added through the [Ecto
-instrumentation](https://github.com/open-telemetry/opentelemetry-erlang-contrib/tree/main/instrumentation/opentelemetry_ecto).
-
-This is done in the `application.ex` as follows:
-
-```elixir
-@impl true
-  def start(_type, _args) do
-    OpentelemetryEcto.setup([:featureflagservice, :repo])
-    OpentelemetryPhoenix.setup()
-
-    children = [
-      # Start the Ecto repository
-      Featureflagservice.Repo,
-      # Start the PubSub system
-      {Phoenix.PubSub, name: Featureflagservice.PubSub},
-      # Start the Endpoint (http/https)
-      FeatureflagserviceWeb.Endpoint
-      # Start a worker by calling: Featureflagservice.Worker.start_link(arg)
-      # {Featureflagservice.Worker, arg}
-    ]
-
-    # See https://hexdocs.pm/elixir/Supervisor.html
-    # for other strategies and supported options
-    opts = [strategy: :one_for_one, name: Featureflagservice.Supervisor]
-    Supervisor.start_link(children, opts)
-  end
-```
-
-### Add gRPC instrumentation
-
-The GRPC service uses [grpcbox](https://github.com/tsloughter/grpcbox) and uses
-the [grpcbox
-interceptor](https://github.com/open-telemetry/opentelemetry-erlang-contrib/tree/main/instrumentation/opentelemetry_grpcbox)
-for instrumentation.
-
-This is configured in the `runtime.exs` file, as follows:
-
-```elixir
-config :grpcbox,
-  servers: [
-    %{
-      :grpc_opts => %{
-        :service_protos => [:ffs_demo_pb],
-        :unary_interceptor => {:otel_grpcbox_interceptor, :unary},
-        :services => %{:"hipstershop.FeatureFlagService" => :ffs_service}
-      },
-      :listen_opts => %{:port => grpc_port}
-    }
-  ]
-```
-
-### Add attributes to auto-instrumented spans
-
-Adding attributes to a span is accomplished by using `?set_attribute` on the span
-object. In the `get_flag` function two attributes are added to the span.
-
-```elixir
--include_lib("grpcbox/include/grpcbox.hrl").
-
--include_lib("opentelemetry_api/include/otel_tracer.hrl").
-
--spec get_flag(ctx:t(), ffs_demo_pb:get_flag_request()) ->
-    {ok, ffs_demo_pb:get_flag_response(), ctx:t()} | grpcbox_stream:grpc_error_response().
-get_flag(Ctx, #{name := Name}) ->
-    case 'Elixir.Featureflagservice.FeatureFlags':get_feature_flag_by_name(Name) of
-        nil ->
-            {grpc_error, {?GRPC_STATUS_NOT_FOUND, <<"the requested feature flag does not exist">>}};
-        #{'__struct__' := 'Elixir.Featureflagservice.FeatureFlags.FeatureFlag',
-          description := Description,
-          enabled := Enabled,
-          inserted_at := CreatedAt,
-          updated_at := UpdatedAt
-         } ->
-            ?set_attribute('app.featureflag.name', Name),
-            ?set_attribute('app.featureflag.enabled', Enabled),
-            {ok, Epoch} = 'Elixir.NaiveDateTime':from_erl({{1970, 1, 1}, {0, 0, 0}}),
-            CreatedAtSeconds = 'Elixir.NaiveDateTime':diff(CreatedAt, Epoch),
-            UpdatedAtSeconds = 'Elixir.NaiveDateTime':diff(UpdatedAt, Epoch),
-            Flag = #{name => Name,
-                     description => Description,
-                     enabled => Enabled,
-                     created_at => #{seconds => CreatedAtSeconds, nanos => 0},
-                     updated_at => #{seconds => UpdatedAtSeconds, nanos => 0}},
-            {ok, #{flag => Flag}, Ctx}
-    end.
-```
-
-## Metrics
-
-TBD
-
-## Logs
-
-TBD

docs/services/frontend.md

@@ -1,174 +0,0 @@
-# Frontend
-
-The frontend is responsible to provide a UI for users, as well
-as an API leveraged by the UI or other clients. The application is based on
-[Next.JS](https://nextjs.org/) to provide a React web-based UI and API routes.
-
-[Front End source](../../src/frontend/)
-
-## SDK initialization
-
-It is recommended to use a Node required module when starting your NodeJS
-application to initialize the SDK and auto-instrumentation. When initializing
-the OpenTelemetry NodeJS SDK, you optionally specify which auto-instrumentation
-libraries to leverage, or make use of the `getNodeAutoInstrumentations()`
-function which includes most popular frameworks. The `utils/telemetry/Instrumentation.js`
-file contains all code required to initialize the SDK and auto-instrumentation
-based on standard [OpenTelemetry environment variables](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/sdk-environment-variables.md)
-for OTLP export, resource attributes, and service name.
-
-```javascript
-const opentelemetry = require("@opentelemetry/sdk-node")
-const { getNodeAutoInstrumentations } = require("@opentelemetry/auto-instrumentations-node")
-const { OTLPTraceExporter } =  require('@opentelemetry/exporter-trace-otlp-grpc')
-
-const sdk = new opentelemetry.NodeSDK({
-  traceExporter: new OTLPTraceExporter(),
-  instrumentations: [ getNodeAutoInstrumentations() ]
-})
-
-sdk.start()
-```
-
-Node required modules are loaded using the `--require` command line argument.
-This can be done in the `scripts.start` section of `package.json` and starting
-the application using `npm start`.
-
-```json
-  "scripts": {
-    "start": "node --require ./Instrumentation.js server.js",
-  },
-```
-
-## Traces
-
-### Span Exceptions and status
-
-You can use the span object's `recordException` function to create a span event
-with the full stack trace of a handled error. When recording an exception also
-be sure to set the span's status accordingly. You can see this in the catch
-block of the `NextApiHandler` function in the `utils/telemetry/InstrumentationMiddleware.ts`
-file.
-
-```typescript
-    span.recordException(error as Exception);
-    span.setStatus({code: SpanStatusCode.ERROR});
-```
-
-### Create new spans
-
-New spans can be created and started using `Tracer.startSpan("spanName", options)`.
-Several options can be used to specify how the span can be created.
-
-- `root: true` will create a new trace, setting this span as the root.
-- `links` are used to specify links to other spans (even within another trace)
-that should be referenced.
-- `attributes` are key/value pairs added to a span, typically used for
-application context.
-
-```typescript
-    span = tracer.startSpan(`HTTP ${method}`, {
-        root: true,
-        kind: SpanKind.SERVER,
-        links: [{context: syntheticSpan.spanContext()}],
-        attributes: {
-            "app.synthetic_request": true,
-            [SemanticAttributes.HTTP_TARGET]: target,
-            [SemanticAttributes.HTTP_STATUS_CODE]: response.statusCode,
-            [SemanticAttributes.HTTP_ROUTE]: url,
-            [SemanticAttributes.HTTP_METHOD]: method,
-            [SemanticAttributes.HTTP_USER_AGENT]: headers['user-agent'] || '',
-            [SemanticAttributes.HTTP_URL]: `${headers.host}${url}`,
-            [SemanticAttributes.HTTP_FLAVOR]: httpVersion,
-        }
-    });
-```
-
-## Browser Instrumentation
-
-The web-based UI that the frontend provides is also instrumented for web
-browsers. OpenTelemetry instrumentation is included as part of the Next.js App
-component in `pages/_app.tsx`. Here instrumentation is imported and
-initialized.
-
-```typescript
-import FrontendTracer from '../utils/telemetry/FrontendTracer';
-
-if (typeof window !== 'undefined') FrontendTracer();
-```
-
-The `utils/telemetry/FrontendTracer.ts` file contains code to intialize a
-TracerProvider, establish an OTLP export, register trace context propagators,
-and register web specific auto-instrumentation libraries. Since the browser
-will send data to an OpenTelemetry collector that will likely be on a separate
-domain, CORS headers are also setup accordingly.
-
-```typescript
-import { CompositePropagator, W3CBaggagePropagator, W3CTraceContextPropagator } from '@opentelemetry/core';
-import { WebTracerProvider } from '@opentelemetry/sdk-trace-web';
-import { SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base';
-import { registerInstrumentations } from '@opentelemetry/instrumentation';
-import { getWebAutoInstrumentations } from '@opentelemetry/auto-instrumentations-web';
-import { Resource } from '@opentelemetry/resources';
-import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
-import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
-
-const FrontendTracer = async () => {
-  const { ZoneContextManager } = await import('@opentelemetry/context-zone');
-
-  const provider = new WebTracerProvider({
-    resource: new Resource({
-      [SemanticResourceAttributes.SERVICE_NAME]: process.env.NEXT_PUBLIC_OTEL_SERVICE_NAME,
-    }),
-  });
-
-  provider.addSpanProcessor(new SimpleSpanProcessor(new OTLPTraceExporter()));
-
-  const contextManager = new ZoneContextManager();
-
-  provider.register({
-    contextManager,
-    propagator: new CompositePropagator({
-      propagators: [new W3CBaggagePropagator(), new W3CTraceContextPropagator()],
-    }),
-  });
-
-  registerInstrumentations({
-    tracerProvider: provider,
-    instrumentations: [
-      getWebAutoInstrumentations({
-        '@opentelemetry/instrumentation-fetch': {
-          propagateTraceHeaderCorsUrls: /.*/,
-          clearTimingResources: true,
-        },
-      }),
-    ],
-  });
-};
-
-export default FrontendTracer;
-```
-
-## Metrics
-
-TBD
-
-## Logs
-
-TBD
-
-## Baggage
-
-OpenTelemetry Baggage is leveraged in the frontend to check if the request is
-synthetic (from the load generator). Synthetic requests will force the creation
-of a new trace. The root span from the new trace will contain many of the same
-attributes as an HTTP request instrumented span.
-
-To determine if a Baggage item is set, you can leverage the `propagation` API
-to parse the Baggage header, and leverage the `baggage` API to get or
-set entries.
-
-```typescript
-    const baggage = propagation.getBaggage(context.active());
-    if (baggage?.getEntry("synthetic_request")?.value == "true") {...}
-```

docs/services/loadgenerator.md

@@ -1,65 +0,0 @@
-# Load Generator
-
-The load generator is based on the Python load testing framework [Locust](https://locust.io).
-By default it will simulate users requesting several different routes from the
-frontend.
-
-[Load generator source](../../src/loadgenerator/)
-
-## Traces
-
-### Initialize tracer provider
-
-Since this service is a [locustfile](https://docs.locust.io/en/stable/writing-a-locustfile.html),
-the The OpenTelemetry SDK is initialized after the import statements. This code
-will create a tracer provider, and establish a Span Processor to use. Export
-endpoints, resource attributes, and service name are automatically set using
-[OpenTelemetry environment variables](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/sdk-environment-variables.md).
-
-```python
-tracer_provider = TracerProvider()
-trace.set_tracer_provider(tracer_provider)
-tracer_provider.add_span_processor(BatchSpanProcessor(OTLPSpanExporter()))
-```
-
-### Adding instrumentation libraries
-
-To add instrumentation libraries you need to import the Instrumentors for each
-library in your Python code. Locust uses the `Requests` and`URLLib3` libraries,
-so we will import their Instrumentors.
-
-```python
-from opentelemetry.instrumentation.requests import RequestsInstrumentor
-from opentelemetry.instrumentation.urllib3 import URLLib3Instrumentor
-```
-
-In your code before the library is leveraged, the Instrumentor needs to be
-initialized by calling `instrument()`.
-
-```python
-RequestsInstrumentor().instrument()
-URLLib3Instrumentor().instrument()
-```
-
-Once initialized, every Locust requests for this load generator will have their
-own trace with a span for each of the `Requests` and `URLLib3` libraries.
-
-## Metrics
-
-TBD
-
-## Logs
-
-TBD
-
-## Baggage
-
-OpenTelemetry Baggage is used by the load generator to indicate that the traces
-are synthetically generated. This is done in the `on_start` function by creating
-a context object containing the baggage item, and associating that context for
-all tasks by the load generator.
-
-```python
-    ctx = baggage.set_baggage("synthetic_request", "true")
-    context.attach(ctx)
-```

docs/services/paymentservice.md

@@ -1,96 +0,0 @@
-# Payment Service
-
-This service is responsible to process credit card payments for orders. It will
-return an error if the credit card is invalid or the payment can not be
-processed.
-
-[Payment service source](../../src/paymentservice/)
-
-## SDK initialization
-
-It is recommended to use a Node required module when starting your NodeJS
-application to initialize the SDK and auto-instrumentation. When initializing
-the OpenTelemetry NodeJS SDK, you optionally specify which auto-instrumentation
-libraries to leverage, or make use of the `getNodeAutoInstrumentations()`
-function which includes most popular frameworks. The `tracing.js` contains all
-code required to initialize the SDK and auto-instrumentation based on standard
-OpenTelemetry environment variables for OTLP export, resource attributes, and
-service name.
-
-```javascript
-const opentelemetry = require("@opentelemetry/sdk-node")
-const { getNodeAutoInstrumentations } = require("@opentelemetry/auto-instrumentations-node")
-const { OTLPTraceExporter } =  require('@opentelemetry/exporter-trace-otlp-grpc')
-
-const sdk = new opentelemetry.NodeSDK({
-  traceExporter: new OTLPTraceExporter(),
-  instrumentations: [ getNodeAutoInstrumentations() ]
-})
-
-sdk.start()
-```
-
-Node required modules are loaded using the `--require` command line argument.
-This can be done in the `ENTRYPOINT` command for the service's `Dockerfile`.
-
-```dockerfile
-ENTRYPOINT [ "node", "--require", "./tracing.js", "./index.js" ]
-```
-
-## Traces
-
-### Add attributes to auto-instrumented spans
-
-Within the execution of auto-instrumented code you can get current span from
-context.
-
-```javascript
-  const span = opentelemetry.trace.getActiveSpan();
-```
-
-Adding attributes to a span is accomplished using `setAttributes` on the span
-object. In the `chargeServiceHandler` function an attributes is added to
-the span as an anonymous object (map) for the attribute key/values pair.
-
-```javascript
-    span.setAttributes({
-      'app.payment.amount': parseFloat(`${amount.units}.${amount.nanos}`)
-    })
-```
-
-### Span Exceptions and status
-
-You can use the span object's `recordException` function to create a span event
-with the full stack trace of a handled error. When recording an exception also
-be sure to set the span's status accordingly. You can see this in the
-`chargeServiceHandler` function
-
-```javascript
-    span.recordException(err)
-    span.setStatus({ code: opentelemetry.SpanStatusCode.ERROR })
-```
-
-## Metrics
-
-TBD
-
-## Logs
-
-TBD
-
-## Baggage
-
-OpenTelemetry Baggage is leveraged in this service to check if the request is
-synthetic (from the load generator). Synthetic requests will not be charged,
-which is indicated with a span attribute. The `charge.js` file which does the
-actual payment processing, has logic to check the baggage.
-
-```javascript
-  // check baggage for synthetic_request=true, and add charged attribute accordingly
-  const baggage = propagation.getBaggage(context.active());
-  if (baggage && baggage.getEntry("synthetic_request") && baggage.getEntry("synthetic_request").value == "true") {
-    span.setAttribute('app.payment.charged', false);
-  } else {
-    span.setAttribute('app.payment.charged', true);
-  }
-```

docs/services/productcatalogservice.md

@@ -1,115 +0,0 @@
-# Product Catalog Service
-
-This service is responsible to return information about products. The service
-can be used to get all products, search for specific products, or return details
-about any single product.
-
-[Product Catalog service source](../../src/productcatalogservice/)
-
-## Traces
-
-### Initialize tracer provider
-
-The OpenTelemetry SDK is initialized from `main` using the `initTracerProvider`
-function.
-
-```go
-func initTracerProvider() *sdktrace.TracerProvider {
-    ctx := context.Background()
-
-    exporter, err := otlptracegrpc.New(ctx)
-    if err != nil {
-        log.Fatalf("OTLP Trace gRPC Creation: %v", err)
-    }
-    tp := sdktrace.NewTracerProvider(sdktrace.WithBatcher(exporter))
-    otel.SetTracerProvider(tp)
-    otel.SetTextMapPropagator(propagation.NewCompositeTextMapPropagator(propagation.TraceContext{}, propagation.Baggage{}))
-    return tp
-}
-```
-
-You should call `TracerProvider.Shutdown()` when your service is shutdown to
-ensure all spans are exported. This service makes that call as part of a
-deferred function in main
-
-```go
-    tp := InitTracerProvider()
-    defer func() {
-        if err := tp.Shutdown(context.Background()); err != nil {
-            log.Fatalf("Tracer Provider Shutdown: %v", err)
-        }
-    }()
-```
-
-### Adding gRPC auto-instrumentation
-
-This service receives gRPC requests, which are instrumented in the main function
-as part of the gRPC server creation.
-
-```go
-    srv := grpc.NewServer(
-        grpc.UnaryInterceptor(otelgrpc.UnaryServerInterceptor()),
-        grpc.StreamInterceptor(otelgrpc.StreamServerInterceptor()),
-    )
-```
-
-This service will issue outgoing gRPC calls, which are all instrumented by
-wrapping the gRPC client with instrumentation
-
-```go
-func createClient(ctx context.Context, svcAddr string) (*grpc.ClientConn, error) {
-    return grpc.DialContext(ctx, svcAddr,
-        grpc.WithTransportCredentials(insecure.NewCredentials()),
-        grpc.WithUnaryInterceptor(otelgrpc.UnaryClientInterceptor()),
-        grpc.WithStreamInterceptor(otelgrpc.StreamClientInterceptor()),
-    )
-}
-```
-
-### Add attributes to auto-instrumented spans
-
-Within the execution of auto-instrumented code you can get current span from
-context.
-
-```go
-    span := trace.SpanFromContext(ctx)
-```
-
-Adding attributes to a span is accomplished using `SetAttributes` on the span
-object. In the `GetProduct` function an attribute for the product id is added
-to the span.
-
-```go
-    span.SetAttributes(
-        attribute.String("app.product.id", req.Id),
-    )
-```
-
-### Setting span status
-
-This service can catch and handle an error condition based on a feature flag.
-In an error condition, the span status is set accordingly using `SetStatus` on
-the span object. You can see this in the `GetProduct` function.
-
-```go
-    msg := fmt.Sprintf("Error: ProductCatalogService Fail Feature Flag Enabled")
-    span.SetStatus(otelcodes.Error, msg)
-```
-
-### Add span events
-
-Adding span events is accomplished using `AddEvent` on the span object. In the
-`GetProduct` function a span event is added when an error condition is handled,
-or when a product is successfully found.
-
-```go
-    span.AddEvent(msg)
-```
-
-## Metrics
-
-TBD
-
-## Logs
-
-TBD

docs/services/quoteservice.md

@@ -1,112 +0,0 @@
-# Quote Service
-
-This service is responsible for calculating shipping costs, based on
-the number of items to be shipped. The quote service is called from
-Shipping Service via HTTP.
-
-The Quote Service is implemented using the Slim framework and
-php-di for managing the Dependency Injection.
-
-The PHP instrumentation may vary when using a different framework.
-
-[Quote service source](../../src/quoteservice/)
-
-## Traces
-
-### Initialize tracer provider
-
-The OpenTelemetry SDK is initialized from `index`.
-
-```php
-    $tracerProvider = (new TracerProviderFactory('quoteservice'))->create();
-    ShutdownHandler::register([$tracerProvider, 'shutdown']);
-    $tracer = $tracerProvider->getTracer('io.opentelemetry.contrib.php');
-
-    $containerBuilder->addDefinitions([
-        Tracer::class => $tracer
-    ]);
-```
-
-You should call `$tracerProvider->shutdown()` when your service is shutdown to
-ensure all spans are exported.
-
-### Adding HTTP instrumentation
-
-This service receives HTTP requests, which are instrumented in the middleware.
-
-The middleware starts root span based on route pattern, sets span status
-from http code.
-
-```php
-    $app->add(function (Request $request, RequestHandler $handler) use ($tracer) {
-        $parent = TraceContextPropagator::getInstance()->extract($request->getHeaders());
-        $routeContext = RouteContext::fromRequest($request);
-        $route = $routeContext->getRoute();
-        $root = $tracer->spanBuilder($route->getPattern())
-            ->setStartTimestamp((int) ($request->getServerParams()['REQUEST_TIME_FLOAT'] * 1e9))
-            ->setParent($parent)
-            ->setSpanKind(SpanKind::KIND_SERVER)
-            ->startSpan();
-        $scope = $root->activate();
-
-        try {
-            $response = $handler->handle($request);
-            $root->setStatus($response->getStatusCode() < 500 ? StatusCode::STATUS_OK : StatusCode::STATUS_ERROR);
-        } finally {
-            $root->end();
-            $scope->detach();
-        }
-
-        return $response;
-    });
-```
-
-This is enough to get a new span every time a new request is received by the service.
-
-Note that the `root` span is created with `setParent($parent)` which is coming from
-the request headers. This is required to ensure Context Propagation.
-
-### Add span attributes
-
-Within the definition of routes, you can get current span using
-`OpenTelemetry\API\Trace\AbstractSpan`.
-
-```php
-    $span = AbstractSpan::getCurrent();
-```
-
-Adding attributes to a span is accomplished using `setAttribute` on the span
-object. In the `calculateQuote` function 2 attributes are added to the `childSpan`.
-
-```php
-    $childSpan->setAttribute('app.quote.items.count', $numberOfItems);
-    $childSpan->setAttribute('app.quote.cost.total', $quote);
-```
-
-### Add span events
-
-Adding span events is accomplished using `addEvent` on the span object. In the
-`getquote` route span events are added. Some events have
-additional attributes, others do not.
-
-Adding a span event without attributes:
-
-```php
-    $span->addEvent('Received get quote request, processing it');
-```
-
-Adding a span event with additional attributes:
-
-```php
-    $span->addEvent('Quote processed, response sent back', [
-        'app.quote.cost.total' => $payload
-    ]);
-```
-
-## Metrics
-
-TBD
-
-## Logs
-
-TBD

docs/services/recommendationservice.md

@@ -1,91 +0,0 @@
-# Recommendation Service
-
-This service is responsible to get a list of recommended products for the user
-based on existing product ids the user is browsing.
-
-[Recommendation service source](../../src/recommendationservice/)
-
-## Auto-instrumentation
-
-This Python based service, makes use of the OpenTelemetry auto-instrumentor
-for Python, accomplished by leveraging the `opentelemetry-instrument` Python
-wrapper to run the scripts. This can be done in the `ENTRYPOINT` command for the
-service's `Dockerfile`.
-
-```dockerfile
-ENTRYPOINT [ "opentelemetry-instrument", "python", "recommendation_server.py" ]
-```
-
-## Traces
-
-### Initialize tracer provider
-
-The OpenTelemetry SDK is initialized in the `__main__` code block. This code
-will create a tracer provider, and establish a Span Processor to use. Export
-endpoints, resource attributes, and service name are automatically set by the
-OpenTelemetry auto instrumentor based on environment variables.
-
-```python
-    tracer = trace.get_tracer_provider().get_tracer("recommendationservice")
-```
-
-### Add attributes to auto-instrumented spans
-
-Within the execution of auto-instrumented code you can get current span from
-context.
-
-```python
-    span = trace.get_current_span()
-```
-
-Adding attributes to a span is accomplished using `set_attribute` on the span
-object. In the `ListRecommendations` function an attribute is added to the span.
-
-```python
-    span.set_attribute("app.products_recommended.count", len(prod_list))
-```
-
-### Create new spans
-
-New spans can be created and placed into active context using
-`start_as_current_span` from an OpenTelemetry Tracer object. When used in
-conjunction with a `with` block, the span will automatically be ended when the
-block ends execution. This is done in the `get_product_list` function.
-
-```python
-    with tracer.start_as_current_span("get_product_list") as span:
-```
-
-## Metrics
-
-### Initialize meter provider
-
-The OpenTelemetry SDK is initialized in the `__main__` code block. This code
-will create a meter provider. Export
-endpoints, resource attributes, and service name are automatically set by the
-OpenTelemetry auto instrumentor based on environment variables.
-
-```python
-    meter = metrics.get_meter_provider().get_meter("recommendationservice")
-```
-
-### Custom metrics
-
-The following custom metrics are currently available:
-
-* `app_recommendations_counter`: Cumulative count of # recommended
- products per service call
-
-### Auto-instrumented metrics
-
-The following metrics are available through auto-instrumentation, courtesy of
-the `opentelemetry-instrumentation-system-metrics`, which is installed as part
-of `opentelemetry-bootstrap` on building the recommendationservice Docker image:
-
-* `runtime.cpython.cpu_time`
-* `runtime.cpython.memory`
-* `runtime.cpython.gc_count`
-
-## Logs
-
-TBD

docs/services/shippingservice.md

@@ -1,147 +0,0 @@
-# Shipping Service
-
-This service is responsible for providing shipping information including pricing
-and tracking information, when requested from Checkout Service.
-
-Shipping service is built primarily with Tonic, Reqwest, and OpenTelemetry
-Libraries/Components. Other sub-dependencies are included in `Cargo.toml`.
-
-Depending on your framework and runtime, you may consider consulting
-[rust docs](https://opentelemetry.io/docs/instrumentation/rust/) to supplement.
-You'll find examples of async and sync spans in quote requests and tracking ID's
-respectively.
-
-The `build.rs` supports development outside docker, given a rust installation.
-Otherwise, consider building with `docker compose` to edit / assess changes as needed.
-
-[Shipping service source](../../src/shippingservice/)
-
-## Traces
-
-### Initialize tracer provider
-
-The OpenTelemetry SDK is initialized from `main`.
-
-```rust
-fn init_tracer() -> Result<sdktrace::Tracer, TraceError> {
-    global::set_text_map_propagator(TraceContextPropagator::new());
-    opentelemetry_otlp::new_pipeline()
-        .tracing()
-        .with_exporter(
-            opentelemetry_otlp::new_exporter()
-                .tonic()
-                .with_endpoint(format!(
-                    "{}{}",
-                    env::var("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT")
-                        .unwrap_or_else(|_| "http://otelcol:4317".to_string()),
-                    "/v1/traces"
-                )), // TODO: assume this ^ is true from config when opentelemetry crate > v0.17.0
-                    // https://github.com/open-telemetry/opentelemetry-rust/pull/806 includes the environment variable.
-        )
-        .install_batch(opentelemetry::runtime::Tokio)
-}
-```
-
-Spans and other metrics are created in this example throughout `tokio` async
-runtimes found within [`tonic` server
-functions](https://github.com/hyperium/tonic/blob/master/examples/helloworld-tutorial.md#writing-our-server).
-Be mindful of async runtime, [context
-guards](https://docs.rs/opentelemetry/latest/opentelemetry/struct.ContextGuard.html),
-and inability to move and clone `spans` when replicating from these samples.
-
-### Adding gRPC/HTTP instrumentation
-
-This service receives gRPC requests, which are instrumented in the middleware.
-
-The root span is started and passed down as reference in the same thread
-to another closure where we call `quoteservice`.
-
-```rust
-    let tracer = global::tracer("shippingservice/get-quote");
-    let mut span = tracer.start_with_context("get-quote", &parent_cx);
-
-    span.add_event("Processing get quote request".to_string(), vec![]);
-
-    let q = match create_quote_from_count(itemct)
-        .with_context(Context::current_with_span(span))
-        .await
-//...create_quote_from_count...
-    let f = match request_quote(count).await {
-        Ok(float) => float,
-        Err(err) => {
-            let msg = format!("{}", err);
-            return Err(tonic::Status::unknown(msg));
-        }
-    };
-
-    Ok(get_active_span(|span| {
-        let q = create_quote_from_float(f);
-        span.add_event(
-            "Received Quote".to_string(),
-            vec![KeyValue::new("app.shipping.cost.total", format!("{}", q))],
-        );
-        span.set_attribute(KeyValue::new("app.shipping.items.count", count as i64));
-        span.set_attribute(KeyValue::new("app.shipping.cost.total", format!("{}", q)));
-        q
-    }))
-```
-
-Note that the span cannot be used after calling an async method in the
-originating function.
-
-You may also notice the `attributes` set on the span in this example, and
-`events` propogated similarly. With any valid `span` pointer (attached to
-context) the [OpenTelemetry API](https://docs.rs/opentelemetry/0.17.0/opentelemetry/trace/struct.SpanRef.html)
-will work.
-
-### Add span attributes
-
-Provided you are on the same thread, or in a context passed from a
-span-owning thread, or a `ContextGuard` is in scope, you can get
-an active span with `get_active_span`. You can find examples of all of these
-in the demo, with context available in `shipping_service` for sync/async runtime.
-You should consult `quote.rs` and/or the example above to see
-context-passed-to-async runtime.
-
-See below for a snippet from `shiporder` that holds context and a span in scope.
-This is appropriate in our case of a sync runtime.
-
-```rust
-    let parent_cx =
-    global::get_text_map_propagator(|prop| prop.extract(&MetadataMap(request.metadata())));
-    // in this case, generating a tracking ID is trivial
-    // we'll create a span and associated events all in this function.
-    let mut span = global::tracer("shippingservice/ship-order")
-        .start_with_context("ship-order", &parent_cx);
-```
-
-You must add attributes to a span in context with `set_attribute`, followed by a
-`KeyValue` object, containing a key, and value.
-
-```rust
-    let tid = create_tracking_id();
-    span.set_attribute(KeyValue::new("app.shipping.tracking.id", tid.clone()));
-    info!("Tracking ID Created: {}", tid);
-```
-
-### Add span events
-
-Adding span events is accomplished using `add_event` on the span object. Both
-server routes, for `ShipOrderRequest` (sync) and `GetQuoteRequest` (async),
-have events on spans. Attributes are not included here, but are [simple to include](https://docs.rs/opentelemetry/latest/opentelemetry/trace/trait.Span.html#method.add_event).
-
-Adding a span event:
-
-```rust
-    let tid = create_tracking_id();
-    span.set_attribute(KeyValue::new("app.shipping.tracking.id", tid.clone()));
-    info!("Tracking ID Created: {}", tid);
-```
-
-## Metrics
-
-TBD
-
-## Logs
-
-TBD

docs/tests.md

@@ -1,12 +0,0 @@
-# Tests
-
-Currently, the repository includes E2E tests for both the frontend and backend services.
-For the Frontend we are using [Cypress](https://www.cypress.io/) execute the
-different flows in the webstore.
-While the backend services use [AVA](https://avajs.dev) as the main testing framework.
-
-To run the test you can simply run `make run-tests` at the root directory.
-
-In case you need to run a specific suite of tests you can execute
-`docker compose run frontendTests` for the frontend tests or
-`docker compose run integrationTests` for the backend tests.

docs/trace_service_features.md

@@ -1,22 +0,0 @@
-# Trace Feature Coverage by Service
-
-Emoji Legend
-
-- Completed: :100:
-- Not Applicable: :no_bell:
-- Not Present (Yet): :construction:
-
-| Service         | Language        | Instrumentation Libraries | Manual Span Creation | Span Data Enrichment | RPC Context Propagation | Span Links | Baggage   |
-|-----------------|-----------------|---------------------------|----------------------|----------------------|-------------------------|------------|-----------|
-| Ad              | Java            | :100:                     | :100:                | :100:                | :no_bell:               | :no_bell:  | :no_bell: |
-| Cart            | .NET            | :100:                     | :100:                | :100:                | :no_bell:               | :no_bell:  | :no_bell: |
-| Checkout        | Go              | :100:                     | :100:                | :100:                | :no_bell:               | :no_bell:  | :no_bell: |
-| Currency        | C++             | :no_bell:                 | :100:                | :100:                | :100:                   | :no_bell:  | :no_bell: |
-| Email           | Ruby            | :100:                     | :100:                | :100:                | :no_bell:               | :no_bell:  | :no_bell: |
-| Feature Flag    | Erlang / Elixir | :100:                     | :100:                | :100:                | :no_bell:               | :no_bell:  | :no_bell: |
-| Frontend        | JavaScript      | :100:                     | :100:                | :100:                | :no_bell:               | :100:      | :100:     |
-| Payment         | JavaScript      | :100:                     | :100:                | :100:                | :no_bell:               | :no_bell:  | :100:     |
-| Product Catalog | Go              | :100:                     | :no_bell:            | :100:                | :no_bell:               | :no_bell:  | :no_bell: |
-| Quote Service   | PHP             | :100:                     | :100:                | :100:                | :no_bell:               | :no_bell:  | :no_bell: |
-| Recommendation  | Python          | :100:                     | :100:                | :100:                | :no_bell:               | :no_bell:  | :no_bell: |
-| Shipping        | Rust            | :no_bell:                 | :100:                | :100:                | :100:                   | :no_bell:  | :no_bell: |

ide-gen-proto.sh

@@ -0,0 +1,80 @@
+#!/bin/sh
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+
+# This script is used to generate protobuf files for all services.
+# Useful to ensure code can compile without Docker, and provide hints for IDEs.
+# Several dev tools including: cargo, protoc, python grpcio-tools, and rebar3 may be required to run this script.
+
+base_dir=$(pwd)
+
+gen_proto_dotnet() {
+  echo "Generating .NET protobuf files for $1"
+  cd "$base_dir"/src/"$1" || return
+  mkdir -p ./src/protos/
+  cp -r "$base_dir"/pb/ ./src/protos/
+  cd "$base_dir" || return
+}
+
+gen_proto_elixir() {
+  echo "Generating Elixir protobuf files for $1"
+  cd "$base_dir"/src/"$1" || return
+  mkdir -p proto
+  cp "$base_dir"/pb/demo.proto ./proto/demo.proto
+  rebar3 grpc_regen
+  cd "$base_dir" || return
+}
+
+gen_proto_go() {
+  echo "Generating Go protobuf files for $1"
+  cd "$base_dir"/src/"$1" || return
+  protoc -I ../../pb ./../../pb/demo.proto --go_out=./ --go-grpc_out=./
+  cd "$base_dir" || return
+}
+
+gen_proto_js() {
+  echo "Generating Javascript protobuf files for $1"
+  cd "$base_dir"/src/"$1" || return
+  cp "$base_dir"/pb/demo.proto .
+  cd "$base_dir" || return
+}
+
+gen_proto_python() {
+  echo "Generating Python protobuf files for $1"
+  cd "$base_dir"/src/"$1" || return
+  python3 -m grpc_tools.protoc -I=../../pb --python_out=./ --grpc_python_out=./ ./../../pb/demo.proto
+  cd "$base_dir" || return
+}
+
+gen_proto_rust() {
+  echo "Generating Rust protobuf files for $1"
+  cd "$base_dir"/src/"$1" || return
+  mkdir -p proto
+  cp "$base_dir"/pb/demo.proto proto/demo.proto
+  cargo build
+  cd "$base_dir" || return
+}
+
+gen_proto_ts() {
+  echo "Generating Typescript protobuf files for $1"
+  cd "$base_dir"/src/"$1" || return
+  cp -r "$base_dir"/pb .
+  mkdir -p ./protos
+  protoc -I ./pb  --plugin=./node_modules/.bin/protoc-gen-ts_proto --ts_proto_opt=esModuleInterop=true --ts_proto_out=./protos --ts_proto_opt=outputServices=grpc-js demo.proto
+  cd "$base_dir" || return
+}
+
+gen_proto_dotnet accounting
+# gen_proto_java ad
+gen_proto_dotnet cart
+gen_proto_go checkout
+# gen_proto_cpp currency
+# gen_proto_ruby email
+gen_proto_ts frontend
+gen_proto_ts react-native-app
+gen_proto_js payment
+gen_proto_go product-catalog
+# gen_proto_php quote
+gen_proto_python recommendation
+gen_proto_rust shipping

internal/tools/sanitycheck.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python3
 
+
+
 import glob
 import os
 import sys
@@ -82,7 +84,7 @@ retval += sanitycheck('**/*.html', allow_eol = (LF,), indent = 4)
 retval += sanitycheck('**/*.md', allow_eol = (LF,))
 retval += sanitycheck('**/*.proj', allow_eol = (LF,), indent = 2)
 retval += sanitycheck('**/*.props', allow_eol = (LF,), indent = 2)
-retval += sanitycheck('**/*.py', allow_eol = (LF,), indent = 4)
+retval += sanitycheck('**/[!demo_pb2]*.py', allow_eol = (LF,), indent = 4)
 retval += sanitycheck('**/*.sln', allow_utf8 = True, indent = 4)
 retval += sanitycheck('**/*.targets', allow_eol = (LF,), indent = 2)
 retval += sanitycheck('**/*.xml', allow_eol = (LF,), indent = 2)

internal/tools/tools.go

@@ -1,24 +1,12 @@
-// Copyright 2019, OpenTelemetry Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 //
 
+//go:build tools
 // +build tools
 
 package tools
 
 // This file follows the recommendation at
-// https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module
+// https://go.dev/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module
 // on how to pin tooling dependencies to a go.mod file.
 // This ensures that all systems use the same version of tools in addition to regular dependencies.
 

package.json

@@ -1,7 +1,8 @@
 {
   "devDependencies": {
-    "markdown-link-check": "^3.9.3",
     "markdown-toc": "^1.2.0",
-    "markdownlint-cli": "0.31.0"
+    "markdownlint-cli": "0.45.0",
+    "@kt3k/license-checker": "^3.2.2",
+    "@umbrelladocs/linkspector": "^0.4.6"
   }
 }

pb/demo.proto

@@ -14,11 +14,9 @@
 
 syntax = "proto3";
 
-import "google/protobuf/timestamp.proto";
+package oteldemo;
 
-package hipstershop;
-
-option go_package = "genproto/hipstershop";
+option go_package = "genproto/oteldemo";
 
 // -----------------Cart service-----------------
 
@@ -134,7 +132,7 @@ message Address {
     string city = 2;
     string state = 3;
     string country = 4;
-    int32 zip_code = 5;
+    string zip_code = 5;
 }
 
 // -----------------Currency service-----------------
@@ -277,8 +275,6 @@ message Flag {
   string name = 1;
   string description = 2;
   bool enabled = 3;
-  google.protobuf.Timestamp created_at = 4;
-  google.protobuf.Timestamp updated_at = 5;
 }
 
 message GetFlagRequest {

pb/google/protobuf/timestamp.proto

@@ -1,147 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package google.protobuf;
-
-option csharp_namespace = "Google.Protobuf.WellKnownTypes";
-option cc_enable_arenas = true;
-option go_package = "google.golang.org/protobuf/types/known/timestamppb";
-option java_package = "com.google.protobuf";
-option java_outer_classname = "TimestampProto";
-option java_multiple_files = true;
-option objc_class_prefix = "GPB";
-
-// A Timestamp represents a point in time independent of any time zone or local
-// calendar, encoded as a count of seconds and fractions of seconds at
-// nanosecond resolution. The count is relative to an epoch at UTC midnight on
-// January 1, 1970, in the proleptic Gregorian calendar which extends the
-// Gregorian calendar backwards to year one.
-//
-// All minutes are 60 seconds long. Leap seconds are "smeared" so that no leap
-// second table is needed for interpretation, using a [24-hour linear
-// smear](https://developers.google.com/time/smear).
-//
-// The range is from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. By
-// restricting to that range, we ensure that we can convert to and from [RFC
-// 3339](https://www.ietf.org/rfc/rfc3339.txt) date strings.
-//
-// # Examples
-//
-// Example 1: Compute Timestamp from POSIX `time()`.
-//
-//     Timestamp timestamp;
-//     timestamp.set_seconds(time(NULL));
-//     timestamp.set_nanos(0);
-//
-// Example 2: Compute Timestamp from POSIX `gettimeofday()`.
-//
-//     struct timeval tv;
-//     gettimeofday(&tv, NULL);
-//
-//     Timestamp timestamp;
-//     timestamp.set_seconds(tv.tv_sec);
-//     timestamp.set_nanos(tv.tv_usec * 1000);
-//
-// Example 3: Compute Timestamp from Win32 `GetSystemTimeAsFileTime()`.
-//
-//     FILETIME ft;
-//     GetSystemTimeAsFileTime(&ft);
-//     UINT64 ticks = (((UINT64)ft.dwHighDateTime) << 32) | ft.dwLowDateTime;
-//
-//     // A Windows tick is 100 nanoseconds. Windows epoch 1601-01-01T00:00:00Z
-//     // is 11644473600 seconds before Unix epoch 1970-01-01T00:00:00Z.
-//     Timestamp timestamp;
-//     timestamp.set_seconds((INT64) ((ticks / 10000000) - 11644473600LL));
-//     timestamp.set_nanos((INT32) ((ticks % 10000000) * 100));
-//
-// Example 4: Compute Timestamp from Java `System.currentTimeMillis()`.
-//
-//     long millis = System.currentTimeMillis();
-//
-//     Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000)
-//         .setNanos((int) ((millis % 1000) * 1000000)).build();
-//
-//
-// Example 5: Compute Timestamp from Java `Instant.now()`.
-//
-//     Instant now = Instant.now();
-//
-//     Timestamp timestamp =
-//         Timestamp.newBuilder().setSeconds(now.getEpochSecond())
-//             .setNanos(now.getNano()).build();
-//
-//
-// Example 6: Compute Timestamp from current time in Python.
-//
-//     timestamp = Timestamp()
-//     timestamp.GetCurrentTime()
-//
-// # JSON Mapping
-//
-// In JSON format, the Timestamp type is encoded as a string in the
-// [RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format. That is, the
-// format is "{year}-{month}-{day}T{hour}:{min}:{sec}[.{frac_sec}]Z"
-// where {year} is always expressed using four digits while {month}, {day},
-// {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional
-// seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution),
-// are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone
-// is required. A proto3 JSON serializer should always use UTC (as indicated by
-// "Z") when printing the Timestamp type and a proto3 JSON parser should be
-// able to accept both UTC and other timezones (as indicated by an offset).
-//
-// For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past
-// 01:30 UTC on January 15, 2017.
-//
-// In JavaScript, one can convert a Date object to this format using the
-// standard
-// [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString)
-// method. In Python, a standard `datetime.datetime` object can be converted
-// to this format using
-// [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with
-// the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use
-// the Joda Time's [`ISODateTimeFormat.dateTime()`](
-// http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D
-// ) to obtain a formatter capable of generating timestamps in this format.
-//
-//
-message Timestamp {
-  // Represents seconds of UTC time since Unix epoch
-  // 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to
-  // 9999-12-31T23:59:59Z inclusive.
-  int64 seconds = 1;
-
-  // Non-negative fractions of a second at nanosecond resolution. Negative
-  // second values with fractions must still have non-negative nanos values
-  // that count forward in time. Must be from 0 to 999,999,999
-  // inclusive.
-  int32 nanos = 2;
-}

src/accounting/.dockerignore

@@ -0,0 +1,3 @@
+bin
+obj
+build

src/accounting/.gitignore

@@ -0,0 +1 @@
+proto

src/accounting/Accounting.csproj

@@ -0,0 +1,34 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net8.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Confluent.Kafka" Version="2.8.0" />
+		<PackageReference Include="EFCore.NamingConventions" Version="9.0.0" />
+		<PackageReference Include="Google.Protobuf" Version="3.30.0" />
+		<PackageReference Include="Grpc.Tools" Version="2.68.1">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.2" />
+		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.2" />
+		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
+		<PackageReference Include="OpenTelemetry.AutoInstrumentation" Version="1.11.0" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<!-- GrpcServices is 'none' so that we do not need to depend on the grpc nuget package, and we only need protobuf support. -->
+		<Protobuf Include="proto\demo.proto" GrpcServices="none" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <Folder Include="proto\" />
+	</ItemGroup>
+
+</Project>

src/accounting/Accounting.sln

@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34701.34
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Accounting", "Accounting.csproj", "{C66C35E2-DF04-4DCF-8F6A-87B6D6433FF6}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C66C35E2-DF04-4DCF-8F6A-87B6D6433FF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C66C35E2-DF04-4DCF-8F6A-87B6D6433FF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C66C35E2-DF04-4DCF-8F6A-87B6D6433FF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C66C35E2-DF04-4DCF-8F6A-87B6D6433FF6}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {6340CDDC-E917-4532-A056-5526E0A7BDDA}
+	EndGlobalSection
+EndGlobal

src/accounting/Consumer.cs

@@ -0,0 +1,153 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+using Confluent.Kafka;
+using Microsoft.Extensions.Logging;
+using Oteldemo;
+using Microsoft.EntityFrameworkCore;
+using System.Diagnostics;
+
+namespace Accounting;
+
+internal class DBContext : DbContext
+{
+    public DbSet<OrderEntity> Orders { get; set; }
+    public DbSet<OrderItemEntity> CartItems { get; set; }
+    public DbSet<ShippingEntity> Shipping { get; set; }
+
+    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+    {
+        var connectionString = Environment.GetEnvironmentVariable("DB_CONNECTION_STRING");
+
+        optionsBuilder.UseNpgsql(connectionString).UseSnakeCaseNamingConvention();
+    }
+}
+
+
+internal class Consumer : IDisposable
+{
+    private const string TopicName = "orders";
+
+    private ILogger _logger;
+    private IConsumer<string, byte[]> _consumer;
+    private bool _isListening;
+    private DBContext? _dbContext;
+    private static readonly ActivitySource MyActivitySource = new("Accounting.Consumer");
+
+    public Consumer(ILogger<Consumer> logger)
+    {
+        _logger = logger;
+
+        var servers = Environment.GetEnvironmentVariable("KAFKA_ADDR")
+            ?? throw new ArgumentNullException("KAFKA_ADDR");
+
+        _consumer = BuildConsumer(servers);
+        _consumer.Subscribe(TopicName);
+
+        _logger.LogInformation($"Connecting to Kafka: {servers}");
+        _dbContext = Environment.GetEnvironmentVariable("DB_CONNECTION_STRING") == null ? null : new DBContext();
+    }
+
+    public void StartListening()
+    {
+        _isListening = true;
+
+        try
+        {
+            while (_isListening)
+            {
+                try
+                {
+                    using var activity = MyActivitySource.StartActivity("order-consumed",  ActivityKind.Internal);
+                    var consumeResult = _consumer.Consume();
+                    ProcessMessage(consumeResult.Message);
+                }
+                catch (ConsumeException e)
+                {
+                    _logger.LogError(e, "Consume error: {0}", e.Error.Reason);
+                }
+            }
+        }
+        catch (OperationCanceledException)
+        {
+            _logger.LogInformation("Closing consumer");
+
+            _consumer.Close();
+        }
+    }
+
+    private void ProcessMessage(Message<string, byte[]> message)
+    {
+        try
+        {
+            var order = OrderResult.Parser.ParseFrom(message.Value);
+            Log.OrderReceivedMessage(_logger, order);
+
+            if (_dbContext == null)
+            {
+                return;
+            }
+
+            var orderEntity = new OrderEntity
+            {
+                Id = order.OrderId
+            };
+            _dbContext.Add(orderEntity);
+            foreach (var item in order.Items)
+            {
+                var orderItem = new OrderItemEntity
+                {
+                    ItemCostCurrencyCode = item.Cost.CurrencyCode,
+                    ItemCostUnits = item.Cost.Units,
+                    ItemCostNanos = item.Cost.Nanos,
+                    ProductId = item.Item.ProductId,
+                    Quantity = item.Item.Quantity,
+                    OrderId = order.OrderId
+                };
+
+                _dbContext.Add(orderItem);
+            }
+
+            var shipping = new ShippingEntity
+            {
+                ShippingTrackingId = order.ShippingTrackingId,
+                ShippingCostCurrencyCode = order.ShippingCost.CurrencyCode,
+                ShippingCostUnits = order.ShippingCost.Units,
+                ShippingCostNanos = order.ShippingCost.Nanos,
+                StreetAddress = order.ShippingAddress.StreetAddress,
+                City = order.ShippingAddress.City,
+                State = order.ShippingAddress.State,
+                Country = order.ShippingAddress.Country,
+                ZipCode = order.ShippingAddress.ZipCode,
+                OrderId = order.OrderId
+            };
+            _dbContext.Add(shipping);
+            _dbContext.SaveChanges();
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Order parsing failed:");
+        }
+    }
+
+    private IConsumer<string, byte[]> BuildConsumer(string servers)
+    {
+        var conf = new ConsumerConfig
+        {
+            GroupId = $"accounting",
+            BootstrapServers = servers,
+            // https://github.com/confluentinc/confluent-kafka-dotnet/tree/07de95ed647af80a0db39ce6a8891a630423b952#basic-consumer-example
+            AutoOffsetReset = AutoOffsetReset.Earliest,
+            EnableAutoCommit = true
+        };
+
+        return new ConsumerBuilder<string, byte[]>(conf)
+            .Build();
+    }
+
+    public void Dispose()
+    {
+        _isListening = false;
+        _consumer?.Dispose();
+    }
+}

src/accounting/Directory.Build.props

@@ -0,0 +1,11 @@
+<Project>
+    <PropertyGroup>
+        <NuGetAudit>true</NuGetAudit>
+        <NuGetAuditMode>all</NuGetAuditMode>
+        <NuGetAuditLevel>low</NuGetAuditLevel>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)'=='Release'">
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    </PropertyGroup>
+</Project>

src/accounting/Dockerfile

@@ -0,0 +1,36 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+FROM --platform=${BUILDPLATFORM} mcr.microsoft.com/dotnet/sdk:8.0 AS builder
+ARG TARGETARCH
+ARG BUILD_CONFIGURATION=Release
+WORKDIR /src
+COPY ["/src/accounting/", "Accounting/"]
+COPY ["/pb/demo.proto", "Accounting/proto/"]
+RUN dotnet restore "./Accounting/Accounting.csproj" -r linux-$TARGETARCH
+WORKDIR "/src/Accounting"
+
+RUN dotnet build "./Accounting.csproj" -r linux-$TARGETARCH -c $BUILD_CONFIGURATION -o /app/build
+
+# -----------------------------------------------------------------------------
+
+FROM builder AS publish
+ARG TARGETARCH
+ARG BUILD_CONFIGURATION=Release
+RUN dotnet publish "./Accounting.csproj" -r linux-$TARGETARCH -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
+
+# -----------------------------------------------------------------------------
+
+FROM mcr.microsoft.com/dotnet/aspnet:8.0
+USER app
+WORKDIR /app
+COPY --from=publish /app/publish .
+
+USER root
+RUN mkdir -p "/var/log/opentelemetry/dotnet"
+RUN chown app "/var/log/opentelemetry/dotnet"
+RUN chown app "/app/instrument.sh"
+USER app
+ENV OTEL_DOTNET_AUTO_TRACES_ADDITIONAL_SOURCES=Accounting.Consumer
+
+ENTRYPOINT ["./instrument.sh", "dotnet", "Accounting.dll"]

src/accounting/Entities.cs

@@ -0,0 +1,59 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Accounting;
+
+[Table("shipping")]
+[PrimaryKey(nameof(ShippingTrackingId))]
+internal class ShippingEntity
+{
+
+    public required string ShippingTrackingId { get; set; }
+
+    public required string ShippingCostCurrencyCode { get; set; }
+
+    public required long ShippingCostUnits { get; set; }
+
+    public required int ShippingCostNanos { get; set; }
+
+    public required string StreetAddress { get; set; }
+
+    public required string City { get; set; }
+
+    public required string State { get; set; }
+
+    public required string Country { get; set; }
+
+    public required string ZipCode { get; set; }
+
+    public required string OrderId { get; set; }
+}
+
+[Table("orderitem")]
+[PrimaryKey(nameof(ProductId), nameof(OrderId))]
+internal class OrderItemEntity
+{
+    public required string ItemCostCurrencyCode { get; set; }
+
+    public required long ItemCostUnits { get; set; }
+
+    public required int ItemCostNanos { get; set; }
+
+    public required string ProductId { get; set; }
+
+    public required int Quantity { get; set; }
+
+    public required string OrderId { get; set; }
+}
+
+[Table("order")]
+[PrimaryKey(nameof(Id))]
+internal class OrderEntity
+{
+    [Column("order_id")]
+    public required string Id { get; set; }
+
+}

src/accounting/Helpers.cs

@@ -0,0 +1,34 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+using System.Collections;
+
+namespace Accounting
+{
+    internal static class Helpers
+    {
+        private static List<string> RelevantPrefixes = ["DOTNET_", "CORECLR_", "OTEL_", "KAFKA_"];
+
+        public static IEnumerable<DictionaryEntry> FilterRelevant(this IDictionary envs)
+        {
+            foreach (DictionaryEntry env in envs)
+            {
+                foreach (var prefix in RelevantPrefixes)
+                {
+                    if (env.Key.ToString()?.StartsWith(prefix, StringComparison.InvariantCultureIgnoreCase) ?? false)
+                    {
+                        yield return env;
+                    }
+                }
+            }
+        }
+
+        public static void OutputInOrder(this IEnumerable<DictionaryEntry> envs)
+        {
+            foreach (var env in envs.OrderBy(x => x.Key))
+            {
+                Console.WriteLine(env);
+            }
+        }
+    }
+}

src/accounting/Log.cs

@@ -0,0 +1,16 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+using Microsoft.Extensions.Logging;
+using Oteldemo;
+
+namespace Accounting
+{
+    internal static partial class Log
+    {
+        [LoggerMessage(
+            Level = LogLevel.Information,
+            Message = "Order details: {@OrderResult}.")]
+        public static partial void OrderReceivedMessage(ILogger logger, OrderResult orderResult);
+    }
+}

src/accounting/Program.cs

@@ -0,0 +1,24 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+using Accounting;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+
+Console.WriteLine("Accounting service started");
+
+Environment.GetEnvironmentVariables()
+    .FilterRelevant()
+    .OutputInOrder();
+
+var host = Host.CreateDefaultBuilder(args)
+    .ConfigureServices(services =>
+    {
+        services.AddSingleton<Consumer>();
+    })
+    .Build();
+
+var consumer = host.Services.GetRequiredService<Consumer>();
+consumer.StartListening();
+
+host.Run();

src/accounting/README.md

@@ -0,0 +1,29 @@
+# Accounting Service
+
+This service consumes new orders from a Kafka topic.
+
+## Local Build
+
+To build the service binary, run:
+
+```sh
+mkdir -p src/accounting/proto/ # root context
+cp pb/demo.proto src/accounting/proto/demo.proto # root context
+dotnet build # accounting service context
+```
+
+## Docker Build
+
+From the root directory, run:
+
+```sh
+docker compose build accounting
+```
+
+## Bump dependencies
+
+To bump all dependencies run in Package manager:
+
+```sh
+Update-Package -ProjectName Accounting
+```

src/ad/.java-version

@@ -0,0 +1 @@
+21.0

src/ad/Dockerfile

@@ -0,0 +1,35 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+
+FROM --platform=${BUILDPLATFORM} eclipse-temurin:21-jdk AS builder
+ARG _JAVA_OPTIONS
+WORKDIR /usr/src/app/
+
+COPY ./src/ad/gradlew* ./src/ad/settings.gradle* ./src/ad/build.gradle ./
+COPY ./src/ad/gradle ./gradle
+
+RUN chmod +x ./gradlew
+RUN ./gradlew
+RUN ./gradlew downloadRepos
+
+COPY ./src/ad/ ./
+COPY ./pb/ ./proto
+RUN chmod +x ./gradlew
+RUN ./gradlew installDist -PprotoSourceDir=./proto
+
+# -----------------------------------------------------------------------------
+
+FROM eclipse-temurin:21-jre
+
+ARG OTEL_JAVA_AGENT_VERSION
+ARG _JAVA_OPTIONS
+
+WORKDIR /usr/src/app/
+
+COPY --from=builder /usr/src/app/ ./
+ADD --chmod=644 https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v$OTEL_JAVA_AGENT_VERSION/opentelemetry-javaagent.jar /usr/src/app/opentelemetry-javaagent.jar
+ENV JAVA_TOOL_OPTIONS=-javaagent:/usr/src/app/opentelemetry-javaagent.jar
+
+EXPOSE ${AD_PORT}
+ENTRYPOINT [ "./build/install/opentelemetry-demo-ad/bin/Ad" ]

src/ad/README.md

@@ -0,0 +1,41 @@
+# Ad Service
+
+The Ad service provides advertisement based on context keys. If no context keys
+are provided then it returns random ads.
+
+## Building Locally
+
+The Ad service requires at least JDK 17 to build and uses gradlew to
+compile/install/distribute. Gradle wrapper is already part of the source code.
+To build Ad Service, run:
+
+```sh
+./gradlew installDist
+```
+
+It will create an executable script
+`src/ad/build/install/oteldemo/bin/Ad`.
+
+To run the Ad Service:
+
+```sh
+export AD_PORT=8080
+export FEATURE_FLAG_GRPC_SERVICE_ADDR=featureflagservice:50053
+./build/install/opentelemetry-demo-ad/bin/Ad
+```
+
+### Upgrading Gradle
+
+If you need to upgrade the version of gradle then run
+
+```sh
+./gradlew wrapper --gradle-version <new-version>
+```
+
+## Building Docker
+
+From the root of `opentelemetry-demo`, run:
+
+```sh
+docker build --file ./src/ad/Dockerfile ./
+```

src/ad/build.gradle

@@ -0,0 +1,143 @@
+
+plugins {
+    id 'com.google.protobuf' version '0.9.5'
+    id 'com.github.sherter.google-java-format' version '0.9'
+    id 'idea'
+    id 'application'
+    id 'com.github.ben-manes.versions' version '0.52.0'
+}
+
+repositories {
+    mavenCentral()
+    mavenLocal()
+}
+
+description = 'Ad Service'
+group = "ad"
+version = "0.1.0-SNAPSHOT"
+
+def opentelemetryVersion = "1.51.0"
+def opentelemetryInstrumentationVersion = "2.17.1"
+def grpcVersion = "1.73.0"
+def jacksonVersion = "2.19.1"
+def protocVersion = "4.31.1"
+
+tasks.withType(JavaCompile).configureEach {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
+
+ext {
+    speed = project.hasProperty('speed') ? project.getProperty('speed') : false
+    Provider<Directory> output = layout.buildDirectory.dir("outputLocation")
+    offlineCompile = output.get().asFile
+}
+
+dependencies {
+    if (speed) {
+        implementation fileTree(dir: offlineCompile, include: '*.jar')
+    } else {
+        implementation platform("io.opentelemetry:opentelemetry-bom:${opentelemetryVersion}")
+        implementation platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:${opentelemetryInstrumentationVersion}")
+
+        implementation "com.google.api.grpc:proto-google-common-protos:2.59.1",
+                "com.google.protobuf:protobuf-java:${protocVersion}",
+                "javax.annotation:javax.annotation-api:1.3.2",
+                "io.grpc:grpc-protobuf:${grpcVersion}",
+                "io.grpc:grpc-stub:${grpcVersion}",
+                "io.grpc:grpc-netty:${grpcVersion}",
+                "io.grpc:grpc-services:${grpcVersion}",
+                "io.opentelemetry:opentelemetry-api",
+                "io.opentelemetry:opentelemetry-sdk",
+                "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations",
+                "org.apache.logging.log4j:log4j-core:2.25.0",
+                "dev.openfeature.contrib.providers:flagd:0.11.13",
+                'dev.openfeature:sdk:1.16.0'
+
+        runtimeOnly "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}",
+                "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}",
+                "io.netty:netty-tcnative-boringssl-static:2.0.72.Final"
+    }
+}
+
+// Default protoSourceDir is in /opentelemetry-demo/pb. Optionally override the
+// location for the docker build, which copies the protos to a different location.
+def protoSourceDir = findProperty('protoSourceDir')?: project.projectDir.parentFile.parentFile.toPath().toString() + "/pb"
+def protoDestDir = project.buildDir.toPath().toString() + "/proto"
+
+// Copy protos to the build directory
+tasks.register('copyProtos', Copy) {
+    from protoSourceDir
+    into protoDestDir
+}
+
+// Include the output directory of copyProtos in main source set so they are
+// picked up by the protobuf plugin
+sourceSets {
+    main {
+        proto {
+            srcDir(protoDestDir)
+        }
+    }
+}
+
+protobuf {
+    protoc {
+        artifact = "com.google.protobuf:protoc:${protocVersion}"
+    }
+    plugins {
+        grpc {
+            artifact = "io.grpc:protoc-gen-grpc-java:${grpcVersion}"
+        }
+    }
+    generateProtoTasks { task ->
+        all()*.plugins {
+            grpc {}
+        }
+        ofSourceSet('main')
+    }
+}
+
+afterEvaluate {
+    // Ensure protos are copy before classes are generated
+    tasks.getByName('processResources').dependsOn 'copyProtos'
+    tasks.getByName('generateProto').dependsOn 'copyProtos'
+}
+
+googleJavaFormat {
+    toolVersion '1.18.1'
+}
+
+// Inform IDEs like IntelliJ IDEA, Eclipse or NetBeans about the generated code.
+sourceSets {
+    main {
+        java {
+            srcDirs 'oteldemo'
+            srcDirs 'build/generated/source/proto/main/java/oteldemo'
+            srcDirs 'build/generated/source/proto/main/grpc/oteldemo'
+        }
+    }
+}
+
+startScripts.enabled = false
+
+// This to cache dependencies during Docker image building. First build will take time.
+// Subsequent build will be incremental.
+task downloadRepos(type: Copy) {
+    from configurations.compileClasspath
+    into offlineCompile
+    from configurations.runtimeClasspath
+    into offlineCompile
+}
+
+task ad(type: CreateStartScripts) {
+    mainClass.set('oteldemo.AdService')
+    applicationName = 'Ad'
+    outputDir = new File(project.buildDir, 'tmp')
+    classpath = startScripts.classpath
+}
+
+applicationDistribution.into('bin') {
+    from(ad)
+    fileMode = 0755
+}

src/ad/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

src/ad/gradlew

@@ -0,0 +1,252 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

src/ad/gradlew.bat

@@ -0,0 +1,94 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

src/ad/settings.gradle

@@ -0,0 +1,2 @@
+
+rootProject.name = 'opentelemetry-demo-ad'