Skip to content

remove ability to propagate baggage on its own to avoid app crashes #5209

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

Merged
rochdev merged 7 commits into from
Feb 7, 2025
Merged

remove ability to propagate baggage on its own to avoid app crashes #5209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
097d163
remove ability to propagate baggage on its own to bandage app crash
ida613 Feb 5, 2025
70435b2
modify unit test
ida613 Feb 5, 2025
23fa992
tidy up code
ida613 Feb 5, 2025
1b0e218
add clarifying comment
ida613 Feb 5, 2025
afd99de
code fix
ida613 Feb 6, 2025
9a1fa20
code clean up season 2
ida613 Feb 6, 2025
213913f
attempted code fix
ida613 Feb 6, 2025
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
9 changes: 5 additions & 4 deletions packages/dd-trace/src/opentracing/propagation/text_map.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,7 @@ class TextMapPropagator {
if (context === null) {
context = extractedContext
if (this._config.tracePropagationExtractFirst) {
this._extractBaggageItems(carrier, context)
return context
}
} else {
Expand All @@ -344,10 +345,7 @@ class TextMapPropagator {
}
}

if (this._hasPropagationStyle('extract', 'baggage') && carrier.baggage) {
context = context || new DatadogSpanContext()
this._extractBaggageItems(carrier, context)
}
this._extractBaggageItems(carrier, context)

return context || this._extractSqsdContext(carrier)
}
Expand Down Expand Up @@ -596,6 +594,9 @@ class TextMapPropagator {
}

_extractBaggageItems (carrier, spanContext) {
if (!this._hasPropagationStyle('extract', 'baggage')) return
if (!carrier || !carrier.baggage) return
if (!spanContext) return
const baggages = carrier.baggage.split(',')
for (const keyValue of baggages) {
if (!keyValue.includes('=')) {
Expand Down
5 changes: 3 additions & 2 deletions packages/dd-trace/test/opentracing/propagation/text_map.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,8 @@ describe('TextMapPropagator', () => {
expect(spanContextD._baggageItems).to.deep.equal({})
})

it('should extract baggage when it is the only propagation style', () => {
// temporary test. On the contrary, it SHOULD extract baggage
it('should not extract baggage when it is the only propagation style', () => {
config = new Config({
tracePropagationStyle: {
extract: ['baggage']
Expand All @@ -462,7 +463,7 @@ describe('TextMapPropagator', () => {
baggage: 'foo=bar'
}
const spanContext = propagator.extract(carrier)
expect(spanContext._baggageItems).to.deep.equal({ foo: 'bar' })
expect(spanContext).to.be.null
})

it('should convert signed IDs to unsigned', () => {
Expand Down
Loading