Skip to content

otel-demo: upgrade docker-compose integration to 3.0.0 #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kylehounslow wants to merge 6 commits into from
Closed

otel-demo: upgrade docker-compose integration to 3.0.0 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1cd32c9
docs: add OpenTelemetry Demo quickstart page (#432)
kylehounslow Aug 21, 2026
6f430b1
otel-demo: port env and compose to 3.0.0 core service set
kylehounslow Aug 21, 2026
d2bcec1
otel-demo: refresh vendored 3.0.0 config
kylehounslow Aug 21, 2026
4fd8ab0
otel-demo: update dashboards and alerts for 3.0.0 service set
kylehounslow Aug 21, 2026
884cd80
otel-demo: revert charts/files dashboard and alert changes
kylehounslow Aug 21, 2026
e70c506
otel-demo: add frontend-proxy envoy vars for 3.0.0 backends
kylehounslow Aug 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 32 additions & 32 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ EVAL_CANARY_LOOKBACK_MINUTES=15
# OpenTelemetry Demo Configuration
# ******************
# Demo App version
IMAGE_VERSION=2.2.0
IMAGE_VERSION=3.0.0
IMAGE_NAME=ghcr.io/open-telemetry/demo
DEMO_VERSION=2.2.0
DEMO_VERSION=3.0.0

# Build Args
TRACETEST_IMAGE_VERSION=v1.7.1
Expand All @@ -114,13 +114,13 @@ OPENTELEMETRY_CPP_VERSION=1.24.0

# Dependent images
COLLECTOR_CONTRIB_IMAGE=ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.142.0
FLAGD_IMAGE=ghcr.io/open-feature/flagd:v0.12.9
FLAGD_IMAGE=ghcr.io/open-feature/flagd:v0.16.0
GRAFANA_IMAGE=grafana/grafana:12.3.1
JAEGERTRACING_IMAGE=jaegertracing/jaeger:2.12.0
OPENSEARCH_IMAGE=opensearchproject/opensearch:3.4.0
OPENSEARCH_DOCKERFILE=./src/opensearch/Dockerfile
POSTGRES_IMAGE=postgres:17.6
VALKEY_IMAGE=valkey/valkey:9.0.1-alpine3.23
POSTGRES_IMAGE=postgres:18.4
VALKEY_IMAGE=ghcr.io/valkey-io/valkey:9.0.4-alpine3.23
TRACETEST_IMAGE=kubeshop/tracetest:${TRACETEST_IMAGE_VERSION}

# Demo Platform
Expand All @@ -130,7 +130,8 @@ ENV_PLATFORM=local
IPV6_ENABLED=false

# OpenTelemetry Resource Definitions
OTEL_RESOURCE_ATTRIBUTES=service.namespace=opentelemetry-demo,service.version=${IMAGE_VERSION}
OTEL_SERVICE_NAMESPACE=opentelemetry-demo
OTEL_RESOURCE_ATTRIBUTES=service.namespace=${OTEL_SERVICE_NAMESPACE},service.version=${IMAGE_VERSION}

# Metrics Temporality
OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE=cumulative
Expand All @@ -154,6 +155,7 @@ PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:8080/otlp-http/v1/tra
# Ad Service
AD_PORT=9555
AD_ADDR=ad:${AD_PORT}
AD_PROMETHEUS_PORT=9465

# Cart Service
CART_PORT=7070
Expand All @@ -180,18 +182,19 @@ ENVOY_ADDR=0.0.0.0
ENVOY_PORT=8080
ENVOY_ADMIN_PORT=10000
FRONTEND_HOST=frontend
FRONTEND_PROXY_ADDR=frontend-proxy:${ENVOY_PORT}

# Image Provider
IMAGE_PROVIDER_HOST=image-provider
IMAGE_PROVIDER_PORT=8081

# Telemetry Documentation
TELEMETRY_DOCS_HOST=telemetry-docs
TELEMETRY_DOCS_PORT=8000

# Load Generator
LOCUST_WEB_PORT=8089
LOCUST_USERS=5
LOCUST_HOST=http://frontend-proxy:${ENVOY_PORT}
LOCUST_WEB_HOST=load-generator
LOCUST_AUTOSTART=true
LOCUST_HEADLESS=false
LOAD_GENERATOR_VUS=5
K6_TARGET_URL=http://${FRONTEND_PROXY_ADDR}

# Payment Service
PAYMENT_PORT=50051
Expand All @@ -201,10 +204,6 @@ PAYMENT_ADDR=payment:${PAYMENT_PORT}
PRODUCT_CATALOG_PORT=3550
PRODUCT_CATALOG_ADDR=product-catalog:${PRODUCT_CATALOG_PORT}

# Product Reviews Service
PRODUCT_REVIEWS_PORT=3551
PRODUCT_REVIEWS_ADDR=product-reviews:${PRODUCT_REVIEWS_PORT}

# Quote Service
QUOTE_PORT=8090
QUOTE_ADDR=http://quote:${QUOTE_PORT}
Expand All @@ -229,28 +228,16 @@ FLAGD_OFREP_PORT=8016
FLAGD_UI_HOST=flagd-ui
FLAGD_UI_PORT=4000

# Kafka
KAFKA_PORT=9092
KAFKA_HOST=kafka
KAFKA_ADDR=${KAFKA_HOST}:${KAFKA_PORT}

# LLM service
LLM_HOST=llm
LLM_PORT=8000
LLM_BASE_URL=http://${LLM_HOST}:${LLM_PORT}/v1
LLM_MODEL=astronomy-llm
OPENAI_API_KEY=dummy

# Valkey
VALKEY_PORT=6379
VALKEY_ADDR=valkey-cart:${VALKEY_PORT}

# Postgres
POSTGRES_HOST=postgresql
POSTGRES_HOST=astronomy-db
POSTGRES_PORT=5432
POSTGRES_DB=otel
POSTGRES_PASSWORD=otel
POSTGRES_USER=
POSTGRES_PASSWORD=changeit
POSTGRES_ASTRONOMY_PASSWORD=astronomy_password # defined in docker-compose/opentelemetry-demo/src/postgresql/init.sql
POSTGRES_MONITORING_PASSWORD=monitoring_password # defined in docker-compose/opentelemetry-demo/src/postgresql/init.sql

# ********************
# Telemetry Components
Expand All @@ -264,5 +251,18 @@ JAEGER_HOST=jaeger
JAEGER_UI_PORT=16686
JAEGER_GRPC_PORT=4317

# Frontend-proxy envoy clusters for demo 3.0.0 backends not run by this stack
# (chatbot, firepit/profiles, opamp-server). The 3.0.0 frontend-proxy image's
# baked-in envoy bootstrap defines STRICT_DNS clusters for these; an empty
# address fails proto validation and the proxy crash-loops. Values mirror the
# upstream 3.0.0 defaults; the hosts do not resolve here, so the clusters stay
# unhealthy at runtime without blocking startup (same pattern as grafana/jaeger).
CHATBOT_HOST=chatbot
CHATBOT_PORT=7860
FIREPIT_HOST=firepit
FIREPIT_PORT=8080
OPAMP_SERVER_HOST=opamp-server
OPAMP_SERVER_UI_PORT=4321

# Java Options (workaround for OSX JDK bug)
_JAVA_OPTIONS=
Loading
Loading