Skip to content

Commit 6b7cf7f

Browse files
committed
Revert docker-compose
1 parent 4348916 commit 6b7cf7f

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

docker-compose.yml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ services:
182182
- CURRENCY_SERVICE_PORT
183183
- VERSION=${IMAGE_VERSION}
184184
- OTEL_EXPORTER_OTLP_ENDPOINT
185-
- OTEL_RESOURCE_ATTRIBUTES=${OTEL_RESOURCE_ATTRIBUTES},service.name=currencyservice # The C++ SDK does not support OTEL_SERVICE_NAME
185+
- OTEL_RESOURCE_ATTRIBUTES=${OTEL_RESOURCE_ATTRIBUTES},service.name=currencyservice # The C++ SDK does not support OTEL_SERVICE_NAME
186186
depends_on:
187187
otelcol:
188188
condition: service_started
@@ -517,7 +517,7 @@ services:
517517
deploy:
518518
resources:
519519
limits:
520-
memory: 500M # This is high to enable supporting the recommendationCache feature flag use case
520+
memory: 500M # This is high to enable supporting the recommendationCache feature flag use case
521521
restart: unless-stopped
522522
ports:
523523
- "${RECOMMENDATION_SERVICE_PORT}"
@@ -585,12 +585,17 @@ services:
585585
- FLAGD_METRICS_EXPORTER=otel
586586
- OTEL_RESOURCE_ATTRIBUTES
587587
- OTEL_SERVICE_NAME=flagd
588-
command: ["start", "--uri", "file:./etc/flagd/demo.flagd.json"]
588+
command: [
589+
"start",
590+
"--uri",
591+
"file:./etc/flagd/demo.flagd.json"
592+
]
589593
ports:
590594
- 8013
591595
volumes:
592596
- ./src/flagd:/etc/flagd
593-
logging: *logging
597+
logging:
598+
*logging
594599

595600
# Kafka used by Checkout, Accounting, and Fraud Detection services
596601
kafka:
@@ -613,7 +618,6 @@ services:
613618
- OTEL_RESOURCE_ATTRIBUTES
614619
- OTEL_SERVICE_NAME=kafka
615620
- KAFKA_HEAP_OPTS=-Xmx400m -Xms400m
616-
- OTEL_INFERRED_SPANS_ENABLED=false
617621
healthcheck:
618622
test: nc -z kafka 9092
619623
start_period: 10s
@@ -636,6 +640,7 @@ services:
636640
- "${VALKEY_PORT}"
637641
logging: *logging
638642

643+
639644
# ********************
640645
# Telemetry Components
641646
# ********************
@@ -655,7 +660,7 @@ services:
655660
memory: 400M
656661
restart: unless-stopped
657662
ports:
658-
- "${JAEGER_SERVICE_PORT}" # Jaeger UI
663+
- "${JAEGER_SERVICE_PORT}" # Jaeger UI
659664
- "${OTEL_COLLECTOR_PORT_GRPC}"
660665
environment:
661666
- METRICS_STORAGE_TYPE=prometheus
@@ -688,13 +693,7 @@ services:
688693
limits:
689694
memory: 200M
690695
restart: unless-stopped
691-
command:
692-
[
693-
"--config",
694-
"/etc/otelcol-config.yml",
695-
"--config",
696-
"/etc/otelcol-config-extras.yml",
697-
]
696+
command: ["--config", "/etc/otelcol-config.yml", "--config", "/etc/otelcol-config-extras.yml" ]
698697
user: 0:0
699698
volumes:
700699
- ${HOST_FILESYSTEM}:/hostfs:ro

0 commit comments

Comments
 (0)