Merge branch 'open-telemetry:main' into main

.env

@@ -1,102 +1,151 @@
 
 
-# Images
-IMAGE_VERSION=1.4.0
+# Demo App version
+IMAGE_VERSION=1.12.0
 IMAGE_NAME=ghcr.io/open-telemetry/demo
+DEMO_VERSION=latest
+
+# Build Args
+TRACETEST_IMAGE_VERSION=v1.7.1
+OTEL_JAVA_AGENT_VERSION=2.9.0
+OPENTELEMETRY_CPP_VERSION=1.17.0
+
+# Dependent images
+COLLECTOR_CONTRIB_IMAGE=otel/opentelemetry-collector-contrib:0.113.0
+FLAGD_IMAGE=ghcr.io/open-feature/flagd:v0.11.4
+GRAFANA_IMAGE=grafana/grafana:11.3.0
+JAEGERTRACING_IMAGE=jaegertracing/all-in-one:1.62.0
+# must also update version field in src/grafana/provisioning/datasources/opensearch.yaml
+OPENSEARCH_IMAGE=opensearchproject/opensearch:2.18.0
+POSTGRES_IMAGE=postgres:17.0
+PROMETHEUS_IMAGE=quay.io/prometheus/prometheus:v2.55.1
+VALKEY_IMAGE=valkey/valkey:8.0-alpine
+TRACETEST_IMAGE=kubeshop/tracetest:${TRACETEST_IMAGE_VERSION}
 
 # Demo Platform
 ENV_PLATFORM=local
 
 # OpenTelemetry Collector
-OTEL_COLLECTOR_HOST=otelcol
+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/oltp-http/v1/traces
+PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:8080/otlp-http/v1/traces
 
 # OpenTelemetry Resource Definitions
-OTEL_RESOURCE_ATTRIBUTES="service.namespace=opentelemetry-demo"
+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_SERVICE_PORT=9555
-AD_SERVICE_ADDR=adservice:${AD_SERVICE_PORT}
+AD_PORT=9555
+AD_ADDR=ad:${AD_PORT}
+AD_DOCKERFILE=./src/ad/Dockerfile
 
 # Cart Service
-CART_SERVICE_PORT=7070
-CART_SERVICE_ADDR=cartservice:${CART_SERVICE_PORT}
+CART_PORT=7070
+CART_ADDR=cart:${CART_PORT}
+CART_DOCKERFILE=./src/cart/src/Dockerfile
 
 # Checkout Service
 CHECKOUT_SERVICE_PORT=5050
 CHECKOUT_SERVICE_ADDR=checkoutservice:${CHECKOUT_SERVICE_PORT}
+CHECKOUT_SERVICE_DOCKERFILE=./src/checkoutservice/Dockerfile
 
 # Currency Service
 CURRENCY_SERVICE_PORT=7001
 CURRENCY_SERVICE_ADDR=currencyservice:${CURRENCY_SERVICE_PORT}
+CURRENCY_SERVICE_DOCKERFILE=./src/currencyservice/Dockerfile
 
 # Email Service
 EMAIL_SERVICE_PORT=6060
 EMAIL_SERVICE_ADDR=http://emailservice:${EMAIL_SERVICE_PORT}
+EMAIL_SERVICE_DOCKERFILE=./src/emailservice/Dockerfile
 
-# Feature Flag Service
-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}
+# Fraud Service
+FRAUD_SERVICE_DOCKERFILE=./src/frauddetectionservice/Dockerfile
 
 # Frontend
 FRONTEND_PORT=8080
 FRONTEND_ADDR=frontend:${FRONTEND_PORT}
+FRONTEND_DOCKERFILE=./src/frontend/Dockerfile
 
 # Frontend Proxy (Envoy)
 FRONTEND_HOST=frontend
 ENVOY_PORT=8080
 FRONTEND_PROXY_ADDR=frontend-proxy:${ENVOY_PORT}
+FRONTEND_PROXY_DOCKERFILE=./src/frontendproxy/Dockerfile
+
+# Image Provider
+IMAGE_PROVIDER_HOST=imageprovider
+IMAGE_PROVIDER_PORT=8081
+IMAGE_PROVIDER_DOCKERFILE=./src/imageprovider/Dockerfile
 
 # Load Generator
 LOCUST_WEB_PORT=8089
