Skip to content

fix(dsm): Grab correct span in RabbitMQ/OTel for DSM checkpoints #8362

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

Draft
robcarlan-datadog wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

fix(dsm): Grab correct span in RabbitMQ/OTel for DSM checkpoints #8362

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cef1737
testing span lookup changes
robcarlan-datadog Mar 24, 2026
3c5e1d7
Use ActiveScope and remove stale comment
robcarlan-datadog Mar 25, 2026
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
21 changes: 18 additions & 3 deletions ...ace/ClrProfiler/AutoInstrumentation/RabbitMQ/PopulateBasicPropertiesHeadersIntegration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,24 @@ internal static CallTargetState OnMethodBegin<TTarget, TBasicProperties, TActivi
internal static CallTargetReturn<TReturn?> OnMethodEnd<TTarget, TReturn>(TTarget instance, TReturn returnValue, Exception? exception, in CallTargetState state)
{
var tracer = Tracer.Instance;
var activeSpan = tracer.ActiveScope?.Span;
if (activeSpan is not Span { Tags: RabbitMQTags tags } span
|| !RabbitMQIntegration.IsRabbitMqSpan(tracer, span, SpanKinds.Producer))

Span? span = null;
RabbitMQTags? tags = null;
var scope = tracer.ActiveScope as Scope;
while (scope is not null)
{
if (scope.Span is Span { Tags: RabbitMQTags candidateTags } candidateSpan
&& RabbitMQIntegration.IsRabbitMqSpan(tracer, candidateSpan, SpanKinds.Producer))
{
span = candidateSpan;
tags = candidateTags;
break;
}

scope = scope.Parent;
}

if (span is null || tags is null)
{
// We're not in a RabbitMQ span "produce", so bail out - either
// we didn't create an active scope for some reason (e.g integration disabled),
Expand Down
Loading