Lambda Layer Update - Sync Python & Collector (#177)

* Pull in updates for Python 1.7.1 & Collector 0.39.0 from upstream * Use lambdacomponents tag 0.15.0 from ADOT Collector
aws-observability · Nov 22, 2021 · 6cf4e85 · 6cf4e85
1 parent 5ab5917
commit 6cf4e85
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/opentelemetry-lambda b/opentelemetry-lambda
diff --git a/patch-upstream.sh b/patch-upstream.sh
@@ -1,8 +1,8 @@
 cp -rf adot/* opentelemetry-lambda/
 cd opentelemetry-lambda/collector
 # replace collector with AOC
-go mod edit -replace github.com/open-telemetry/opentelemetry-lambda/collector/lambdacomponents=github.com/aws-observability/aws-otel-collector/pkg/lambdacomponents@v0.14.0
-go mod edit -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil=github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil@v0.38.0
-go mod edit -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics=github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics@v0.38.0
-go mod edit -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray=github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray@v0.38.0
+go mod edit -replace github.com/open-telemetry/opentelemetry-lambda/collector/lambdacomponents=github.com/aws-observability/aws-otel-collector/pkg/lambdacomponents@v0.15.0
+go mod edit -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil=github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil@v0.39.0
+go mod edit -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics=github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics@v0.39.0
+go mod edit -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray=github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray@v0.39.0
 go mod tidy
+5 −7		.github/workflows/pr-python.yml
+11 −11		collector/collector.go
+1 −14		collector/go.mod
+55 −59		collector/go.sum
+7 −7		collector/lambdacomponents/go.mod
+5 −2		docs/design_proposal.md
+35 −12		nodejs/packages/layer/src/wrapper.ts
+1 −1		python/README.md
+0 −29		python/src/function/lambda_function.py
+0 −1		python/src/function/requirements.txt
+4 −2		python/src/otel/Dockerfile
+0 −234		python/src/otel/otel_sdk/opentelemetry/instrumentation/aws_lambda/__init__.py
+0 −15		python/src/otel/otel_sdk/opentelemetry/instrumentation/aws_lambda/version.py
+29 −28		python/src/otel/otel_sdk/requirements-nodeps.txt
+3 −3		python/src/otel/otel_sdk/requirements.txt
+0 −56		python/src/otel/setup.cfg
+0 −99		python/src/otel/setup.py
+0 −2		python/src/otel/tests/mock_user_lambda.py
+2 −1		python/src/otel/tests/mocks/lambda_function.py
+51 −92		python/src/otel/tests/test_otel.py
+3 −3		python/src/tox.ini