Merge branch 'main' into accountingservice-change

open-telemetry · May 6, 2024 · 6b0879f · 6b0879f
2 parents a35283c + ab59acc
commit 6b0879f
Show file tree

Hide file tree

Showing 12 changed files with 422 additions and 363 deletions.
diff --git a/.env b/.env
@@ -6,16 +6,15 @@ IMAGE_NAME=ghcr.io/open-telemetry/demo
 DEMO_VERSION=latest
 
 # Dependent images
-COLLECTOR_CONTRIB_IMAGE=otel/opentelemetry-collector-contrib:0.97.0
-GRAFANA_IMAGE=grafana/grafana:10.4.1
+COLLECTOR_CONTRIB_IMAGE=otel/opentelemetry-collector-contrib:0.99.0
+GRAFANA_IMAGE=grafana/grafana:10.4.2
 JAEGERTRACING_IMAGE=jaegertracing/all-in-one:1.55
 # must also update version field in /src/grafana/provisioning/datasources/opensearch.yml
 OPENSEARCH_IMAGE=opensearchproject/opensearch:2.12.0
 POSTGRES_IMAGE=postgres:16.2
-PROMETHEUS_IMAGE=quay.io/prometheus/prometheus:v2.51.1
+PROMETHEUS_IMAGE=quay.io/prometheus/prometheus:v2.51.2
 REDIS_IMAGE=redis:7.2-alpine
-TRACETEST_IMAGE_VERSION=v0.16.0
-TRACETEST_IMAGE=kubeshop/tracetest:${TRACETEST_IMAGE_VERSION}
+TRACETEST_IMAGE=kubeshop/tracetest:v1.0.0
 
 # Demo Platform
 ENV_PLATFORM=local
@@ -56,17 +55,6 @@ CURRENCY_SERVICE_ADDR=currencyservice:${CURRENCY_SERVICE_PORT}
 EMAIL_SERVICE_PORT=6060
 EMAIL_SERVICE_ADDR=http://emailservice:${EMAIL_SERVICE_PORT}
 
-# Feature Flag Service
-FEATURE_FLAG_SERVICE_PORT=8081
-FEATURE_FLAG_SERVICE_ADDR=featureflagservice:${FEATURE_FLAG_SERVICE_PORT}
-FEATURE_FLAG_SERVICE_HOST=feature-flag-service
-FEATURE_FLAG_GRPC_SERVICE_PORT=50053
-FEATURE_FLAG_GRPC_SERVICE_ADDR=featureflagservice:${FEATURE_FLAG_GRPC_SERVICE_PORT}
-
-# flagd
-FLAGD_HOST=flagd
-FLAGD_PORT=8013
-
 # Frontend
 FRONTEND_PORT=8080
 FRONTEND_ADDR=frontend:${FRONTEND_PORT}
@@ -111,6 +99,10 @@ SHIPPING_SERVICE_ADDR=shippingservice:${SHIPPING_SERVICE_PORT}
 # ******************
 # Dependent Services
 # ******************
+# flagd
+FLAGD_HOST=flagd
+FLAGD_PORT=8013
+
 # Kafka
 KAFKA_SERVICE_PORT=9092
 KAFKA_SERVICE_ADDR=kafka:${KAFKA_SERVICE_PORT}

diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
@@ -36,6 +36,10 @@ jobs:
       fail-fast: false
       matrix:
         file_tag:
+          - file: ./src/accountingservice/Dockerfile
+            tag_suffix: accountingservice
+            context: ./
+            setup-qemu: true
           - file: ./src/adservice/Dockerfile
             tag_suffix: adservice
             context: ./
@@ -56,6 +60,10 @@ jobs:
             tag_suffix: emailservice
             context: ./src/emailservice
             setup-qemu: true
+          - file: ./src/frauddetectionservice/Dockerfile
+            tag_suffix: frauddetectionservice
+            context: ./
+            setup-qemu: true
           - file: ./src/frontend/Dockerfile
             tag_suffix: frontend
             context: ./
