From 6a81eb0c60baf2c8a33d7759ef34d8188f90fd41 Mon Sep 17 00:00:00 2001 From: Jorge Padilla Date: Wed, 29 Nov 2023 18:30:34 -0500 Subject: [PATCH 1/3] fix: pass proper env var to tracetesting Dockerfile --- docker-compose.minimal.yml | 2 ++ docker-compose.yml | 2 ++ test/tracetesting/Dockerfile | 2 ++ 3 files changed, 6 insertions(+) diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml index 20617d9df9..08bfeb24f5 100644 --- a/docker-compose.minimal.yml +++ b/docker-compose.minimal.yml @@ -639,6 +639,8 @@ services: build: context: ./ dockerfile: ./test/tracetesting/Dockerfile + args: + - TRACETEST_IMAGE_VERSION environment: - AD_SERVICE_ADDR - CART_SERVICE_ADDR diff --git a/docker-compose.yml b/docker-compose.yml index d224dad9a4..934da68c22 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -784,6 +784,8 @@ services: build: context: ./ dockerfile: ./test/tracetesting/Dockerfile + args: + - TRACETEST_IMAGE_VERSION environment: - AD_SERVICE_ADDR - CART_SERVICE_ADDR diff --git a/test/tracetesting/Dockerfile b/test/tracetesting/Dockerfile index 392f3d986c..c5c8d4d18d 100644 --- a/test/tracetesting/Dockerfile +++ b/test/tracetesting/Dockerfile @@ -6,6 +6,8 @@ FROM alpine WORKDIR /app +ARG TRACETEST_IMAGE_VERSION + RUN apk --update add bash jq curl RUN curl -L https://raw.githubusercontent.com/kubeshop/tracetest/main/install-cli.sh | bash -s -- ${TRACETEST_IMAGE_VERSION} From afce589f7371e70fec4284af9640c29ba416d968 Mon Sep 17 00:00:00 2001 From: Jorge Padilla Date: Thu, 30 Nov 2023 09:32:51 -0500 Subject: [PATCH 2/3] chore: update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 17dc0c89e0..3f7faa89ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ release. ## Unreleased +* fix env var for pinning trace-based test tool version + ([#1283](https://github.com/open-telemetry/opentelemetry-demo/pull/1283)) * [currencyservice] bring back multistage build ([#1276](https://github.com/open-telemetry/opentelemetry-demo/pull/1276)) * [currencyservice]: update opentelemetry-cpp to 1.12.0 From b7bb6fd264695ce88f9992d4ea9f1744c4aebff6 Mon Sep 17 00:00:00 2001 From: Jorge Padilla Date: Mon, 4 Dec 2023 09:17:45 -0500 Subject: [PATCH 3/3] chore: update changelog --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13056d85de..3c4451d3ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,6 @@ release. ## Unreleased -* fix env var for pinning trace-based test tool version - ([#1283](https://github.com/open-telemetry/opentelemetry-demo/pull/1283)) * [currencyservice] bring back multistage build ([#1276](https://github.com/open-telemetry/opentelemetry-demo/pull/1276)) * [currencyservice]: update opentelemetry-cpp to 1.12.0 @@ -25,6 +23,8 @@ release. ([#1266](https://github.com/open-telemetry/opentelemetry-demo/pull/1266)) * [accountingservice] Add additional attributes to Kafka spans ([#1286](https://github.com/open-telemetry/opentelemetry-demo/pull/1286)) +* fix env var for pinning trace-based test tool version + ([#1283](https://github.com/open-telemetry/opentelemetry-demo/pull/1283)) ## 1.6.0