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

Handle propagator rename breaking change in OTel JS 0.26.0 #167

Merged
merged 1 commit into from
Nov 1, 2021
Merged

Handle propagator rename breaking change in OTel JS 0.26.0 #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions nodejs/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions nodejs/wrapper-adot/src/adot-extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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 }),
],
Expand Down