From 6cf4e85e61eeabac9ced8d1df13b6ca4bf0411e9 Mon Sep 17 00:00:00 2001 From: "(Eliseo) Nathaniel Ruiz Nowell" Date: Sun, 21 Nov 2021 19:29:15 -0800 Subject: [PATCH] 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 --- opentelemetry-lambda | 2 +- patch-upstream.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/opentelemetry-lambda b/opentelemetry-lambda index 85e2be9ac..f6aadfd59 160000 --- a/opentelemetry-lambda +++ b/opentelemetry-lambda @@ -1 +1 @@ -Subproject commit 85e2be9ac13c92807d27721179801b7f6461f884 +Subproject commit f6aadfd5932fa7e1e590936be153294645143694 diff --git a/patch-upstream.sh b/patch-upstream.sh index 9a1bc4779..20ec0e1b6 100755 --- 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