From 0b9bffc73179df414ccf163560c18cc1823f8ffd Mon Sep 17 00:00:00 2001
From: girodav <1390902+girodav@users.noreply.github.com>
Date: Wed, 29 Oct 2025 09:34:11 +0000
Subject: [PATCH 1/7] Bump stack version
---
.env.override | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.env.override b/.env.override
index 77f3f5a544..cbf5bc7c82 100644
--- a/.env.override
+++ b/.env.override
@@ -16,7 +16,7 @@ KAFKA_SERVICE_DOCKERFILE=./src/kafka/Dockerfile.elastic
# Elastic Collector
# *********************
ELASTIC_AGENT_OTEL=true
-COLLECTOR_CONTRIB_IMAGE="docker.elastic.co/elastic-agent/elastic-agent:9.1.3"
+COLLECTOR_CONTRIB_IMAGE="docker.elastic.co/elastic-agent/elastic-agent:9.2.0"
OTEL_COLLECTOR_CONFIG="./src/otel-collector/otelcol-elastic-config.yaml"
ELASTICSEARCH_ENDPOINT="YOUR_ENDPOINT"
ELASTICSEARCH_API_KEY="YOUR_API_KEY"
From 9b7ccba30518d656e2b7db1a502d41f7e34f445b Mon Sep 17 00:00:00 2001
From: girodav <1390902+girodav@users.noreply.github.com>
Date: Wed, 29 Oct 2025 09:34:42 +0000
Subject: [PATCH 2/7] Bump edot python version to 1.9.0
---
src/load-generator/requirements.txt | 2 +-
src/recommendation/requirements.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/load-generator/requirements.txt b/src/load-generator/requirements.txt
index 8fafa9aaa7..2b4ba69ab9 100644
--- a/src/load-generator/requirements.txt
+++ b/src/load-generator/requirements.txt
@@ -5,7 +5,7 @@ charset-normalizer==3.4.1
click==8.1.8
configargparse==1.7
deprecated==1.2.18
-elastic-opentelemetry==1.8.0
+elastic-opentelemetry==1.9.0
Flask==3.1.2
flask-basicauth==0.2.0
flask-cors==5.0.1
diff --git a/src/recommendation/requirements.txt b/src/recommendation/requirements.txt
index 9442fac1cd..1135d0e080 100644
--- a/src/recommendation/requirements.txt
+++ b/src/recommendation/requirements.txt
@@ -1,7 +1,7 @@
grpcio-health-checking==1.71.0
grpcio==1.71.0
-elastic-opentelemetry==1.8.0
+elastic-opentelemetry==1.9.0
python-dotenv==1.1.1
python-json-logger==3.3.0
From f6b06573485c3d7916c710f0c77d30990e12ce86 Mon Sep 17 00:00:00 2001
From: girodav <1390902+girodav@users.noreply.github.com>
Date: Wed, 29 Oct 2025 09:40:23 +0000
Subject: [PATCH 3/7] Bump edot nodejs sdk to 1.5.0
---
src/payment/package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/payment/package.json b/src/payment/package.json
index 9c90e23ca4..a5c476cbed 100644
--- a/src/payment/package.json
+++ b/src/payment/package.json
@@ -11,7 +11,7 @@
"author": "Jonathan Lui",
"license": "ISC",
"dependencies": {
- "@elastic/opentelemetry-node": "^1.0.0",
+ "@elastic/opentelemetry-node": "1.5.0",
"@grpc/grpc-js": "1.12.6",
"@grpc/proto-loader": "0.8.0",
"@openfeature/flagd-provider": "0.13.3",
From 3a8b969a6ed0d7b67b42aa83880190ec43d6aef4 Mon Sep 17 00:00:00 2001
From: girodav <1390902+girodav@users.noreply.github.com>
Date: Wed, 29 Oct 2025 09:48:05 +0000
Subject: [PATCH 4/7] Bump edot dotnet sdk version to 1.1.0
---
src/cart/src/Directory.Build.props | 2 +-
src/cart/src/cart.csproj | 20 ++++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/cart/src/Directory.Build.props b/src/cart/src/Directory.Build.props
index 046533d15d..9ac6bb9033 100644
--- a/src/cart/src/Directory.Build.props
+++ b/src/cart/src/Directory.Build.props
@@ -1,5 +1,5 @@
-
+
diff --git a/src/cart/src/cart.csproj b/src/cart/src/cart.csproj
index 4092cc1f05..489b84d030 100644
--- a/src/cart/src/cart.csproj
+++ b/src/cart/src/cart.csproj
@@ -18,16 +18,16 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
From 593e4b2971ef4ed5fdb433f87df278c0a46f978a Mon Sep 17 00:00:00 2001
From: girodav <1390902+girodav@users.noreply.github.com>
Date: Wed, 29 Oct 2025 09:57:44 +0000
Subject: [PATCH 5/7] Bump image version to 2.1.5 for next release
---
.env.override | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.env.override b/.env.override
index cbf5bc7c82..ae6a318a77 100644
--- a/.env.override
+++ b/.env.override
@@ -2,7 +2,7 @@
# PLACE YOUR .env ENVIRONMENT VARIABLES OVERRIDES IN THIS FILE
# Demo Elastic App version
-IMAGE_VERSION=2.1.4
+IMAGE_VERSION=2.1.5
IMAGE_NAME=ghcr.io/elastic/opentelemetry-demo
# *********************
From d66a30c6ecd1604ac1eb4b40a0f2eeef634dd18e Mon Sep 17 00:00:00 2001
From: girodav <1390902+girodav@users.noreply.github.com>
Date: Wed, 29 Oct 2025 09:58:10 +0000
Subject: [PATCH 6/7] Update demo.sh
---
demo.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/demo.sh b/demo.sh
index efacb043e2..24a9a0de11 100755
--- a/demo.sh
+++ b/demo.sh
@@ -3,7 +3,7 @@
set -eu
# Constants
-ELASTIC_STACK_VERSION="9.1.3"
+ELASTIC_STACK_VERSION="9.2.0"
ENV_OVERRIDE_FILE=".env.override"
NAMESPACE="opentelemetry-operator-system"
HELM_REPO_NAME="open-telemetry"
From 9b446088266bd8c5bf4bd4087a1328b2b597efa8 Mon Sep 17 00:00:00 2001
From: girodav <1390902+girodav@users.noreply.github.com>
Date: Thu, 30 Oct 2025 11:39:08 +0000
Subject: [PATCH 7/7] Fix payment Dockerfile
---
src/payment/Dockerfile | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/payment/Dockerfile b/src/payment/Dockerfile
index 60b0a35bde..bd6630d38f 100644
--- a/src/payment/Dockerfile
+++ b/src/payment/Dockerfile
@@ -27,4 +27,8 @@ COPY ./src/payment/logger.js logger.js
EXPOSE ${PAYMENT_PORT}
-CMD ["index.js"]
+## The two steps below reproduce what "npm run start" would do, but using
+## distroless we cannot use "npm" directly.
+ENV OTEL_EXPORTER_OTLP_PROTOCOL=grpc
+
+CMD [ "--import", "@elastic/opentelemetry-node", "index.js" ]