fix(pika): skip already-decorated callbacks in _instrument_channel_consumers#4726
Open
axelray-dev wants to merge 1 commit into
Open
fix(pika): skip already-decorated callbacks in _instrument_channel_consumers#4726axelray-dev wants to merge 1 commit into
axelray-dev wants to merge 1 commit into
Conversation
…nsumers Addresses open-telemetry#4667: multiple basic_consume() calls on a single channel cause duplicate nested CONSUMER spans because callbacks get re-wrapped without checking if already decorated. Assisted-by: Codex
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
When multiple
basic_consume()calls are made on a single pika channel, each message produces duplicate (nested) CONSUMER spans -- N spans per message where N equals the number of consumers registered on the channel.The root cause is that
_instrument_channel_consumers()re-wraps every callback on eachbasic_consume()call without checking whether the callback is already decorated. The_original_callbackattribute set on the decorated callback accumulates nested wrappers.This adds a guard in
_instrument_channel_consumers()to skip callbacks that already have an_original_callbackattribute, indicating they were wrapped in a prior call.Addresses #4667
Type of change
How Has This Been Tested?
Added a regression test
test_instrument_consumers_skips_already_decorated_callbacksthat:_instrument_channel_consumers()twice (simulating twobasic_consume()calls)_decorate_callbackis called exactly 2 times (once per consumer, not 4)_original_callbackstill points to the original functionDoes This PR Require a Core Repo Change?
Checklist: