Skip to content

fix(otel): only set Scope.Transaction in SentrySpanProcessor when null #5337

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
jamescrosswell merged 3 commits into from
Jul 10, 2026
+35 −1
Merged

fix(otel): only set Scope.Transaction in SentrySpanProcessor when null #5337

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a20eba
fix(otel): only set Scope.Transaction in CreateRootSpan when null
tsushanth Jul 6, 2026
c9f0b84
fix(otel): use ??= operator and fix test to exercise the actual guard
tsushanth Jul 6, 2026
49584fd
test: fix test to actually impact the code change
Flash0ver Jul 8, 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
5 changes: 4 additions & 1 deletion src/Sentry.OpenTelemetry/SentrySpanProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,10 @@ private void CreateRootSpan(Activity data)
tracer.Contexts.Trace.Origin = OpenTelemetryOrigin;
tracer.StartTimestamp = data.StartTimeUtc;
}
_hub.ConfigureScope(static (scope, transaction) => scope.Transaction = transaction, transaction);
_hub.ConfigureScope(static (scope, transaction) =>
{
scope.Transaction ??= transaction;
}, transaction);
Comment thread
sentry[bot] marked this conversation as resolved.
transaction.SetFused(data);
_map[data.SpanId] = transaction;
}
Expand Down
21 changes: 21 additions & 0 deletions test/Sentry.OpenTelemetry.Tests/SentrySpanProcessorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1012,4 +1012,25 @@ public void ParseOtelSpanDescription_HttpClient()
description.Should().Be("POST https://example.com/foo");
source.Should().Be(TransactionNameSource.Custom);
}

[Fact]
public void OnStart_WithExistingTransactionOnScope_DoesNotOverwriteExistingTransaction()
Comment thread
jamescrosswell marked this conversation as resolved.
{
_fixture.Options.Instrumenter = Instrumenter.OpenTelemetry;
_fixture.Options.TracesSampleRate = 1.0;
var sut = _fixture.GetSut();

using var firstActivity = Tracer.StartActivity("Existing");
sut.OnStart(firstActivity!);
Assert.True(sut._map.TryGetValue(firstActivity.SpanId, out var firstTransaction));

using var secondActivity = Tracer.StartActivity("NewRootActivity");
sut.OnStart(secondActivity!);

object scopeTransaction = null;
_fixture.Hub.ConfigureScope(scope => scopeTransaction = scope.Transaction);

scopeTransaction.Should().BeSameAs(firstTransaction,
"CreateRootSpan should not overwrite an already-set Scope.Transaction");
Comment thread
Flash0ver marked this conversation as resolved.
}
Comment thread
cursor[bot] marked this conversation as resolved.
Comment thread
cursor[bot] marked this conversation as resolved.
}
Loading