-LOCUST_USERS=10
+LOCUST_USERS=5
 LOCUST_HOST=http://${FRONTEND_PROXY_ADDR}
 LOCUST_WEB_HOST=loadgenerator
 LOCUST_AUTOSTART=true
 LOCUST_HEADLESS=false
+LOAD_GENERATOR_DOCKERFILE=./src/loadgenerator/Dockerfile
 
 # Payment Service
 PAYMENT_SERVICE_PORT=50051
 PAYMENT_SERVICE_ADDR=paymentservice:${PAYMENT_SERVICE_PORT}
+PAYMENT_SERVICE_DOCKERFILE=./src/paymentservice/Dockerfile
 
 # Product Catalog Service
 PRODUCT_CATALOG_SERVICE_PORT=3550
 PRODUCT_CATALOG_SERVICE_ADDR=productcatalogservice:${PRODUCT_CATALOG_SERVICE_PORT}
+PRODUCT_CATALOG_DOCKERFILE=./src/productcatalogservice/Dockerfile
 
 # Quote Service
-QUOTE_SERVICE_PORT=8090
-QUOTE_SERVICE_ADDR=http://quoteservice:${QUOTE_SERVICE_PORT}
+QUOTE_PORT=8090
+QUOTE_ADDR=http://quote:${QUOTE_PORT}
+QUOTE_DOCKERFILE=./src/quote/Dockerfile
 
 # Recommendation Service
 RECOMMENDATION_SERVICE_PORT=9001
 RECOMMENDATION_SERVICE_ADDR=recommendationservice:${RECOMMENDATION_SERVICE_PORT}
+RECOMMENDATION_SERVICE_DOCKERFILE=./src/recommendationservice/Dockerfile
 
 # Shipping Service
 SHIPPING_SERVICE_PORT=50050
 SHIPPING_SERVICE_ADDR=shippingservice:${SHIPPING_SERVICE_PORT}
+SHIPPING_SERVICE_DOCKERFILE=./src/shippingservice/Dockerfile
 
 # ******************
 # Dependent Services
 # ******************
+# Flagd
+FLAGD_HOST=flagd
+FLAGD_PORT=8013
+
+# Flagd UI
+FLAGD_UI_HOST=flagd-ui
+FLAGD_UI_PORT=4000
+FLAGD_UI_DOCKERFILE=./src/flagd-ui/Dockerfile
+
 # Kafka
 KAFKA_SERVICE_PORT=9092
 KAFKA_SERVICE_ADDR=kafka:${KAFKA_SERVICE_PORT}
+KAFKA_SERVICE_DOCKERFILE=./src/kafka/Dockerfile
 
-# Redis
-REDIS_PORT=6379
-REDIS_ADDR=redis-cart:${REDIS_PORT}
+# Valkey
+VALKEY_PORT=6379
+VALKEY_ADDR=valkey-cart:${VALKEY_PORT}
 
 # ********************
 # Telemetry Components

.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

.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,12 +18,12 @@ 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.**
 
 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

@@ -4,7 +4,7 @@ Please provide a brief description of the changes here.
 
 ## Merge Requirements
 
-For new features contributions please make sure you have completed the following
+For new features contributions, please make sure you have completed the following
 essential items:
 
 * [ ] `CHANGELOG.md` updated to document new feature additions
@@ -17,7 +17,7 @@ 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.
+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.
 -->

.github/component_owners.yml

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # this file is used by .github/workflows/assign-reviewers.yml
 components:
-  src/adservice:
+  src/ad:
     - jack-berg
     - mateuszrzeszutek
     - trask

.github/dependabot.yml

@@ -8,3 +8,12 @@ updates:
       interval: "daily"
     labels:
       - "infra"
+  - package-ecosystem: "gomod"
+    directories:
+      - "/src/checkoutservice"
+      - "/src/productcatalogservice"
+    groups:
+      go-production-dependencies:
+        dependency-type: "production"
+    schedule:
+      interval: "daily"

.github/workflows/assign-reviewers.yml

@@ -12,6 +12,7 @@ on:
 
 jobs:
   assign-reviewers:
+    if: github.repository == 'open-telemetry/opentelemetry-demo'
     runs-on: ubuntu-latest
     steps:
       - uses: dyladan/component-owners@main