@@ -64,6 +72,18 @@ jobs:
             tag_suffix: frontendproxy
             context: ./
             setup-qemu: true
+          - file: ./src/frontend/Dockerfile.cypress
+            tag_suffix: frontend-tests
+            context: ./
+            setup-qemu: true
+          - file: ./src/imageprovider/Dockerfile
+            tag_suffix: imageprovider
+            context: ./
+            setup-qemu: true
+          - file: ./src/kafka/Dockerfile
+            tag_suffix: kafka
+            context: ./
+            setup-qemu: true
           - file: ./src/loadgenerator/Dockerfile
             tag_suffix: loadgenerator
             context: ./
@@ -80,28 +100,12 @@ jobs:
             tag_suffix: quoteservice
             context: ./
             setup-qemu: true
-          - file: ./src/shippingservice/Dockerfile
-            tag_suffix: shippingservice
-            context: ./
-            setup-qemu: true
           - file: ./src/recommendationservice/Dockerfile
             tag_suffix: recommendationservice
             context: ./
             setup-qemu: true
-          - file: ./src/kafka/Dockerfile
-            tag_suffix: kafka
-            context: ./
-            setup-qemu: true
-          - file: ./src/accountingservice/Dockerfile
-            tag_suffix: accountingservice
-            context: ./
-            setup-qemu: true
-          - file: ./src/frauddetectionservice/Dockerfile
-            tag_suffix: frauddetectionservice
-            context: ./
-            setup-qemu: true
-          - file: ./src/frontend/Dockerfile.cypress
-            tag_suffix: frontend-tests
+          - file: ./src/shippingservice/Dockerfile
+            tag_suffix: shippingservice
             context: ./
             setup-qemu: true
           - file: ./test/tracetesting/Dockerfile

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,10 @@ the release.
   ([#1528](https://github.com/open-telemetry/opentelemetry-demo/pull/1528))
 * [otelcollector] Add `redisreceiver`
   ([#1537](https://github.com/open-telemetry/opentelemetry-demo/pull/1537))
+* [traceBasedTests] update to v1.0.0
+  ([#1551](https://github.com/open-telemetry/opentelemetry-demo/pull/1551))
+* [flagd] update to 0.10.1 and set 50M memory limit
+  ([#1554](https://github.com/open-telemetry/opentelemetry-demo/pull/1554))
 
 ## 1.9.0
 

diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml
@@ -1,7 +1,6 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-version: '3.9'
 x-default-logging: &logging
   driver: "json-file"
   options:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,6 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-version: '3.9'
 x-default-logging: &logging
   driver: "json-file"
   options:
@@ -215,26 +214,6 @@ services:
         condition: service_started
     logging: *logging
 
-  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
-    volumes:
-      - ./src/flagd:/etc/flagd
-    logging:
-      *logging
-
   # Fraud Detection service
   frauddetectionservice:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-frauddetectionservice
@@ -585,6 +564,31 @@ services:
   # ******************
   # Dependent Services
   # ******************
+  # Flagd, feature flagging service
+  flagd:
+    image: ghcr.io/open-feature/flagd:v0.10.1
+    container_name: flagd
+    deploy:
+      resources:
+        limits:
+          memory: 50M
+    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
+    volumes:
+      - ./src/flagd:/etc/flagd
+    logging:
+      *logging
+
   # Kafka used by Checkout, Accounting, and Fraud Detection services
   kafka:
     image: ${IMAGE_NAME}:${DEMO_VERSION}-kafka
@@ -778,8 +782,6 @@ services:
     build:
       context: ./
       dockerfile: ./test/tracetesting/Dockerfile
-      args:
-        - TRACETEST_IMAGE_VERSION
     environment:
       - AD_SERVICE_ADDR
       - CART_SERVICE_ADDR