Skip to content

Commit 73dd409

Browse files
Stephen Belangertlhunter
authored andcommitted
Make datadog distributed tracing header take priority over tracecontext (#3414)
1 parent a8a637e commit 73dd409

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

packages/dd-trace/src/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ class Config {
281281
process.env.DD_TRACE_EXPERIMENTAL_B3_ENABLED,
282282
false
283283
)
284-
const defaultPropagationStyle = ['tracecontext', 'datadog']
284+
const defaultPropagationStyle = ['datadog', 'tracecontext']
285285
if (isTrue(DD_TRACE_B3_ENABLED)) {
286286
defaultPropagationStyle.push('b3')
287287
defaultPropagationStyle.push('b3 single header')

packages/dd-trace/test/config.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ describe('Config', () => {
9595
expect(config).to.have.property('spanComputePeerService', false)
9696
expect(config).to.have.property('traceRemoveIntegrationServiceNamesEnabled', false)
9797
expect(config).to.have.deep.property('serviceMapping', {})
98-
expect(config).to.have.nested.deep.property('tracePropagationStyle.inject', ['tracecontext', 'datadog'])
99-
expect(config).to.have.nested.deep.property('tracePropagationStyle.extract', ['tracecontext', 'datadog'])
98+
expect(config).to.have.nested.deep.property('tracePropagationStyle.inject', ['datadog', 'tracecontext'])
99+
expect(config).to.have.nested.deep.property('tracePropagationStyle.extract', ['datadog', 'tracecontext'])
100100
expect(config).to.have.nested.property('experimental.runtimeId', false)
101101
expect(config).to.have.nested.property('experimental.exporter', undefined)
102102
expect(config).to.have.nested.property('experimental.enableGetRumData', false)

0 commit comments

Comments
 (0)