From a3ccef6efb44d140f8cf5580bb6e38fe41751201 Mon Sep 17 00:00:00 2001 From: "(Eliseo) Nathaniel Ruiz Nowell" Date: Mon, 1 Nov 2021 19:07:57 -0400 Subject: [PATCH] Sync propagator rename breaking change in OTel JS 0.26.0 --- nodejs/build.sh | 4 ++-- nodejs/wrapper-adot/src/adot-extension.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nodejs/build.sh b/nodejs/build.sh index 0e7cff23d..ff0ccb036 100755 --- a/nodejs/build.sh +++ b/nodejs/build.sh @@ -11,10 +11,10 @@ popd || exit # Build the sdk layer and sample apps cd wrapper-adot || exit -npm install +npm install || exit cd ../../opentelemetry-lambda/nodejs || exit -npm install +npm install || exit mv ./packages/layer/build/workspace/otel-handler ./packages/layer/build/workspace/otel-handler-upstream cp "$SOURCEDIR"/scripts/otel-handler ./packages/layer/build/workspace/otel-handler diff --git a/nodejs/wrapper-adot/src/adot-extension.ts b/nodejs/wrapper-adot/src/adot-extension.ts index 2602c6674..498c8ec0d 100644 --- a/nodejs/wrapper-adot/src/adot-extension.ts +++ b/nodejs/wrapper-adot/src/adot-extension.ts @@ -1,5 +1,5 @@ import { propagation } from '@opentelemetry/api'; -import { CompositePropagator, HttpTraceContextPropagator } from '@opentelemetry/core'; +import { CompositePropagator, W3CTraceContextPropagator } from '@opentelemetry/core'; import { NodeTracerConfig } from '@opentelemetry/sdk-trace-node'; import { B3InjectEncoding, B3Propagator } from '@opentelemetry/propagator-b3'; import { AWSXRayIdGenerator } from '@opentelemetry/id-generator-aws-xray'; @@ -14,7 +14,7 @@ if (!process.env.OTEL_PROPAGATORS) { new CompositePropagator({ propagators: [ new AWSXRayPropagator(), - new HttpTraceContextPropagator(), + new W3CTraceContextPropagator(), new B3Propagator(), new B3Propagator({ injectEncoding: B3InjectEncoding.MULTI_HEADER }), ],