Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dec 2024 updates #331

Merged
merged 4 commits into from
Dec 11, 2024
Merged

Dec 2024 updates #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7e7350c
Update upstream otel-lambda
johnbley Dec 5, 2024
06c2013
Update python build for upstream drift
johnbley Dec 5, 2024
2058034
Pull otel-lambda subdmodule back to af58fe4 in attempt to bisect star…
johnbley Dec 9, 2024
9518e32
Put otel lambda submodule back to latest
johnbley Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion opentelemetry-lambda
Open in desktop
Submodule opentelemetry-lambda updated 51 files
+46 −0 .github/workflows/check-links.yaml
+28 −0 .github/workflows/check_links_config.json
+1 −1 .github/workflows/ci-python.yml
+1 −1 README.md
+2 −2 collector/Makefile
+138 −122 collector/go.mod
+306 −258 collector/go.sum
+0 −2 collector/internal/collector/collector.go
+49 −46 collector/internal/tools/go.mod
+101 −94 collector/internal/tools/go.sum
+2 −2 collector/lambdacomponents/default.go
+6 −6 collector/lambdacomponents/extension/basicauth.go
+127 −110 collector/lambdacomponents/go.mod
+292 −242 collector/lambdacomponents/go.sum
+1 −1 collector/processor/coldstartprocessor/factory.go
+2 −2 collector/processor/coldstartprocessor/factory_test.go
+22 −30 collector/processor/coldstartprocessor/go.mod
+44 −62 collector/processor/coldstartprocessor/go.sum
+3 −3 collector/processor/decoupleprocessor/factory.go
+2 −2 collector/processor/decoupleprocessor/factory_test.go
+24 −32 collector/processor/decoupleprocessor/go.mod
+48 −65 collector/processor/decoupleprocessor/go.sum
+2 −2 collector/receiver/telemetryapireceiver/factory_test.go
+26 −32 collector/receiver/telemetryapireceiver/go.mod
+55 −69 collector/receiver/telemetryapireceiver/go.sum
+1 −1 java/dependencyManagement/build.gradle.kts
+564 −547 nodejs/package-lock.json
+6 −6 nodejs/package.json
+334 −311 nodejs/packages/layer/package-lock.json
+36 −32 nodejs/packages/layer/package.json
+1 −1 nodejs/packages/layer/scripts/otel-handler
+91 −0 nodejs/packages/layer/src/loader.mjs
+69 −36 nodejs/packages/layer/src/wrapper.ts
+101 −0 nodejs/packages/layer/test/handler.spec.mjs
+103 −0 nodejs/packages/layer/test/handler.spec.ts
+4 −0 nodejs/packages/layer/test/handler/cjs/index.js
+4 −0 nodejs/packages/layer/test/handler/cjs/index_commonjs.cjs
+5 −0 nodejs/packages/layer/test/handler/cjs/package.json
+4 −0 nodejs/packages/layer/test/handler/esm/index.js
+5 −0 nodejs/packages/layer/test/handler/esm/index_esm.mjs
+6 −0 nodejs/packages/layer/test/handler/esm/package.json
+12 −2 nodejs/packages/layer/test/wrapper.spec.ts
+13 −13 nodejs/sample-apps/aws-sdk/package-lock.json
+3 −3 nodejs/sample-apps/aws-sdk/package.json
+1 −0 python/sample-apps/template.yml
+1 −1 python/src/otel/Dockerfile
+2 −2 python/src/otel/otel_sdk/nodeps-requirements.txt
+33 −33 python/src/otel/otel_sdk/requirements.txt
+1 −1 python/src/otel/tests/nodeps-requirements.txt
+3 −3 python/src/otel/tests/requirements.txt
+1 −0 python/src/template.yml
6 changes: 3 additions & 3 deletions python/build-layer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
Loading