From 526da8d7c3d7df2a35819aab886ad79a8588e44e Mon Sep 17 00:00:00 2001
From: John Bley <jbley@splunk.com>
Date: Wed, 11 Dec 2024 12:27:50 -0500
Subject: [PATCH] Dec 2024 updates (#331)

* Update upstream otel-lambda

* Update python build for upstream drift

* Pull otel-lambda subdmodule back to af58fe4 in attempt to bisect startup issue

* Put otel lambda submodule back to latest
---
 opentelemetry-lambda  | 2 +-
 python/build-layer.sh | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/opentelemetry-lambda b/opentelemetry-lambda
index cf82ba1..074cbf3 160000
--- a/opentelemetry-lambda
+++ b/opentelemetry-lambda
@@ -1 +1 @@
-Subproject commit cf82ba1ceed8dcb9076190b4a36ffe388f942029
+Subproject commit 074cbf3adbba8d5287a5f88fd775844d643f5fd1
diff --git a/python/build-layer.sh b/python/build-layer.sh
index 993d828..4c11858 100755
--- a/python/build-layer.sh
+++ b/python/build-layer.sh
@@ -11,9 +11,9 @@ cd "$SOURCES_DIR"
 sed -i 's/^opentelemetry-distro.*/splunk-opentelemetry[all]==1.21.0/g' requirements.txt
 sed -i 's/^opentelemetry-exporter-otlp-proto-http.*/opentelemetry-exporter-otlp-proto-http==1.27.0/g' requirements.txt
 # Even if these regexes do nothing, leave these lines in to make later updates easier
-sed -i 's/0.48b0/0.48b0/g' nodeps-requirements.txt
-sed -i 's/0.48b0/0.48b0/g' requirements.txt
-sed -i 's/1.27.0/1.27.0/g' requirements.txt
+sed -i 's/0.49b1/0.48b0/g' nodeps-requirements.txt
+sed -i 's/0.49b1/0.48b0/g' requirements.txt
+sed -i 's/1.28.1/1.27.0/g' requirements.txt
 sed -i 's/^docker run --rm/docker run/g'  ../../build.sh
 sed -i 's/opentelemetry-instrument/splunk-py-trace/g'  otel-instrument
 # FIXME this recently broke and why aren't these a vendored part of pkg_resources anymore? perhaps we should remove the dependency on pkg_resources?