Skip to content
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

clean up environment variables #258

Merged
merged 1 commit into from
Aug 5, 2022
Merged

clean up environment variables #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 3 additions & 6 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,10 @@
IMAGE_VERSION=0.1.0
IMAGE_NAME=ghcr.io/open-telemetry/demo

# Jaeger
COLLECTOR_ZIPKIN_HOST_PORT=:9411

# Collector
OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://otelcol:4317
OTEL_EXPORTER_OTLP_ENDPOINT=${OTEL_EXPORTER_OTLP_TRACES_ENDPOINT}
OTEL_EXPORTER_OTLP_METRICS_ENDPOINT=${OTEL_EXPORTER_OTLP_TRACES_ENDPOINT}
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}

# Load Generator
USERS=10
Expand Down
27 changes: 12 additions & 15 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ services:
- "14250:14250"
- "14268:14268"
- "14269:14269"
environment:
- COLLECTOR_ZIPKIN_HOST_PORT
logging: *logging

# Collector
Expand Down Expand Up @@ -62,7 +60,7 @@ services:
- AD_SERVICE_PORT
- OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
- OTEL_EXPORTER_OTLP_METRICS_ENDPOINT
- OTEL_RESOURCE_ATTRIBUTES=service.name=adservice
- OTEL_SERVICE_NAME=adservice
depends_on:
- otelcol
logging: *logging
Expand All @@ -80,7 +78,7 @@ services:
- CART_SERVICE_PORT
- REDIS_ADDR
- OTEL_EXPORTER_OTLP_ENDPOINT
- OTEL_RESOURCE_ATTRIBUTES=service.name=cartservice
- OTEL_SERVICE_NAME=cartservice
- ASPNETCORE_URLS=http://*:${CART_SERVICE_PORT}
depends_on:
- redis-cart
Expand All @@ -105,7 +103,7 @@ services:
- PRODUCT_CATALOG_SERVICE_ADDR
- SHIPPING_SERVICE_ADDR
- OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
- OTEL_RESOURCE_ATTRIBUTES=service.name=checkoutservice
- OTEL_SERVICE_NAME=checkoutservice
depends_on:
- cartservice
- currencyservice
Expand All @@ -130,7 +128,7 @@ services:
environment:
- CURRENCY_SERVICE_PORT
- OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
- OTEL_RESOURCE_ATTRIBUTES=service.name=currencyservice
- OTEL_RESOURCE_ATTRIBUTES=service.name=currencyservice # The C++ SDK does not support OTEL_SERVICE_NAME
depends_on:
- otelcol
logging: *logging
Expand All @@ -147,7 +145,7 @@ services:
- APP_ENV=production
- EMAIL_SERVICE_PORT
- OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://otelcol:4318/v1/traces
- OTEL_RESOURCE_ATTRIBUTES=service.name=emailservice
- OTEL_SERVICE_NAME=emailservice
depends_on:
- otelcol
logging: *logging
Expand All @@ -171,8 +169,7 @@ services:
- RECOMMENDATION_SERVICE_ADDR
- SHIPPING_SERVICE_ADDR
- OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
- OTEL_RESOURCE_ATTRIBUTES=service.name=frontend
- OTEL_EXPORTER_OTLP_ENDPOINT
- OTEL_SERVICE_NAME=frontend
depends_on:
- adservice
- cartservice
Expand All @@ -196,7 +193,7 @@ services:
environment:
- PAYMENT_SERVICE_PORT
- OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
- OTEL_RESOURCE_ATTRIBUTES=service.name=paymentservice
- OTEL_SERVICE_NAME=paymentservice
depends_on:
- otelcol
logging: *logging
Expand All @@ -213,7 +210,7 @@ services:
environment:
- PRODUCT_CATALOG_SERVICE_PORT
- OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
- OTEL_RESOURCE_ATTRIBUTES=service.name=productcatalogservice
- OTEL_SERVICE_NAME=productcatalogservice
depends_on:
- otelcol
logging: *logging
Expand All @@ -235,7 +232,7 @@ services:
- PRODUCT_CATALOG_SERVICE_ADDR
- OTEL_PYTHON_LOG_CORRELATION=true
- OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
- OTEL_RESOURCE_ATTRIBUTES=service.name=recommendationservice
- OTEL_SERVICE_NAME=recommendationservice
logging: *logging

# ShippingService
Expand All @@ -250,7 +247,7 @@ services:
environment:
- SHIPPING_SERVICE_PORT
- OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
- OTEL_RESOURCE_ATTRIBUTES=service.name=shippingservice
- OTEL_SERVICE_NAME=shippingservice
depends_on:
- otelcol
logging: *logging
Expand All @@ -268,7 +265,7 @@ services:
- FEATURE_FLAG_SERVICE_PORT
- FEATURE_FLAG_GRPC_SERVICE_PORT
- OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
- OTEL_RESOURCE_ATTRIBUTES=service.name=featureflagservice
- OTEL_SERVICE_NAME=featureflagservice
- DATABASE_URL=ecto://ffs:ffs@ffs_postgres:5432/ffs
depends_on:
- ffs_postgres
Expand All @@ -294,7 +291,7 @@ services:
- FRONTEND_ADDR
- USERS
- OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
- OTEL_RESOURCE_ATTRIBUTES=service.name=loadgenerator
- OTEL_SERVICE_NAME=loadgenerator
- PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
depends_on:
- frontend
Expand Down