applied changes for v1.9.0

signalfx · Apr 23, 2024 · 677d45c · 677d45c
1 parent 983874b
commit 677d45c
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 14 deletions.
diff --git a/splunk/docker-compose.yml b/splunk/docker-compose.yml
@@ -7,6 +7,7 @@ x-default-logging: &logging
   options:
     max-size: "5m"
     max-file: "2"
+    tag: "{{.Name}}"
 networks:
   default:
     name: opentelemetry-demo
@@ -209,6 +210,11 @@ services:
   flagd:
     image: ghcr.io/open-feature/flagd:v0.9.0
     container_name: flagd
+    environment:
+      - FLAGD_OTEL_COLLECTOR_URI=${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_GRPC}
+      - FLAGD_METRICS_EXPORTER=otel
+      - OTEL_RESOURCE_ATTRIBUTES
+      - OTEL_SERVICE_NAME=flagd
     command: ["start", "--uri", "file:./etc/flagd/demo.flagd.json"]
     ports:
       - 8013
@@ -233,6 +239,8 @@ services:
       - KAFKA_SERVICE_ADDR
       - OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_HTTP}
       - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
+      - OTEL_INSTRUMENTATION_KAFKA_EXPERIMENTAL_SPAN_ATTRIBUTES=true
+      - OTEL_INSTRUMENTATION_MESSAGING_EXPERIMENTAL_RECEIVE_TELEMETRY_ENABLED=true
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=frauddetectionservice
     depends_on:
@@ -294,6 +302,8 @@ services:
         condition: service_started
       otelcol:
         condition: service_started
+      imageprovider:
+        condition: service_started
     logging: *logging
   # Frontend Proxy (Envoy)
   frontendproxy:
@@ -320,6 +330,8 @@ services:
       - JAEGER_SERVICE_PORT
       - JAEGER_SERVICE_HOST
       - OTEL_COLLECTOR_HOST
+      - IMAGE_PROVIDER_HOST
+      - IMAGE_PROVIDER_PORT
       - OTEL_COLLECTOR_PORT_GRPC
       - OTEL_COLLECTOR_PORT_HTTP
       - OTEL_RESOURCE_ATTRIBUTES
@@ -329,6 +341,32 @@ services:
         condition: service_started
       loadgenerator:
         condition: service_started
+  # Imageprovider
+  imageprovider:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-imageprovider
+    container_name: imageprovider
+    build:
+      context: ./
+      dockerfile: ./src/imageprovider/Dockerfile
+      cache_from:
+        - ${IMAGE_NAME}:${IMAGE_VERSION}-imageprovider
+    deploy:
+      resources:
+        limits:
+          memory: 120M
+    restart: unless-stopped
+    ports:
+      - "${IMAGE_PROVIDER_PORT}"
+    environment:
+      - IMAGE_PROVIDER_PORT
+      - OTEL_COLLECTOR_HOST
+      - OTEL_COLLECTOR_PORT_GRPC
+      - OTEL_SERVICE_NAME=imageprovider
+      - OTEL_RESOURCE_ATTRIBUTES
+    depends_on:
+      otelcol:
+        condition: service_started
+    logging: *logging
   # Load Generator
   loadgenerator:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-loadgenerator
@@ -357,9 +395,14 @@ services:
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=loadgenerator
       - PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
+      - LOCUST_WEB_HOST=0.0.0.0
+      - FLAGD_HOST
+      - FLAGD_PORT
     depends_on:
       frontend:
         condition: service_started
+      flagd:
+        condition: service_started
     logging: *logging
   # Payment service
   paymentservice:
@@ -502,7 +545,7 @@ services:
     environment:
       - SHIPPING_SERVICE_PORT
       - QUOTE_SERVICE_ADDR
-      - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_GRPC}/v1/traces
+      - OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_GRPC}
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=shippingservice
     depends_on:
@@ -532,7 +575,7 @@ services:
       - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=kafka
-      - KAFKA_HEAP_OPTS=-Xmx200m -Xms200m
+      - KAFKA_HEAP_OPTS=-Xmx250m -Xms250m
     healthcheck:
       test: nc -z kafka 9092
       start_period: 10s

diff --git a/splunk/otelcol-config-filelog.yml b/splunk/otelcol-config-filelog.yml
@@ -112,9 +112,9 @@ receivers:
   # https://github.com/signalfx/signalfx-istio-adapter
   zipkin:
     endpoint: 0.0.0.0:9411
-  smartagent/redis:
-    type: collectd/redis
-    endpoint: "redis-cart:6379"
+  redis:
+    endpoint: redis-cart:6379
+    collection_interval: 10s
 
 processors:
   batch:
@@ -188,4 +188,4 @@ service:
         - batch
         - resourcedetection
       receivers:
-        - smartagent/redis
+        - redis
diff --git a/splunk/otelcol-config-fluentd.yml b/splunk/otelcol-config-fluentd.yml
@@ -65,9 +65,9 @@ receivers:
   # https://github.com/signalfx/signalfx-istio-adapter
   zipkin:
     endpoint: 0.0.0.0:9411
-  smartagent/redis:
-    type: collectd/redis
-    endpoint: "redis-cart:6379"
+  redis:
+    endpoint: redis-cart:6379
+    collection_interval: 10s
 
 processors:
   batch:
@@ -141,4 +141,4 @@ service:
         - batch
         - resourcedetection
       receivers:
-        - smartagent/redis
+        - redis
diff --git a/splunk/otelcol-config.yml b/splunk/otelcol-config.yml
@@ -65,9 +65,9 @@ receivers:
   # https://github.com/signalfx/signalfx-istio-adapter
   zipkin:
     endpoint: 0.0.0.0:9411
-  smartagent/redis:
-    type: collectd/redis
-    endpoint: "redis-cart:6379"
+  redis:
+    endpoint: redis-cart:6379
+    collection_interval: 10s
 
 processors:
   batch:
@@ -141,4 +141,4 @@ service:
         - batch
         - resourcedetection
       receivers:
-        - smartagent/redis
+        - redis