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.

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

[chore] sync memory limits to long-running tests #781

Merged
merged 3 commits into from
Mar 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ tls_certificate_check and bump to OTP-25
([#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))

## v0.1.0

Expand Down
33 changes: 23 additions & 10 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ services:
deploy:
resources:
limits:
memory: 200M
memory: 175M
restart: unless-stopped
ports:
- "${FEATURE_FLAG_SERVICE_PORT}" # Feature Flag Service UI
Expand Down Expand Up @@ -322,10 +322,14 @@ services:
# Frontend Proxy (Envoy)
frontendproxy:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-frontendproxy
container_name: frontend-proxy
build:
context: ./
dockerfile: src/frontendproxy/Dockerfile
container_name: frontend-proxy
deploy:
resources:
limits:
memory: 50M
ports:
- "${ENVOY_PORT}:${ENVOY_PORT}"
- 10000:10000
Expand Down Expand Up @@ -391,7 +395,7 @@ services:
deploy:
resources:
limits:
memory: 70M
memory: 120M
restart: unless-stopped
ports:
- "${PAYMENT_SERVICE_PORT}"
Expand Down Expand Up @@ -446,7 +450,7 @@ services:
deploy:
resources:
limits:
memory: 30M
memory: 40M
restart: unless-stopped
ports:
- "${QUOTE_SERVICE_PORT}"
Expand Down Expand Up @@ -531,18 +535,18 @@ services:
deploy:
resources:
limits:
memory: 200M
memory: 120M
restart: unless-stopped
environment:
- POSTGRES_USER=ffs
- POSTGRES_DB=ffs
- POSTGRES_PASSWORD=ffs
logging: *logging
healthcheck:
test: ["CMD-SHELL", "pg_isready -d ffs -U ffs"]
interval: 10s
timeout: 5s
retries: 5
logging: *logging

# Kafka used by Checkout, Accounting, and Fraud Detection services
kafka:
Expand All @@ -556,7 +560,7 @@ services:
deploy:
resources:
limits:
memory: 800M
memory: 750M
restart: unless-stopped
environment:
- KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092
Expand All @@ -565,13 +569,14 @@ services:
- OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
- OTEL_RESOURCE_ATTRIBUTES
- OTEL_SERVICE_NAME=kafka
logging: *logging
- KAFKA_HEAP_OPTS=-Xmx400m -Xms400m
healthcheck:
test: nc -z kafka 9092
start_period: 10s
interval: 5s
timeout: 10s
retries: 10
logging: *logging

# Redis used by Cart service
redis-cart:
Expand Down Expand Up @@ -605,7 +610,7 @@ services:
deploy:
resources:
limits:
memory: 275M
memory: 300M
restart: unless-stopped
ports:
- "${JAEGER_SERVICE_PORT}" # Jaeger UI
Expand All @@ -619,6 +624,10 @@ services:
grafana:
image: grafana/grafana:9.1.0
container_name: grafana
deploy:
resources:
limits:
memory: 75M
volumes:
- ./src/grafana/grafana.ini:/etc/grafana/grafana.ini
- ./src/grafana/provisioning/:/etc/grafana/provisioning/
Expand All @@ -633,7 +642,7 @@ services:
deploy:
resources:
limits:
memory: 100M
memory: 125M
restart: unless-stopped
command: [ "--config=/etc/otelcol-config.yml", "--config=/etc/otelcol-config-extras.yml" ]
volumes:
Expand Down Expand Up @@ -663,6 +672,10 @@ services:
- --enable-feature=exemplar-storage
volumes:
- ./src/prometheus/prometheus-config.yaml:/etc/prometheus/prometheus-config.yaml
deploy:
resources:
limits:
memory: 300M
ports:
- "${PROMETHEUS_SERVICE_PORT}:${PROMETHEUS_SERVICE_PORT}"
logging: *logging
Expand Down