Skip to content

Commit 1d7076e

Browse files
chore(applicationsignals-alpha): remove B3 from default propagators (#35510)
### Issue # (if applicable) N/A ### Reason for this change B3 propagator currently drops trace state and baggage if it comes after either of the propagators responsible for propagating these informations. It provides no functionality and only blocks baggage in the current state. This blocks certain AWS X-Ray features from being used effectively without asking users to override the default propagators ### Description of changes - Removed B3 propagator from default propagators environment variable list ### Describe any new or updated permissions being added N/A ### Description of how you validated changes Confirmed with SME [wangzlei@](https://github.com/wangzlei) that B3 is no longer needed, as per owners listed in https://github.com/open-telemetry/opentelemetry-java-contrib/tree/main/aws-xray-propagator Ran manual tests by deploying applications hosted in both EC2 and EKS with various propagator configurations that exclude B3 using Application Signals on Java and verified all Application Signals behaviour was functional and as expected. Removed the B3 default propagator in ADOT Java that is applied in non-CDK environments and verified the Application Signals E2E tests passed: https://github.com/aws-observability/aws-otel-java-instrumentation/actions/runs/17587061009/job/49960543385 (Failed jobs are due to misconfiguration of unrelated actions) ### Checklist - [x] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 0e08c8c commit 1d7076e

File tree

11 files changed

+20
-20
lines changed

11 files changed

+20
-20
lines changed

packages/@aws-cdk/aws-applicationsignals-alpha/lib/enablement/constants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ export class TraceExporting {
9292
/** Configuration for trace context propagation */
9393
public static readonly OTEL_PROPAGATORS = 'OTEL_PROPAGATORS';
9494
/** Supported propagation formats for Application Signals */
95-
public static readonly OTEL_PROPAGATORS_APPLICATION_SIGNALS = 'tracecontext,baggage,b3,xray';
95+
public static readonly OTEL_PROPAGATORS_APPLICATION_SIGNALS = 'tracecontext,baggage,xray';
9696
}
9797

9898
/**

packages/@aws-cdk/aws-applicationsignals-alpha/test/ecs-sdk-instrumentation.test.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ describe('application signals adot sdk agent integration', () => {
6666
},
6767
{
6868
Name: 'OTEL_PROPAGATORS',
69-
Value: 'tracecontext,baggage,b3,xray',
69+
Value: 'tracecontext,baggage,xray',
7070
},
7171
{
7272
Name: 'JAVA_TOOL_OPTIONS',
@@ -197,7 +197,7 @@ describe('application signals adot sdk agent integration', () => {
197197
},
198198
{
199199
Name: 'OTEL_PROPAGATORS',
200-
Value: 'tracecontext,baggage,b3,xray',
200+
Value: 'tracecontext,baggage,xray',
201201
},
202202
{
203203
Name: 'JAVA_TOOL_OPTIONS',
@@ -331,7 +331,7 @@ describe('application signals adot sdk agent integration', () => {
331331
},
332332
{
333333
Name: 'OTEL_PROPAGATORS',
334-
Value: 'tracecontext,baggage,b3,xray',
334+
Value: 'tracecontext,baggage,xray',
335335
},
336336
{
337337
Name: 'OTEL_PYTHON_DISTRO',
@@ -491,7 +491,7 @@ describe('application signals adot sdk agent integration', () => {
491491
},
492492
{
493493
Name: 'OTEL_PROPAGATORS',
494-
Value: 'tracecontext,baggage,b3,xray',
494+
Value: 'tracecontext,baggage,xray',
495495
},
496496
{
497497
Name: 'OTEL_DOTNET_DISTRO',
@@ -651,7 +651,7 @@ describe('application signals adot sdk agent integration', () => {
651651
},
652652
{
653653
Name: 'OTEL_PROPAGATORS',
654-
Value: 'tracecontext,baggage,b3,xray',
654+
Value: 'tracecontext,baggage,xray',
655655
},
656656
{
657657
Name: 'OTEL_DOTNET_DISTRO',
@@ -831,7 +831,7 @@ describe('application signals adot sdk agent integration', () => {
831831
},
832832
{
833833
Name: 'OTEL_PROPAGATORS',
834-
Value: 'tracecontext,baggage,b3,xray',
834+
Value: 'tracecontext,baggage,xray',
835835
},
836836
{
837837
Name: 'OTEL_SERVICE_NAME',
@@ -1001,7 +1001,7 @@ describe('application signals custom injector', () => {
10011001
},
10021002
{
10031003
Name: 'OTEL_PROPAGATORS',
1004-
Value: 'tracecontext,baggage,b3,xray',
1004+
Value: 'tracecontext,baggage,xray',
10051005
},
10061006
{
10071007
Name: 'JAVA_TOOL_OPTIONS',
@@ -1123,7 +1123,7 @@ describe('application signals custom injector', () => {
11231123
},
11241124
{
11251125
Name: 'OTEL_PROPAGATORS',
1126-
Value: 'tracecontext,baggage,b3,xray',
1126+
Value: 'tracecontext,baggage,xray',
11271127
},
11281128
{
11291129
Name: 'OTEL_PYTHON_DISTRO',
@@ -1254,7 +1254,7 @@ describe('application signals custom injector', () => {
12541254
},
12551255
{
12561256
Name: 'OTEL_PROPAGATORS',
1257-
Value: 'tracecontext,baggage,b3,xray',
1257+
Value: 'tracecontext,baggage,xray',
12581258
},
12591259
{
12601260
Name: 'OTEL_DOTNET_DISTRO',
@@ -1409,7 +1409,7 @@ describe('application signals custom injector', () => {
14091409
},
14101410
{
14111411
Name: 'OTEL_PROPAGATORS',
1412-
Value: 'tracecontext,baggage,b3,xray',
1412+
Value: 'tracecontext,baggage,xray',
14131413
},
14141414
{
14151415
Name: 'NODE_OPTIONS',

packages/@aws-cdk/aws-applicationsignals-alpha/test/integ.ecs-enablement-daemon.js.snapshot/ApplicationSignalsJavaApp-Daemon.template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
},
4747
{
4848
"Name": "OTEL_PROPAGATORS",
49-
"Value": "tracecontext,baggage,b3,xray"
49+
"Value": "tracecontext,baggage,xray"
5050
},
5151
{
5252
"Name": "JAVA_TOOL_OPTIONS",

packages/@aws-cdk/aws-applicationsignals-alpha/test/integ.ecs-enablement-daemon.js.snapshot/tree.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/aws-applicationsignals-alpha/test/integ.ecs-enablement-replica.js.snapshot/ApplicationSignalsPythonApp-Replica.template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
},
6060
{
6161
"Name": "OTEL_PROPAGATORS",
62-
"Value": "tracecontext,baggage,b3,xray"
62+
"Value": "tracecontext,baggage,xray"
6363
},
6464
{
6565
"Name": "OTEL_PYTHON_DISTRO",

packages/@aws-cdk/aws-applicationsignals-alpha/test/integ.ecs-enablement-replica.js.snapshot/tree.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/aws-applicationsignals-alpha/test/integ.ecs-enablement-sidecar.js.snapshot/ApplicationSignalsDotnetApp-Sidecar.template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
},
5151
{
5252
"Name": "OTEL_PROPAGATORS",
53-
"Value": "tracecontext,baggage,b3,xray"
53+
"Value": "tracecontext,baggage,xray"
5454
},
5555
{
5656
"Name": "OTEL_DOTNET_DISTRO",

packages/@aws-cdk/aws-applicationsignals-alpha/test/integ.ecs-enablement-sidecar.js.snapshot/ApplicationSignalsJavaApp-Sidecar.template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
},
5151
{
5252
"Name": "OTEL_PROPAGATORS",
53-
"Value": "tracecontext,baggage,b3,xray"
53+
"Value": "tracecontext,baggage,xray"
5454
},
5555
{
5656
"Name": "JAVA_TOOL_OPTIONS",

packages/@aws-cdk/aws-applicationsignals-alpha/test/integ.ecs-enablement-sidecar.js.snapshot/ApplicationSignalsNodeApp-Sidecar.template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
},
5151
{
5252
"Name": "OTEL_PROPAGATORS",
53-
"Value": "tracecontext,baggage,b3,xray"
53+
"Value": "tracecontext,baggage,xray"
5454
},
5555
{
5656
"Name": "NODE_OPTIONS",

packages/@aws-cdk/aws-applicationsignals-alpha/test/integ.ecs-enablement-sidecar.js.snapshot/ApplicationSignalsPythonApp-Sidecar.template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
},
6464
{
6565
"Name": "OTEL_PROPAGATORS",
66-
"Value": "tracecontext,baggage,b3,xray"
66+
"Value": "tracecontext,baggage,xray"
6767
},
6868
{
6969
"Name": "OTEL_PYTHON_DISTRO",

0 commit comments

Comments
 (0)