Merge branch 'main' into flagd.memory-limit

open-telemetry · May 1, 2024 · 9a05a0a · 9a05a0a
2 parents 320aac4 + 9027cfc
commit 9a05a0a
Show file tree

Hide file tree

Showing 10 changed files with 366 additions and 309 deletions.
diff --git a/.env b/.env
@@ -14,8 +14,7 @@ OPENSEARCH_IMAGE=opensearchproject/opensearch:2.12.0
 POSTGRES_IMAGE=postgres:16.2
 PROMETHEUS_IMAGE=quay.io/prometheus/prometheus:v2.51.1
 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

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,8 @@ 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))
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -783,8 +783,6 @@ services:
     build:
       context: ./
       dockerfile: ./test/tracetesting/Dockerfile
-      args:
-        - TRACETEST_IMAGE_VERSION
     environment:
       - AD_SERVICE_ADDR
       - CART_SERVICE_ADDR