Update upstream otel-lambda to latest (#279)

* Update upstream otel-lambda * Adjust python build from upstream version update
signalfx · Aug 5, 2024 · d0da3ff · d0da3ff
1 parent 655fdd7
commit d0da3ff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/opentelemetry-lambda b/opentelemetry-lambda
diff --git a/python/build-layer.sh b/python/build-layer.sh
@@ -10,9 +10,10 @@ pushd "$OTEL_PYTHON_DIR"
 cd "$SOURCES_DIR"
 sed -i 's/^opentelemetry-distro.*/splunk-opentelemetry[all]==1.19.1/g' requirements.txt
 sed -i 's/^opentelemetry-exporter-otlp-proto-http.*/opentelemetry-exporter-otlp-proto-http==1.24.0/g' requirements.txt
-# Even if this regex does nothing, leave these lines in to make later updates easier
-sed -i 's/0.45b0/0.45b0/g' nodeps-requirements.txt
-sed -i 's/0.45b0/0.45b0/g' requirements.txt
+# Even if these regexes do nothing, leave these lines in to make later updates easier
+sed -i 's/0.46b0/0.45b0/g' nodeps-requirements.txt
+sed -i 's/0.46b0/0.45b0/g' requirements.txt
+sed -i 's/1.25.0/1.24.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?
+4 −0		.github/release.yml
+1 −1		.github/workflows/release-layer-java.yml
+12 −19		.github/workflows/release-layer-ruby.yml
+2 −0		.gitignore
+58 −0		CONTRIBUTING.md
+26 −24		README.md
+8 −1		RELEASE.md
+8 −4		collector/Makefile
+0 −1		collector/VERSION
+113 −107		collector/go.mod
+243 −230		collector/go.sum
+15 −19		collector/internal/collector/collector.go
+5 −2		collector/internal/telemetryapi/client.go
+21 −21		collector/internal/tools/go.mod
+45 −45		collector/internal/tools/go.sum
+101 −101		collector/lambdacomponents/go.mod
+229 −218		collector/lambdacomponents/go.sum
+27 −31		collector/processor/coldstartprocessor/go.mod
+52 −62		collector/processor/coldstartprocessor/go.sum
+1 −1		collector/processor/decoupleprocessor/config_test.go
+32 −25		collector/processor/decoupleprocessor/go.mod
+58 −48		collector/processor/decoupleprocessor/go.sum
+22 −28		collector/receiver/telemetryapireceiver/go.mod
+49 −59		collector/receiver/telemetryapireceiver/go.sum
+3 −3		collector/receiver/telemetryapireceiver/types.go
+19 −13		go/sample-apps/function/go.mod
+39 −26		go/sample-apps/function/go.sum
+5 −5		java/dependencyManagement/build.gradle.kts
+4 −4		nodejs/package.json
+4 −0		nodejs/packages/layer/.mocharc.json
+27 −19		nodejs/packages/layer/package.json
+7 −4		nodejs/packages/layer/src/wrapper.ts
+23 −0		nodejs/packages/layer/test/wrapper.spec.ts
+5 −5		nodejs/sample-apps/aws-sdk/package.json
+29 −29		python/src/otel/otel_sdk/nodeps-requirements.txt
+4 −4		python/src/otel/otel_sdk/requirements.txt
+2 −2		python/src/otel/tests/requirements.txt
+2 −2		python/src/otel/tests/test_otel.py
+33 −58		ruby/README.md
+1 −1		ruby/sample-apps/template.yml
+7 −0		ruby/src/build.sh
+51 −0		ruby/src/otel/Dockerfile
+1 −1		ruby/src/otel/layer/Gemfile
+0 −0		ruby/src/otel/layer/Makefile
+1 −1		ruby/src/otel/layer/otel-handler
+0 −0		ruby/src/otel/layer/wrapper.rb
+1 −1		ruby/src/template.yml