Skip to content

[Code Origin] Disable code origin for exit spans #7610

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
merged 5 commits into from
Oct 3, 2025
Merged

[Code Origin] Disable code origin for exit spans #7610

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1412581
Disable code origin for exit spans
dudikeleti Oct 2, 2025
f4295ac
Update approvals
dudikeleti Oct 2, 2025
32721a7
Update tracer/test/Datadog.Trace.Tests/Debugger/SpanCodeOriginTests.cs
dudikeleti Oct 3, 2025
380fc95
Update tracer/test/Datadog.Trace.Tests/Debugger/SpanCodeOriginTests.cs
dudikeleti Oct 3, 2025
9b943d5
Update tracer/src/Datadog.Trace/Debugger/SpanCodeOrigin/SpanCodeOrigi…
dudikeleti Oct 3, 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
14 changes: 13 additions & 1 deletion tracer/src/Datadog.Trace/Debugger/SpanCodeOrigin/SpanCodeOrigin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,14 @@ internal SpanCodeOrigin(DebuggerSettings settings)

internal void SetCodeOriginForExitSpan(Span? span)
{
if (ShouldSkipExitSpan())
{
return;
}

if (span == null)
{
Log.Debug("Can not add code origin when span is null");
Log.Debug("Can not add code origin for exit span when span is null");
return;
}

Expand All @@ -58,6 +63,13 @@ internal void SetCodeOriginForExitSpan(Span? span)
AddExitSpanTags(span);
}

private bool ShouldSkipExitSpan()
{
// Exit span code origin has been disabled since tracer version 3.2.8.
// when it will be enabled, update SpanCodeOriginTests.ExitSpanTests
return true;
}

