Skip to content

perf: reduce allocations in ConfigureScope callbacks #5856

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
Nov 3, 2026
Merged

perf: reduce allocations in ConfigureScope callbacks #5856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76bde18
perf: reduce allocations in ConfigureScope callbacks
XAN9xXx Nov 2, 2026
e500d47
refactor: simplify state passed to ConfigureScope callbacks
XAN9xXx Nov 3, 2026
f264903
test: update ConfigureScope assertions for state overload
XAN9xXx Nov 3, 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
2 changes: 1 addition & 1 deletion src/Sentry.AspNet/HttpContextExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public static ITransactionTracer StartSentryTransaction(this HttpContext httpCon
var transaction = SentrySdk.StartTransaction(transactionContext, customSamplingContext, dynamicSamplingContext);
transaction.Contexts.Trace.Origin = AspNetOrigin;

SentrySdk.ConfigureScope(scope => scope.Transaction = transaction);
SentrySdk.ConfigureScope(static (scope, transaction) => scope.Transaction = transaction, transaction);
httpContext.Items[HttpContextTransactionItemName] = transaction;

if (options?.SendDefaultPii is true)
Expand Down
9 changes: 3 additions & 6 deletions src/Sentry.AspNetCore.Blazor.WebAssembly/Internal/BlazorWasmOptionsSetup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,7 @@ public void Configure(SentryBlazorOptions options)
var previousUrl = _navigationManager.Uri;

// Set the initial scope request URL
_hub.ConfigureScope(scope =>
{
scope.Request.Url = ToRelativePath(previousUrl);
});
_hub.ConfigureScope(static (scope, url) => scope.Request.Url = url, ToRelativePath(previousUrl));

_navigationManager.LocationChanged += (_, args) =>
{
Expand All @@ -61,10 +58,10 @@ public void Configure(SentryBlazorOptions options)
{ "to", to }
}));

_hub.ConfigureScope(scope =>
_hub.ConfigureScope(static (scope, to) =>
{
scope.Request.Url = to;
});
}, to);

previousUrl = args.Location;
};
Expand Down
24 changes: 12 additions & 12 deletions src/Sentry.AspNetCore.Grpc/SentryGrpcInterceptor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ public override async Task<TResponse> UnaryServerHandler<TRequest, TResponse>(

using (hub.PushAndLockScope())
{
hub.ConfigureScope(scope =>
hub.ConfigureScope(static (scope, state) =>
{
scope.OnEvaluating += (_, activeScope) => activeScope.Populate(context, request, _options);
});
scope.OnEvaluating += (_, activeScope) => activeScope.Populate(state.Context, state.Request, state.Options);
}, (Options: _options, Context: context, Request: request));

try
{
Expand Down Expand Up @@ -102,10 +102,10 @@ public override async Task ServerStreamingServerHandler<TRequest, TResponse>(TRe

using (hub.PushAndLockScope())
{
hub.ConfigureScope(scope =>
hub.ConfigureScope(static (scope, state) =>
{
scope.OnEvaluating += (_, activeScope) => activeScope.Populate(context, request, _options);
});
scope.OnEvaluating += (_, activeScope) => activeScope.Populate(state.Context, state.Request, state.Options);
}, (Options: _options, Context: context, Request: request));

try
{
Expand Down Expand Up @@ -140,10 +140,10 @@ public override async Task<TResponse> ClientStreamingServerHandler<TRequest, TRe

using (hub.PushAndLockScope())
{
hub.ConfigureScope(scope =>
hub.ConfigureScope(static (scope, state) =>
{
scope.OnEvaluating += (_, activeScope) => activeScope.Populate<TRequest>(context, null, _options);
});
scope.OnEvaluating += (_, activeScope) => activeScope.Populate<TRequest>(state.Context, null, state.Options);
}, (Options: _options, Context: context));

try
{
Expand Down Expand Up @@ -183,10 +183,10 @@ public override async Task DuplexStreamingServerHandler<TRequest, TResponse>(

using (hub.PushAndLockScope())
{
hub.ConfigureScope(scope =>
hub.ConfigureScope(static (scope, state) =>
{
scope.OnEvaluating += (_, activeScope) => activeScope.Populate<TRequest>(context, null, _options);
});
scope.OnEvaluating += (_, activeScope) => activeScope.Populate<TRequest>(state.Context, null, state.Options);
}, (Options: _options, Context: context));

try
{
Expand Down
2 changes: 1 addition & 1 deletion src/Sentry.Maui.CommunityToolkit.Mvvm/MauiCommunityToolkitMvvmEventsBinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ private void RelayCommandOnPropertyChanged(object? sender, PropertyChangedEventA
var span = hub.StartSpan(SpanName, SpanOp);
if (span is ITransactionTracer transaction)
{
hub.ConfigureScope(scope => scope.Transaction = transaction);
hub.ConfigureScope(static (scope, transaction) => scope.Transaction = transaction, transaction);
}

relay.SetFused(span);
Expand Down
2 changes: 1 addition & 1 deletion src/Sentry/Integrations/GlobalRootScopeIntegration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ public void Register(IHub hub, SentryOptions options)
return;
}

hub.ConfigureScope(scope => scope.User.Id ??= options.InstallationId);
hub.ConfigureScope(static (scope, options) => scope.User.Id ??= options.InstallationId, options);
}
}
12 changes: 9 additions & 3 deletions test/Sentry.Tests/Integrations/GlobalRootScopeIntegrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ public void Register_GlobalModeDisabled_DoesNotConfigureScope()
integration.Register(hub, options);

// Assert
hub.DidNotReceive().ConfigureScope(Arg.Any<Action<Scope>>());
hub.DidNotReceive().ConfigureScope(
Arg.Any<Action<Scope, SentryOptions>>(),
Arg.Any<SentryOptions>());
scope.User.Id.Should().BeNull();
}

Expand All @@ -48,7 +50,9 @@ public void Register_GlobalModeEnabled_SetsInstallationIdOnRootScope()
integration.Register(hub, options);

// Assert
hub.Received(1).ConfigureScope(Arg.Any<Action<Scope>>());
hub.Received(1).ConfigureScope(
Arg.Any<Action<Scope, SentryOptions>>(),
Arg.Any<SentryOptions>());
scope.User.Id.Should().Be(options.InstallationId);
}

Expand Down Expand Up @@ -79,7 +83,9 @@ public void Register_GlobalModeEnabled_DoesNotOverwriteExistingUserId()
integration.Register(hub, options);

// Assert
hub.Received(1).ConfigureScope(Arg.Any<Action<Scope>>());
hub.Received(1).ConfigureScope(
Arg.Any<Action<Scope, SentryOptions>>(),
Arg.Any<SentryOptions>());
scope.User.Id.Should().Be(oldId);
}

Expand Down
Loading