Skip to content

Commit

Permalink
Sep2024 updates (#296)
Browse files Browse the repository at this point in the history
* Update upstream otel-lambda to latest

* Update splunk-otel-python to 1.20.0

* Update name of otel java layer zip file
  • Loading branch information
johnbley committed Sep 18, 2024
1 parent a7d6147 commit 8d6fc40
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions java/build-layer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ pushd $OTEL_JAVA_DIR

echo "Preparing Splunk layer"
cd $DISTRO_DIR
unzip -qo opentelemetry-java-wrapper.zip
rm opentelemetry-java-wrapper.zip
unzip -qo opentelemetry-javawrapper-layer.zip
rm opentelemetry-javawrapper-layer.zip
sed -i '2isource /opt/splunk-default-config' otel-handler
sed -i '2isource /opt/splunk-default-config' otel-stream-handler
sed -i '2isource /opt/splunk-default-config' otel-proxy-handler
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-lambda
Submodule opentelemetry-lambda updated 71 files
+1 −1 .github/dependabot.yml
+1 −2 .github/workflows/ci-java.yml
+4 −0 .github/workflows/ci-nodejs.yml
+1 −1 .github/workflows/close-stale.yaml
+1 −1 .github/workflows/layer-publish.yml
+15 −8 .github/workflows/release-layer-java.yml
+2 −1 .github/workflows/release-layer-nodejs.yml
+4 −3 README.md
+6 −6 collector/README.md
+85 −81 collector/go.mod
+182 −697 collector/go.sum
+18 −5 collector/internal/collector/collector.go
+7 −8 collector/internal/lifecycle/manager.go
+17 −2 collector/internal/lifecycle/manager_test.go
+1 −7 collector/internal/telemetryapi/client.go
+34 −35 collector/internal/tools/go.mod
+71 −74 collector/internal/tools/go.sum
+2 −0 collector/lambdacomponents/default.go
+73 −70 collector/lambdacomponents/go.mod
+166 −685 collector/lambdacomponents/go.sum
+1 −1 collector/processor/coldstartprocessor/factory.go
+2 −2 collector/processor/coldstartprocessor/factory_test.go
+14 −11 collector/processor/coldstartprocessor/go.mod
+24 −20 collector/processor/coldstartprocessor/go.sum
+1 −1 collector/processor/coldstartprocessor/processor.go
+3 −3 collector/processor/coldstartprocessor/processor_test.go
+3 −3 collector/processor/decoupleprocessor/factory.go
+2 −2 collector/processor/decoupleprocessor/factory_test.go
+16 −13 collector/processor/decoupleprocessor/go.mod
+32 −26 collector/processor/decoupleprocessor/go.sum
+6 −5 collector/processor/decoupleprocessor/processor.go
+9 −8 collector/processor/decoupleprocessor/processor_test.go
+20 −6 collector/receiver/telemetryapireceiver/README.md
+11 −0 collector/receiver/telemetryapireceiver/config.go
+103 −0 collector/receiver/telemetryapireceiver/config_test.go
+32 −5 collector/receiver/telemetryapireceiver/factory.go
+3 −3 collector/receiver/telemetryapireceiver/factory_test.go
+22 −9 collector/receiver/telemetryapireceiver/go.mod
+47 −23 collector/receiver/telemetryapireceiver/go.sum
+76 −0 collector/receiver/telemetryapireceiver/internal/sharedcomponent/sharedcomponent.go
+72 −0 collector/receiver/telemetryapireceiver/internal/sharedcomponent/sharedcomponent_test.go
+156 −28 collector/receiver/telemetryapireceiver/receiver.go
+237 −6 collector/receiver/telemetryapireceiver/receiver_test.go
+32 −0 collector/receiver/telemetryapireceiver/testdata/config.yaml
+18 −18 go/sample-apps/function/go.mod
+36 −36 go/sample-apps/function/go.sum
+2 −1 java/README.md
+5 −5 java/dependencyManagement/build.gradle.kts
+7 −1 java/layer-wrapper/build.gradle.kts
+3 −3 java/sample-apps/aws-sdk/deploy/agent/main.tf
+3 −3 java/sample-apps/sqs/deploy/agent/main.tf
+0 −6 nodejs/.gitignore
+1 −1 nodejs/eslint.config.js
+0 −6 nodejs/lerna.json
+14,025 −0 nodejs/package-lock.json
+11 −11 nodejs/package.json
+2,187 −0 nodejs/packages/layer/package-lock.json
+19 −14 nodejs/packages/layer/package.json
+132 −37 nodejs/packages/layer/src/wrapper.ts
+7 −7 nodejs/packages/layer/test/wrapper.spec.ts
+1 −0 nodejs/sample-apps/aws-sdk/deploy/wrapper/main.tf
+1,837 −0 nodejs/sample-apps/aws-sdk/package-lock.json
+5 −6 nodejs/sample-apps/aws-sdk/package.json
+2 −1 nodejs/sample-apps/aws-sdk/src/index.ts
+4 −30 python/src/otel/otel_sdk/nodeps-requirements.txt
+36 −4 python/src/otel/otel_sdk/requirements.txt
+1 −0 python/src/otel/tests/nodeps-requirements.txt
+4 −2 python/src/otel/tests/requirements.txt
+9 −2 python/src/otel/tests/test_otel.py
+4 −3 python/src/tox.ini
+2 −2 ruby/src/otel/layer/Gemfile
10 changes: 5 additions & 5 deletions python/build-layer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ echo "Modify dependencies and script for Splunk integration"
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
sed -i 's/^opentelemetry-distro.*/splunk-opentelemetry[all]==1.20.0/g' requirements.txt
sed -i 's/^opentelemetry-exporter-otlp-proto-http.*/opentelemetry-exporter-otlp-proto-http==1.26.0/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/0.47b0/0.47b0/g' nodeps-requirements.txt
sed -i 's/0.47b0/0.47b0/g' requirements.txt
sed -i 's/1.26.0/1.26.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?
Expand Down

0 comments on commit 8d6fc40

Please sign in to comment.