From bbe68399af34d8b7e4551702f901b46618467c48 Mon Sep 17 00:00:00 2001
From: Pierre Tessier <pierre@pierretessier.com>
Date: Wed, 8 Mar 2023 00:27:24 -0500
Subject: [PATCH 1/2] sync memory limits to long-running tests

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>
---
 docker-compose.yml | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 4d0aeb10f6..42460c4fda 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -224,7 +224,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: 200M
+          memory: 175M
     restart: unless-stopped
     ports:
       - "${FEATURE_FLAG_SERVICE_PORT}"                                  # Feature Flag Service UI
@@ -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
@@ -391,7 +395,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: 70M
+          memory: 120M
     restart: unless-stopped
     ports:
       - "${PAYMENT_SERVICE_PORT}"
@@ -446,7 +450,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: 30M
+          memory: 40M
     restart: unless-stopped
     ports:
       - "${QUOTE_SERVICE_PORT}"
@@ -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:
@@ -556,7 +560,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: 800M
+          memory: 750M
     restart: unless-stopped
     environment:
       - KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092
@@ -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:
@@ -605,7 +610,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: 275M
+          memory: 300M
     restart: unless-stopped
     ports:
       - "${JAEGER_SERVICE_PORT}"                    # Jaeger UI
@@ -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/
@@ -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:
@@ -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

From c2c8544536b35863975c3fad7f8cd5711a90315a Mon Sep 17 00:00:00 2001
From: Pierre Tessier <pierre@pierretessier.com>
Date: Wed, 8 Mar 2023 00:29:58 -0500
Subject: [PATCH 2/2] sync memory limits to long-running tests

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>
---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72ff161e22..e54a4df70a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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