Skip to content

Add a null check on transaction for Error #2618

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 5 commits into from
Jul 11, 2025
Merged

Add a null check on transaction for Error #2618

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f5b7c83
Add a null check on transaction for Error
JeremyBessonElastic Jun 30, 2025
f22209f
Create a context, if not exists, when capturing a baggage for errors
JeremyBessonElastic Jul 11, 2025
e6f4012
Fix
JeremyBessonElastic Jul 11, 2025
80fe616
Fix
JeremyBessonElastic Jul 11, 2025
64e3ad0
Fix
JeremyBessonElastic Jul 11, 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
6 changes: 4 additions & 2 deletions src/Elastic.Apm/Model/Error.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
// See the LICENSE file in the project root for more information

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
Expand Down Expand Up @@ -66,13 +65,16 @@ private void CheckAndCaptureBaggage(Transaction transaction)

//if context was not set prior we set it now to ensure we capture baggage for errors
//occuring during unsampled transactions
Context ??= transaction.Context.DeepCopy();
Context ??= transaction?.Context.DeepCopy();
Comment thread
JeremyBessonElastic marked this conversation as resolved.

foreach (var baggage in Activity.Current.Baggage)
{
if (!WildcardMatcher.IsAnyMatch(Configuration.BaggageToAttach, baggage.Key))
continue;

// The context is created only if there is a baggage value to insert.
Context ??= new Context();

var newKey = $"baggage.{baggage.Key}";
var labels = Context.InternalLabels.Value;
labels[newKey] = baggage.Value;
Expand Down
Loading