Fixed null IServiceProvider in anonymous routes with OpenTelemetry (#…

…3401)
getsentry · Jun 5, 2024 · 1447b55 · 1447b55
1 parent aa60fc1
commit 1447b55
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Fixes
+
+- Fixed null IServiceProvider in anonymous routes with OpenTelemetry ([#3401](https://github.com/getsentry/sentry-dotnet/pull/3401))
+
 ### Dependencies
 
 - Bump CLI from v2.31.2 to v2.32.1 ([#3398](https://github.com/getsentry/sentry-dotnet/pull/3398))

diff --git a/src/Sentry.AspNetCore/ScopeExtensions.cs b/src/Sentry.AspNetCore/ScopeExtensions.cs
@@ -38,7 +38,10 @@ public static void Populate(this Scope scope, HttpContext context, SentryAspNetC
 
         if (options.SendDefaultPii && !scope.HasUser())
         {
-            var userFactory = context.RequestServices.GetService<ISentryUserFactory>();
+            // Although the compiler suggests context.RequestServices cannot be null, in practice it can be, so we
+            // have a null check here.
+            // See: https://github.com/getsentry/sentry-dotnet/issues/3395
+            var userFactory = context.RequestServices?.GetService<ISentryUserFactory>();
             var user = userFactory?.Create();
 
             if (user != null)