Revert docker-compose

elastic · Sep 9, 2024 · 6b7cf7f · 6b7cf7f
1 parent 4348916
commit 6b7cf7f
Showing 1 changed file with 12 additions and 13 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -182,7 +182,7 @@ services:
       - CURRENCY_SERVICE_PORT
       - VERSION=${IMAGE_VERSION}
       - OTEL_EXPORTER_OTLP_ENDPOINT
-      - OTEL_RESOURCE_ATTRIBUTES=${OTEL_RESOURCE_ATTRIBUTES},service.name=currencyservice # The C++ SDK does not support OTEL_SERVICE_NAME
+      - OTEL_RESOURCE_ATTRIBUTES=${OTEL_RESOURCE_ATTRIBUTES},service.name=currencyservice   # The C++ SDK does not support OTEL_SERVICE_NAME
     depends_on:
       otelcol:
         condition: service_started
@@ -517,7 +517,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: 500M # This is high to enable supporting the recommendationCache feature flag use case
+          memory: 500M               # This is high to enable supporting the recommendationCache feature flag use case
     restart: unless-stopped
     ports:
       - "${RECOMMENDATION_SERVICE_PORT}"
@@ -585,12 +585,17 @@ services:
       - FLAGD_METRICS_EXPORTER=otel
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=flagd
-    command: ["start", "--uri", "file:./etc/flagd/demo.flagd.json"]
+    command: [
+      "start",
+      "--uri",
+      "file:./etc/flagd/demo.flagd.json"
+    ]
     ports:
       - 8013
     volumes:
       - ./src/flagd:/etc/flagd
-    logging: *logging
+    logging:
+      *logging
 
   # Kafka used by Checkout, Accounting, and Fraud Detection services
   kafka:
@@ -613,7 +618,6 @@ services:
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=kafka
       - KAFKA_HEAP_OPTS=-Xmx400m -Xms400m
-      - OTEL_INFERRED_SPANS_ENABLED=false
     healthcheck:
       test: nc -z kafka 9092
       start_period: 10s
@@ -636,6 +640,7 @@ services:
       - "${VALKEY_PORT}"
     logging: *logging
 
+
   # ********************
   # Telemetry Components
   # ********************
@@ -655,7 +660,7 @@ services:
           memory: 400M
     restart: unless-stopped
     ports:
-      - "${JAEGER_SERVICE_PORT}" # Jaeger UI
+      - "${JAEGER_SERVICE_PORT}"         # Jaeger UI
       - "${OTEL_COLLECTOR_PORT_GRPC}"
     environment:
       - METRICS_STORAGE_TYPE=prometheus
@@ -688,13 +693,7 @@ services:
         limits:
           memory: 200M
     restart: unless-stopped
-    command:
-      [
-        "--config",
-        "/etc/otelcol-config.yml",
-        "--config",
-        "/etc/otelcol-config-extras.yml",
-      ]
+    command: ["--config", "/etc/otelcol-config.yml", "--config", "/etc/otelcol-config-extras.yml" ]
     user: 0:0
     volumes:
       - ${HOST_FILESYSTEM}:/hostfs:ro