Skip to content

Avoid shallow exception thrown already existing activity parent #2613

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
JeremyBessonElastic merged 7 commits into from
Jun 26, 2025
Merged

Avoid shallow exception thrown already existing activity parent #2613

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9acab96
Fix null reference exception in TryToCompressRegular method in Span
JeremyBessonElastic May 27, 2025
a539e6e
Merge branch 'main' of github.com:elastic/apm-agent-dotnet
JeremyBessonElastic May 28, 2025
23d9fc4
Merge branch 'main' of github.com:elastic/apm-agent-dotnet
JeremyBessonElastic Jun 3, 2025
f9580f7
Merge branch 'main' of github.com:elastic/apm-agent-dotnet
JeremyBessonElastic Jun 20, 2025
470cb7b
Avoid that a shallow exception got thrown when trying to set a parent…
JeremyBessonElastic Jun 20, 2025
fed1b5f
Fix
JeremyBessonElastic Jun 20, 2025
f57a1eb
Fix
JeremyBessonElastic Jun 20, 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
12 changes: 8 additions & 4 deletions src/Elastic.Apm/Model/Transaction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,10 +270,14 @@ internal Transaction(
// This is so that the distributed tracing data will flow to any child activities
try
{
_activity.SetParentId(
ActivityTraceId.CreateFromString(distributedTracingData.TraceId.AsSpan()),
ActivitySpanId.CreateFromString(distributedTracingData.ParentId.AsSpan()),
distributedTracingData.FlagRecorded ? ActivityTraceFlags.Recorded : ActivityTraceFlags.None);
// Only if the parent does not already exist
if (_activity.ParentId == null && _activity.Parent == null)
{
_activity.SetParentId(
ActivityTraceId.CreateFromString(distributedTracingData.TraceId.AsSpan()),
ActivitySpanId.CreateFromString(distributedTracingData.ParentId.AsSpan()),
distributedTracingData.FlagRecorded ? ActivityTraceFlags.Recorded : ActivityTraceFlags.None);
}

if (distributedTracingData.HasTraceState)
_activity.TraceStateString = distributedTracingData.TraceState.ToTextHeader();
Expand Down
Loading