Skip to content

Commit 4a3ff11

Browse files
puckpuckjulianocosta89
authored andcommitted
[chore] sync memory limits to long-running tests (open-telemetry#781)
* sync memory limits to long-running tests Signed-off-by: Pierre Tessier <[email protected]> * sync memory limits to long-running tests Signed-off-by: Pierre Tessier <[email protected]> --------- Signed-off-by: Pierre Tessier <[email protected]> Co-authored-by: Juliano Costa <[email protected]>
1 parent 16c01d9 commit 4a3ff11

File tree

2 files changed

+25
-10
lines changed

2 files changed

+25
-10
lines changed

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ tls_certificate_check and bump to OTP-25
2424
([#760](https://github.com/open-telemetry/opentelemetry-demo/pull/760))
2525
* [chore] update for Mac M2 architecture
2626
([#764](https://github.com/open-telemetry/opentelemetry-demo/pull/764))
27+
* [chore] align memory limits with Helm chart
28+
([#781](https://github.com/open-telemetry/opentelemetry-demo/pull/781))
2729

2830
## v0.1.0
2931

docker-compose.yml

+23-10
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ services:
224224
deploy:
225225
resources:
226226
limits:
227-
memory: 200M
227+
memory: 175M
228228
restart: unless-stopped
229229
ports:
230230
- "${FEATURE_FLAG_SERVICE_PORT}" # Feature Flag Service UI
@@ -322,10 +322,14 @@ services:
322322
# Frontend Proxy (Envoy)
323323
frontendproxy:
324324
image: ${IMAGE_NAME}:${IMAGE_VERSION}-frontendproxy
325+
container_name: frontend-proxy
325326
build:
326327
context: ./
327328
dockerfile: src/frontendproxy/Dockerfile
328-
container_name: frontend-proxy
329+
deploy:
330+
resources:
331+
limits:
332+
memory: 50M
329333
ports:
330334
- "${ENVOY_PORT}:${ENVOY_PORT}"
331335
- 10000:10000
@@ -391,7 +395,7 @@ services:
391395
deploy:
392396
resources:
393397
limits:
394-
memory: 70M
398+
memory: 120M
395399
restart: unless-stopped
396400
ports:
397401
- "${PAYMENT_SERVICE_PORT}"
@@ -446,7 +450,7 @@ services:
446450
deploy:
447451
resources:
448452
limits:
449-
memory: 30M
453+
memory: 40M
450454
restart: unless-stopped
451455
ports:
452456
- "${QUOTE_SERVICE_PORT}"
@@ -531,18 +535,18 @@ services:
531535
deploy:
532536
resources:
533537
limits:
534-
memory: 200M
538+
memory: 120M
535539
restart: unless-stopped
536540
environment:
537541
- POSTGRES_USER=ffs
538542
- POSTGRES_DB=ffs
539543
- POSTGRES_PASSWORD=ffs
540-
logging: *logging
541544
healthcheck:
542545
test: ["CMD-SHELL", "pg_isready -d ffs -U ffs"]
543546
interval: 10s
544547
timeout: 5s
545548
retries: 5
549+
logging: *logging
546550

547551
# Kafka used by Checkout, Accounting, and Fraud Detection services
548552
kafka:
@@ -556,7 +560,7 @@ services:
556560
deploy:
557561
resources:
558562
limits:
559-
memory: 800M
563+
memory: 750M
560564
restart: unless-stopped
561565
environment:
562566
- KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092
@@ -565,13 +569,14 @@ services:
565569
- OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
566570
- OTEL_RESOURCE_ATTRIBUTES
567571
- OTEL_SERVICE_NAME=kafka
568-
logging: *logging
572+
- KAFKA_HEAP_OPTS=-Xmx400m -Xms400m
569573
healthcheck:
570574
test: nc -z kafka 9092
571575
start_period: 10s
572576
interval: 5s
573577
timeout: 10s
574578
retries: 10
579+
logging: *logging
575580

576581
# Redis used by Cart service
577582
redis-cart:
@@ -605,7 +610,7 @@ services:
605610
deploy:
606611
resources:
607612
limits:
608-
memory: 275M
613+
memory: 300M
609614
restart: unless-stopped
610615
ports:
611616
- "${JAEGER_SERVICE_PORT}" # Jaeger UI
@@ -619,6 +624,10 @@ services:
619624
grafana:
620625
image: grafana/grafana:9.1.0
621626
container_name: grafana
627+
deploy:
628+
resources:
629+
limits:
630+
memory: 75M
622631
volumes:
623632
- ./src/grafana/grafana.ini:/etc/grafana/grafana.ini
624633
- ./src/grafana/provisioning/:/etc/grafana/provisioning/
@@ -633,7 +642,7 @@ services:
633642
deploy:
634643
resources:
635644
limits:
636-
memory: 100M
645+
memory: 125M
637646
restart: unless-stopped
638647
command: [ "--config=/etc/otelcol-config.yml", "--config=/etc/otelcol-config-extras.yml" ]
639648
volumes:
@@ -663,6 +672,10 @@ services:
663672
- --enable-feature=exemplar-storage
664673
volumes:
665674
- ./src/prometheus/prometheus-config.yaml:/etc/prometheus/prometheus-config.yaml
675+
deploy:
676+
resources:
677+
limits:
678+
memory: 300M
666679
ports:
667680
- "${PROMETHEUS_SERVICE_PORT}:${PROMETHEUS_SERVICE_PORT}"
668681
logging: *logging

0 commit comments

Comments
 (0)