Skip to content

Commit 740ec38

Browse files
committed
remove b3 propagators from configuration
1 parent 8e2020a commit 740ec38

File tree

6 files changed

+26
-43
lines changed

6 files changed

+26
-43
lines changed

aws-distro-opentelemetry-node-autoinstrumentation/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@
103103
},
104104
"dependencies": {
105105
"@opentelemetry/api": "1.9.0",
106-
"@opentelemetry/auto-configuration-propagators": "0.3.2",
107106
"@opentelemetry/auto-instrumentations-node": "0.56.0",
108107
"@opentelemetry/core": "1.30.1",
109108
"@opentelemetry/exporter-metrics-otlp-grpc": "0.57.1",
@@ -115,6 +114,7 @@
115114
"@opentelemetry/instrumentation-aws-sdk": "0.49.0",
116115
"@opentelemetry/otlp-transformer": "0.57.1",
117116
"@opentelemetry/propagator-aws-xray": "1.26.2",
117+
"@opentelemetry/propagator-aws-xray-lambda": "^0.54.0",
118118
"@opentelemetry/resource-detector-aws": "1.12.0",
119119
"@opentelemetry/resources": "1.30.1",
120120
"@opentelemetry/sdk-metrics": "1.30.1",
@@ -126,6 +126,6 @@
126126
"build/src/**/*.js",
127127
"build/src/**/*.d.ts",
128128
"build/src/**/*.d.ts.map",
129-
"build/workspace/node_modules/**"
129+
"build/src/**/*.json"
130130
]
131131
}

aws-distro-opentelemetry-node-autoinstrumentation/src/register.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export function setAwsDefaultEnvironmentVariables(): void {
4141
process.env.OTEL_EXPORTER_OTLP_PROTOCOL = 'http/protobuf';
4242
}
4343
if (!process.env.OTEL_PROPAGATORS) {
44-
process.env.OTEL_PROPAGATORS = 'xray,tracecontext,b3,b3multi';
44+
process.env.OTEL_PROPAGATORS = 'xray,tracecontext';
4545
}
4646
// Disable the following instrumentations by default
4747
// This auto-instrumentation for the `fs` module generates many low-value spans. `dns` is similar.

aws-distro-opentelemetry-node-autoinstrumentation/test/aws-opentelemetry-configurator.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ describe('AwsOpenTelemetryConfiguratorTest', () => {
506506
function validateConfiguratorEnviron() {
507507
// Set by register.ts
508508
expect('http/protobuf').toEqual(process.env.OTEL_EXPORTER_OTLP_PROTOCOL);
509-
expect('xray,tracecontext,b3,b3multi').toEqual(process.env.OTEL_PROPAGATORS);
509+
expect('xray,tracecontext').toEqual(process.env.OTEL_PROPAGATORS);
510510

511511
// Not set
512512
expect(undefined).toEqual(process.env.OTEL_TRACES_SAMPLER);

aws-distro-opentelemetry-node-autoinstrumentation/test/register.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ describe('Register', function () {
3333
it('sets AWS Default Environment Variables', () => {
3434
setAwsDefaultEnvironmentVariables();
3535
expect(process.env.OTEL_EXPORTER_OTLP_PROTOCOL).toEqual('http/protobuf');
36-
expect(process.env.OTEL_PROPAGATORS).toEqual('xray,tracecontext,b3,b3multi');
36+
expect(process.env.OTEL_PROPAGATORS).toEqual('xray,tracecontext');
3737
expect(process.env.OTEL_NODE_DISABLED_INSTRUMENTATIONS).toEqual('fs');
3838
});
3939

@@ -79,7 +79,7 @@ describe('Register', function () {
7979

8080
assert.ok(proc.stdout.includes('AWS Distro of OpenTelemetry automatic instrumentation started successfully'));
8181
assert.ok(proc.stdout.includes("Environment variable OTEL_EXPORTER_OTLP_PROTOCOL is set to 'http/protobuf'"));
82-
assert.ok(proc.stdout.includes("Environment variable OTEL_PROPAGATORS is set to 'xray,tracecontext,b3,b3multi'"));
82+
assert.ok(proc.stdout.includes("Environment variable OTEL_PROPAGATORS is set to 'xray,tracecontext'"));
8383

8484
// Check a span has been generated for the GET request done in app.js
8585
assert.ok(proc.stdout.includes("name: 'GET'"), 'console span output in stdout - validate Span Name');

lambda-layer/packages/layer/scripts/otel-instrument

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ fi
6868

6969
# - Set the propagators
7070
if [[ -z "$OTEL_PROPAGATORS" ]]; then
71-
export OTEL_PROPAGATORS="xray,tracecontext,baggage,b3,b3multi"
71+
export OTEL_PROPAGATORS="xray,tracecontext,baggage"
7272
fi
7373

7474
# - Set Application Signals configuration

package-lock.json

Lines changed: 19 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)