Skip to content

Fix duplicate baggage headers in Celery integration introduced in SDK 2.0#2993

Merged
antonpirker merged 16 commits into
sentry-sdk-2.0from
fix_wrap_apply_async
Apr 23, 2024
Merged

Fix duplicate baggage headers in Celery integration introduced in SDK 2.0#2993
antonpirker merged 16 commits into
sentry-sdk-2.0from
fix_wrap_apply_async

Conversation

@antonpirker

@antonpirker antonpirker commented Apr 19, 2024

Copy link
Copy Markdown
Contributor

This fixes the accumulating baggage headers when dogfooding SDK 2.0 on sentry.io.

This reverts the refactoring of header manipulation that was added in rc4 back to what is present in current master.

This PR uses the working code from master (that is also in rc3) and then extracts the header manipulating code into _update_celery_task_headers() to make it more readable and also testable.
This PR adds a couple of tests to make sure we do not change the behavior by accident in the future.

(This does not fix #2916 but it uncovered the root cause. The fix is in a follow up PR: #3001)

@antonpirker antonpirker changed the title Fixing duplicate baggage headers in Celery integration Fix duplicate baggage headers in Celery integration introduced in SDK 2.0 Apr 22, 2024
@antonpirker
antonpirker marked this pull request as ready for review April 22, 2024 14:41
@antonpirker
antonpirker requested a review from sentrivana April 22, 2024 14:59

@sentrivana sentrivana left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see comment, else lgtm!

Comment thread sentry_sdk/integrations/celery/__init__.py Outdated
antonpirker and others added 2 commits April 23, 2024 09:12
Co-authored-by: Ivana Kellyerova <ivana.kellyerova@sentry.io>
@antonpirker
antonpirker merged commit 9fc2f44 into sentry-sdk-2.0 Apr 23, 2024
@antonpirker
antonpirker deleted the fix_wrap_apply_async branch April 23, 2024 07:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants