From 39fd28b2edc2fcced849e0ddd9c20a4bf1eb6432 Mon Sep 17 00:00:00 2001 From: Sidartha Gracias Date: Wed, 11 Feb 2026 10:51:41 -0800 Subject: [PATCH 1/4] Add logging dependency to layer This will allow trace to log correlation with enviroment OTEL_PYTHON_LOG_CORRELATION=true --- python/build-layer.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/python/build-layer.sh b/python/build-layer.sh index 0465808..eb2f840 100755 --- a/python/build-layer.sh +++ b/python/build-layer.sh @@ -8,7 +8,12 @@ echo "Modify dependencies and script for Splunk integration" pushd "$OTEL_PYTHON_DIR" cd "$SOURCES_DIR" +<<<<<<< Updated upstream sed -i 's/^opentelemetry-distro.*/splunk-opentelemetry[all]==2.9.0/g' requirements.txt +======= +sed -i 's/^opentelemetry-distro.*/splunk-opentelemetry[all]==2.8.0/g' requirements.txt +sed -i '/^opentelemetry-instrumentation==/a opentelemetry-instrumentation-logging==0.60b1' requirements.txt +>>>>>>> Stashed changes # Even if these regexes do nothing, leave these lines in to make later updates easier sed -i 's/0.60b1/0.60b1/g' nodeps-requirements.txt sed -i 's/0.60b1/0.60b1/g' requirements.txt From fe7b6467bf7eb8a8c5b0d59b27211de0fcf598f7 Mon Sep 17 00:00:00 2001 From: Sidartha Gracias Date: Thu, 12 Feb 2026 09:53:45 -0800 Subject: [PATCH 2/4] fix merge error --- python/build-layer.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/python/build-layer.sh b/python/build-layer.sh index eb2f840..919a440 100755 --- a/python/build-layer.sh +++ b/python/build-layer.sh @@ -8,12 +8,9 @@ echo "Modify dependencies and script for Splunk integration" pushd "$OTEL_PYTHON_DIR" cd "$SOURCES_DIR" -<<<<<<< Updated upstream -sed -i 's/^opentelemetry-distro.*/splunk-opentelemetry[all]==2.9.0/g' requirements.txt -======= sed -i 's/^opentelemetry-distro.*/splunk-opentelemetry[all]==2.8.0/g' requirements.txt +# Add the logging dependency below the opentelemetry-instrumentation dependency sed -i '/^opentelemetry-instrumentation==/a opentelemetry-instrumentation-logging==0.60b1' requirements.txt ->>>>>>> Stashed changes # Even if these regexes do nothing, leave these lines in to make later updates easier sed -i 's/0.60b1/0.60b1/g' nodeps-requirements.txt sed -i 's/0.60b1/0.60b1/g' requirements.txt From 7cc2241e2fb5572ad195702d45ea83f22bd446ea Mon Sep 17 00:00:00 2001 From: Sidartha Gracias Date: Thu, 12 Feb 2026 10:08:56 -0800 Subject: [PATCH 3/4] update version to resolve conflict with splunk-opentelemetry-all --- python/build-layer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/build-layer.sh b/python/build-layer.sh index 919a440..1fc7046 100755 --- a/python/build-layer.sh +++ b/python/build-layer.sh @@ -10,7 +10,7 @@ pushd "$OTEL_PYTHON_DIR" cd "$SOURCES_DIR" sed -i 's/^opentelemetry-distro.*/splunk-opentelemetry[all]==2.8.0/g' requirements.txt # Add the logging dependency below the opentelemetry-instrumentation dependency -sed -i '/^opentelemetry-instrumentation==/a opentelemetry-instrumentation-logging==0.60b1' requirements.txt +sed -i '/^opentelemetry-instrumentation==/a opentelemetry-instrumentation-logging==0.59b0' requirements.txt # Even if these regexes do nothing, leave these lines in to make later updates easier sed -i 's/0.60b1/0.60b1/g' nodeps-requirements.txt sed -i 's/0.60b1/0.60b1/g' requirements.txt From 44a0743bc1dd03a979694c44268077326d73c056 Mon Sep 17 00:00:00 2001 From: Sidartha Gracias Date: Thu, 12 Feb 2026 11:38:02 -0800 Subject: [PATCH 4/4] fix merge conflict --- python/build-layer.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/build-layer.sh b/python/build-layer.sh index 1fc7046..b259998 100755 --- a/python/build-layer.sh +++ b/python/build-layer.sh @@ -8,9 +8,9 @@ echo "Modify dependencies and script for Splunk integration" pushd "$OTEL_PYTHON_DIR" cd "$SOURCES_DIR" -sed -i 's/^opentelemetry-distro.*/splunk-opentelemetry[all]==2.8.0/g' requirements.txt +sed -i 's/^opentelemetry-distro.*/splunk-opentelemetry[all]==2.9.0/g' requirements.txt # Add the logging dependency below the opentelemetry-instrumentation dependency -sed -i '/^opentelemetry-instrumentation==/a opentelemetry-instrumentation-logging==0.59b0' requirements.txt +sed -i '/^opentelemetry-instrumentation==/a opentelemetry-instrumentation-logging==0.60b1' requirements.txt # Even if these regexes do nothing, leave these lines in to make later updates easier sed -i 's/0.60b1/0.60b1/g' nodeps-requirements.txt sed -i 's/0.60b1/0.60b1/g' requirements.txt