internal void SetCodeOriginForEntrySpan(Span? span, Type? type, MethodInfo? method)
{
if (span == null ||
Expand Down
3 changes: 1 addition & 2 deletions ...tionTests/Approvals/snapshots/ProbeTests.AsyncSpanOnMethodWithArgsTest.Spans.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
env: integration_tests,
language: dotnet,
runtime-id: Guid_2,
version: 1.0.0,
_dd.code_origin.type: exit
version: 1.0.0
},
Metrics: {
process_id: 0,
Expand Down
3 changes: 1 addition & 2 deletions ...Approvals/snapshots/ProbeTests.AsyncSpanOnMethodWithExceptionProbeTest.Spans.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ at Samples.Probes.TestRuns.SmokeTests.AsyncSpanOnMethodWithExceptionProbeTest.Ca
error.type: System.InvalidOperationException,
language: dotnet,
runtime-id: Guid_2,
version: 1.0.0,
_dd.code_origin.type: exit
version: 1.0.0
},
Metrics: {
process_id: 0,
Expand Down
3 changes: 1 addition & 2 deletions ...IntegrationTests/Approvals/snapshots/ProbeTests.MultiProbeWithSpanTest.Spans.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
env: integration_tests,
language: dotnet,
runtime-id: Guid_2,
version: 1.0.0,
_dd.code_origin.type: exit
version: 1.0.0
},
Metrics: {
process_id: 0,
Expand Down
1 change: 0 additions & 1 deletion ...Approvals/snapshots/ProbeTests.SpanDecorationArgsAndLocals.with.dynamic.span.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
runtime-id: Guid_2,
SpanDecorationArgsAndLocals: Run,
version: 1.0.0,
_dd.code_origin.type: exit,
_dd.di.SpanDecorationArgsAndLocals.probe_id: Guid_3
},
Metrics: {
Expand Down
4 changes: 1 addition & 3 deletions ...ovals/snapshots/ProbeTests.SpanDecorationArgsAndLocals.with.trace.annotation.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
env: integration_tests,
language: dotnet,
runtime-id: Guid_2,
version: 1.0.0,
_dd.code_origin.type: exit
version: 1.0.0
},
Metrics: {
process_id: 0,
Expand All @@ -34,7 +33,6 @@
language: dotnet,
SpanDecorationArgsAndLocals: Run,
version: 1.0.0,
_dd.code_origin.type: exit,
_dd.di.SpanDecorationArgsAndLocals.probe_id: Guid_3
}
}
Expand Down
1 change: 0 additions & 1 deletion ...onTests/Approvals/snapshots/ProbeTests.SpanDecorationError.with.dynamic.span.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
runtime-id: Guid_2,
SpanDecorationError: Instance=Datadog.Trace.Debugger.Expressions.UndefinedValue,
version: 1.0.0,
_dd.code_origin.type: exit,
_dd.di.SpanDecorationError.evaluation_error: EvaluationError { Expression = this.error },
_dd.di.SpanDecorationError.probe_id: Guid_3
},
Expand Down
4 changes: 1 addition & 3 deletions ...sts/Approvals/snapshots/ProbeTests.SpanDecorationError.with.trace.annotation.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
env: integration_tests,
language: dotnet,
runtime-id: Guid_2,
version: 1.0.0,
_dd.code_origin.type: exit
version: 1.0.0
},
Metrics: {
process_id: 0,
Expand All @@ -34,7 +33,6 @@
language: dotnet,
SpanDecorationError: Instance=Datadog.Trace.Debugger.Expressions.UndefinedValue,
version: 1.0.0,
_dd.code_origin.type: exit,
_dd.di.SpanDecorationError.evaluation_error: EvaluationError { Expression = this.error },
_dd.di.SpanDecorationError.probe_id: Guid_3
}
Expand Down
3 changes: 1 addition & 2 deletions ...s/Approvals/snapshots/ProbeTests.SpanDecorationErrorInWhen.with.dynamic.span.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
env: integration_tests,
language: dotnet,
runtime-id: Guid_2,
version: 1.0.0,
_dd.code_origin.type: exit
version: 1.0.0
},
Metrics: {
process_id: 0,
Expand Down
1 change: 0 additions & 1 deletion ...ests/Approvals/snapshots/ProbeTests.SpanDecorationSameTags.with.dynamic.span.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
runtime-id: Guid_2,
SpanDecorationSameTags: 3,
version: 1.0.0,
_dd.code_origin.type: exit,
_dd.di.SpanDecorationSameTags.probe_id: Guid_3
},
Metrics: {
Expand Down
4 changes: 1 addition & 3 deletions .../Approvals/snapshots/ProbeTests.SpanDecorationSameTags.with.trace.annotation.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
env: integration_tests,
language: dotnet,
runtime-id: Guid_2,
version: 1.0.0,
_dd.code_origin.type: exit
version: 1.0.0
},
Metrics: {
process_id: 0,
Expand All @@ -34,7 +33,6 @@
language: dotnet,
SpanDecorationSameTags: 3,
version: 1.0.0,
_dd.code_origin.type: exit,
_dd.di.SpanDecorationSameTags.probe_id: Guid_3
}
}
Expand Down
1 change: 0 additions & 1 deletion ...vals/snapshots/ProbeTests.SpanDecorationSameTagsFirstError.with.dynamic.span.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
runtime-id: Guid_2,
SpanDecorationSameTagsFirstError: Run,
version: 1.0.0,
_dd.code_origin.type: exit,
_dd.di.SpanDecorationSameTagsFirstError.probe_id: Guid_3
},
Metrics: {
Expand Down
4 changes: 1 addition & 3 deletions .../snapshots/ProbeTests.SpanDecorationSameTagsFirstError.with.trace.annotation.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
env: integration_tests,
language: dotnet,
runtime-id: Guid_2,
version: 1.0.0,
_dd.code_origin.type: exit
version: 1.0.0
},
Metrics: {
process_id: 0,
Expand All @@ -34,7 +33,6 @@
language: dotnet,
SpanDecorationSameTagsFirstError: Run,
version: 1.0.0,
_dd.code_origin.type: exit,
_dd.di.SpanDecorationSameTagsFirstError.probe_id: Guid_3
}
}
Expand Down
1 change: 0 additions & 1 deletion ...als/snapshots/ProbeTests.SpanDecorationSameTagsSecondError.with.dynamic.span.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
runtime-id: Guid_2,
SpanDecorationSameTagsSecondError: Instance=Datadog.Trace.Debugger.Expressions.UndefinedValue,
version: 1.0.0,
_dd.code_origin.type: exit,
_dd.di.SpanDecorationSameTagsSecondError.evaluation_error: EvaluationError { Expression = this.error },
_dd.di.SpanDecorationSameTagsSecondError.probe_id: Guid_3
},
Expand Down
4 changes: 1 addition & 3 deletions ...snapshots/ProbeTests.SpanDecorationSameTagsSecondError.with.trace.annotation.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
env: integration_tests,
language: dotnet,
runtime-id: Guid_2,
version: 1.0.0,
_dd.code_origin.type: exit
version: 1.0.0
},
Metrics: {
process_id: 0,
Expand All @@ -34,7 +33,6 @@
language: dotnet,
SpanDecorationSameTagsSecondError: Instance=Datadog.Trace.Debugger.Expressions.UndefinedValue,
version: 1.0.0,
_dd.code_origin.type: exit,
_dd.di.SpanDecorationSameTagsSecondError.evaluation_error: EvaluationError { Expression = this.error },
_dd.di.SpanDecorationSameTagsSecondError.probe_id: Guid_3
}
Expand Down
1 change: 0 additions & 1 deletion ...ls/snapshots/ProbeTests.SpanDecorationTwoSegmentsWithError.with.dynamic.span.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
runtime-id: Guid_2,
SpanDecorationTwoSegments: Instance=Datadog.Trace.Debugger.Expressions.UndefinedValueRun,
version: 1.0.0,
_dd.code_origin.type: exit,
_dd.di.SpanDecorationTwoSegments.evaluation_error: EvaluationError { Expression = this.Arg = },
_dd.di.SpanDecorationTwoSegments.probe_id: Guid_3
},
Expand Down
1 change: 0 additions & 1 deletion ...Tests/Approvals/snapshots/ProbeTests.SpanDecorationTwoTags.with.dynamic.span.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
SpanDecorationTwoTags: Run,
SpanDecorationTwoTags2: 3,
version: 1.0.0,
_dd.code_origin.type: exit,
_dd.di.SpanDecorationTwoTags.probe_id: Guid_3,
_dd.di.SpanDecorationTwoTags2.probe_id: Guid_3
},
Expand Down
4 changes: 1 addition & 3 deletions ...s/Approvals/snapshots/ProbeTests.SpanDecorationTwoTags.with.trace.annotation.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
env: integration_tests,
language: dotnet,
runtime-id: Guid_2,
version: 1.0.0,
_dd.code_origin.type: exit
version: 1.0.0
},
Metrics: {
process_id: 0,
Expand All @@ -35,7 +34,6 @@
SpanDecorationTwoTags: Run,
SpanDecorationTwoTags2: 3,
version: 1.0.0,
_dd.code_origin.type: exit,
_dd.di.SpanDecorationTwoTags.probe_id: Guid_3,
_dd.di.SpanDecorationTwoTags2.probe_id: Guid_3
}
Expand Down
3 changes: 1 addition & 2 deletions ...pprovals/snapshots/ProbeTests.SpanDecorationWitLiteralWhen.with.dynamic.span.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
env: integration_tests,
language: dotnet,
runtime-id: Guid_2,
version: 1.0.0,
_dd.code_origin.type: exit
version: 1.0.0
},
Metrics: {
process_id: 0,
Expand Down
1 change: 0 additions & 1 deletion ...s/Approvals/snapshots/ProbeTests.SpanDecorationWithoutWhen.with.dynamic.span.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
runtime-id: Guid_2,
SpanDecorationWithoutWhen: Run,
version: 1.0.0,
_dd.code_origin.type: exit,
_dd.di.SpanDecorationWithoutWhen.probe_id: Guid_3
},
Metrics: {
Expand Down
3 changes: 1 addition & 2 deletions ...tegrationTests/Approvals/snapshots/ProbeTests.SpanOnMethodWithArgsTest.Spans.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
env: integration_tests,
language: dotnet,
runtime-id: Guid_2,
version: 1.0.0,
_dd.code_origin.type: exit
version: 1.0.0
},
Metrics: {
process_id: 0,
Expand Down
3 changes: 1 addition & 2 deletions ...ests/Approvals/snapshots/ProbeTests.SpanOnMethodWithExceptionProbeTest.Spans.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ at Samples.Probes.TestRuns.SmokeTests.SpanOnMethodWithExceptionProbeTest.Calcula
error.type: System.InvalidOperationException,
language: dotnet,
runtime-id: Guid_2,
version: 1.0.0,
_dd.code_origin.type: exit
version: 1.0.0
},
Metrics: {
process_id: 0,
Expand Down
10 changes: 10 additions & 0 deletions tracer/test/Datadog.Trace.Tests/Debugger/SpanCodeOriginTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,10 @@ public void SetCodeOrigin_WhenEnabled_SetsCorrectTags()
TestMethod(spanCodeOrigin, span);

// Assert
// Exit span code origin has been disabled since tracer version 3.2.8.
span.Tags.GetTag($"{CodeOriginTag}.type").Should().BeNull();

/* Uncomment when exit span will be enabled again
var codeOriginType = span.Tags.GetTag($"{CodeOriginTag}.type");
codeOriginType.Should().Be("exit");
var frame0Method = span.Tags.GetTag($"{CodeOriginTag}.frames.0.method");
Expand All @@ -253,6 +257,7 @@ public void SetCodeOrigin_WhenEnabled_SetsCorrectTags()
line.Should().NotBeNullOrEmpty();
var column = span.Tags.GetTag($"{CodeOriginTag}.frames.0.column");
column.Should().NotBeNullOrEmpty();
*/
}

[Fact]
Expand All @@ -267,10 +272,15 @@ public void SetCodeOrigin_WithMaxFramesLimit_RespectsLimit()
DeepTestMethod1(span, spanCodeOrigin);

// Assert
// Exit span code origin has been disabled since tracer version 3.2.8.
span.Tags.GetTag($"{CodeOriginTag}.type").Should().BeNull();

/* Uncomment when exit span will be enabled again
var tags = ((List<KeyValuePair<string, string>>)(typeof(Datadog.Trace.Tagging.TagsList).GetField("_tags", BindingFlags.Instance | BindingFlags.NonPublic).GetValue(span.Tags))).Select(i => i.Key).ToList();
tags.Should().Contain(s => s.StartsWith($"{CodeOriginTag}.frames.0"));
tags.Should().Contain(s => s.StartsWith($"{CodeOriginTag}.frames.1"));
tags.Should().NotContain(s => s.StartsWith($"{CodeOriginTag}.frames.2"));
*/
}

[MethodImpl(MethodImplOptions.NoInlining)]
Expand Down
Loading