From 4e87e1f14fcd9353d10af8d4dfcc392c27e564cc Mon Sep 17 00:00:00 2001 From: Vasi Vasireddy <41936996+vasireddy99@users.noreply.github.com> Date: Thu, 14 Jul 2022 16:44:13 -0700 Subject: [PATCH] Update submodule, updated JS deps and use go 1.17 (#270) --- nodejs/wrapper-adot/package.json | 4 ++-- opentelemetry-lambda | 2 +- patch-upstream.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nodejs/wrapper-adot/package.json b/nodejs/wrapper-adot/package.json index d5e2d0d35..ce6ec34ff 100644 --- a/nodejs/wrapper-adot/package.json +++ b/nodejs/wrapper-adot/package.json @@ -37,10 +37,10 @@ }, "dependencies": { "@opentelemetry/api": "^1.1.0", - "@opentelemetry/core": "^1.2.0", + "@opentelemetry/core": "^1.4.0", "@opentelemetry/id-generator-aws-xray": "^1.1.0", "@opentelemetry/sdk-trace-node": "^1.4.0", "@opentelemetry/propagator-aws-xray": "^1.1.0", - "@opentelemetry/propagator-b3": "^1.2.0" + "@opentelemetry/propagator-b3": "^1.4.0" } } diff --git a/opentelemetry-lambda b/opentelemetry-lambda index 720818142..c44e38263 160000 --- a/opentelemetry-lambda +++ b/opentelemetry-lambda @@ -1 +1 @@ -Subproject commit 7208181421cd6da2f7915adc28addb6098c7d2af +Subproject commit c44e382639fb33918827d4450ca63ccdaa0f686c diff --git a/patch-upstream.sh b/patch-upstream.sh index 8541cadfd..225a2f920 100755 --- a/patch-upstream.sh +++ b/patch-upstream.sh @@ -28,4 +28,4 @@ go mod edit -replace github.com/open-telemetry/opentelemetry-collector-contrib/i # A simple `go mod tidy` does not work. # See: https://github.com/aws-observability/aws-otel-collector/issues/926 rm -fr go.sum -go mod tidy -go=1.18 +go mod tidy -compat=1.17