ref: Use .NET 6.0 ArgumentNullException throw helpers (#4985)

Copilot · jamescrosswell · Flash0ver · web-flow · commit a4a8ded702be · 2026-03-18T08:46:32.000+01:00
Co-authored-by: copilot-swe-agent[bot] &lt;198982749+Copilot@users.noreply.github.com&gt;
Co-authored-by: jamescrosswell &lt;728212+jamescrosswell@users.noreply.github.com&gt;
Co-authored-by: Stefan Pölz &lt;38893694+Flash0ver@users.noreply.github.com&gt;
diff --git a/src/Sentry.AspNet/Internal/SystemWebRequestEventProcessor.cs b/src/Sentry.AspNet/Internal/SystemWebRequestEventProcessor.cs
@@ -14,8 +14,11 @@ internal class SystemWebRequestEventProcessor : ISentryEventProcessor
 
     public SystemWebRequestEventProcessor(IRequestPayloadExtractor payloadExtractor, SentryOptions options)
     {
-        _options = options ?? throw new ArgumentNullException(nameof(options));
-        PayloadExtractor = payloadExtractor ?? throw new ArgumentNullException(nameof(payloadExtractor));
+        ArgumentNullException.ThrowIfNull(payloadExtractor);
+        ArgumentNullException.ThrowIfNull(options);
+
+        _options = options;
+        PayloadExtractor = payloadExtractor;
     }
 
     public SentryEvent? Process(SentryEvent? @event)
diff --git a/src/Sentry.AspNetCore.Grpc/ProtobufRequestExtractionDispatcher.cs b/src/Sentry.AspNetCore.Grpc/ProtobufRequestExtractionDispatcher.cs
@@ -23,9 +23,13 @@ public class ProtobufRequestExtractionDispatcher : IProtobufRequestPayloadExtrac
     public ProtobufRequestExtractionDispatcher(IEnumerable<IProtobufRequestPayloadExtractor> extractors,
         SentryOptions options, Func<RequestSize> sizeSwitch)
     {
-        Extractors = extractors ?? throw new ArgumentNullException(nameof(extractors));
-        _options = options ?? throw new ArgumentNullException(nameof(options));
-        _sizeSwitch = sizeSwitch ?? throw new ArgumentNullException(nameof(sizeSwitch));
+        ArgumentNullException.ThrowIfNull(extractors);
+        ArgumentNullException.ThrowIfNull(options);
+        ArgumentNullException.ThrowIfNull(sizeSwitch);
+
+        Extractors = extractors;
+        _options = options;
+        _sizeSwitch = sizeSwitch;
     }
 
     /// <summary>
diff --git a/src/Sentry.AspNetCore.Grpc/SentryGrpcInterceptor.cs b/src/Sentry.AspNetCore.Grpc/SentryGrpcInterceptor.cs
@@ -27,7 +27,9 @@ public SentryGrpcInterceptor(
         Func<IHub> hubAccessor,
         IOptions<SentryAspNetCoreOptions> options)
     {
-        _hubAccessor = hubAccessor ?? throw new ArgumentNullException(nameof(hubAccessor));
+        ArgumentNullException.ThrowIfNull(hubAccessor);
+
+        _hubAccessor = hubAccessor;
         _options = options.Value;
         var hub = _hubAccessor();
         foreach (var callback in _options.ConfigureScopeCallbacks)
diff --git a/src/Sentry.AspNetCore/SentryAspNetCoreBuilder.cs b/src/Sentry.AspNetCore/SentryAspNetCoreBuilder.cs
@@ -11,6 +11,8 @@ internal class SentryAspNetCoreBuilder : ISentryBuilder
 
     public SentryAspNetCoreBuilder(IServiceCollection services)
     {
-        Services = services ?? throw new ArgumentNullException(nameof(services));
+        ArgumentNullException.ThrowIfNull(services);
+
+        Services = services;
     }
 }
diff --git a/src/Sentry.AspNetCore/SentryMiddleware.cs b/src/Sentry.AspNetCore/SentryMiddleware.cs
@@ -62,7 +62,9 @@ public SentryMiddleware(
         IEnumerable<ISentryEventProcessor> eventProcessors,
         IEnumerable<ISentryTransactionProcessor> transactionProcessors)
     {
-        _getHub = getHub ?? throw new ArgumentNullException(nameof(getHub));
+        ArgumentNullException.ThrowIfNull(getHub);
+
+        _getHub = getHub;
         _options = options.Value;
         _hostingEnvironment = hostingEnvironment;
         _logger = logger;
diff --git a/src/Sentry.Extensions.Logging/DelegateLogEntryFilter.cs b/src/Sentry.Extensions.Logging/DelegateLogEntryFilter.cs
@@ -15,7 +15,11 @@ public class DelegateLogEntryFilter : ILogEntryFilter
     /// </summary>
     /// <param name="filter"></param>
     public DelegateLogEntryFilter(Func<string, LogLevel, EventId, Exception?, bool> filter)
-        => _filter = filter ?? throw new ArgumentNullException(nameof(filter));
+    {
+        ArgumentNullException.ThrowIfNull(filter);
+
+        _filter = filter;
+    }
 
     /// <inheritdoc />
     public bool Filter(
diff --git a/src/Sentry/Extensibility/RequestBodyExtractionDispatcher.cs b/src/Sentry/Extensibility/RequestBodyExtractionDispatcher.cs
@@ -20,9 +20,13 @@ public class RequestBodyExtractionDispatcher : IRequestPayloadExtractor
     /// <param name="sizeSwitch">The max request size to capture.</param>
     public RequestBodyExtractionDispatcher(IEnumerable<IRequestPayloadExtractor> extractors, SentryOptions options, Func<RequestSize> sizeSwitch)
     {
-        Extractors = extractors ?? throw new ArgumentNullException(nameof(extractors));
-        _options = options ?? throw new ArgumentNullException(nameof(options));
-        _sizeSwitch = sizeSwitch ?? throw new ArgumentNullException(nameof(sizeSwitch));
+        ArgumentNullException.ThrowIfNull(extractors);
+        ArgumentNullException.ThrowIfNull(options);
+        ArgumentNullException.ThrowIfNull(sizeSwitch);
+
+        Extractors = extractors;
+        _options = options;
+        _sizeSwitch = sizeSwitch;
     }
 
     /// <summary>
diff --git a/src/Sentry/Internal/Http/DefaultSentryHttpClientFactory.cs b/src/Sentry/Internal/Http/DefaultSentryHttpClientFactory.cs
@@ -15,10 +15,7 @@ internal class DefaultSentryHttpClientFactory : ISentryHttpClientFactory
     /// <param name="options">The HTTP options.</param>
     public HttpClient Create(SentryOptions options)
     {
-        if (options == null)
-        {
-            throw new ArgumentNullException(nameof(options));
-        }
+        ArgumentNullException.ThrowIfNull(options);
 
         var handler = options.CreateHttpMessageHandler?.Invoke() ?? new HttpClientHandler();
         if (handler is HttpClientHandler httpClientHandler)
diff --git a/src/Sentry/Internal/Http/RetryAfterHandler.cs b/src/Sentry/Internal/Http/RetryAfterHandler.cs
@@ -28,7 +28,11 @@ public RetryAfterHandler(HttpMessageHandler innerHandler)
 
     internal RetryAfterHandler(HttpMessageHandler innerHandler, ISystemClock clock)
         : base(innerHandler)
-        => _clock = clock ?? throw new ArgumentNullException(nameof(clock));
+    {
+        ArgumentNullException.ThrowIfNull(clock);
+
+        _clock = clock;
+    }
 
     /// <summary>
     /// Sends an HTTP request to the inner handler while verifying the Response status code for HTTP 429.
diff --git a/src/Sentry/Internal/Polyfills.cs b/src/Sentry/Internal/Polyfills.cs
@@ -69,10 +69,7 @@ internal static class EnumerableExtensions
 {
     internal static bool TryGetNonEnumeratedCount<TSource>(this IEnumerable<TSource> source, out int count)
     {
-        if (source is null)
-        {
-            throw new ArgumentNullException(nameof(source));
-        }
+        ArgumentNullException.ThrowIfNull(source);
 
         if (source is ICollection<TSource> genericCollection)
         {
@@ -91,3 +88,26 @@ internal static bool TryGetNonEnumeratedCount<TSource>(this IEnumerable<TSource>
     }
 }
 #endif
+
+// TODO: remove when updating Polyfill: https://github.com/getsentry/sentry-dotnet/pull/4879
+#if !NET6_0_OR_GREATER
+internal static class ArgumentNullExceptionExtensions
+{
+    extension(ArgumentNullException)
+    {
+        public static void ThrowIfNull([NotNull] object? argument, [CallerArgumentExpression(nameof(argument))] string? paramName = null)
+        {
+            if (argument is null)
+            {
+                Throw(paramName);
+            }
+        }
+    }
+
+    [DoesNotReturn]
+    private static void Throw(string? paramName)
+    {
+        throw new ArgumentNullException(paramName);
+    }
+}
+#endif
diff --git a/src/Sentry/Internal/SdkComposer.cs b/src/Sentry/Internal/SdkComposer.cs
@@ -12,7 +12,9 @@ internal class SdkComposer
 
     public SdkComposer(SentryOptions options, BackpressureMonitor? backpressureMonitor)
     {
-        _options = options ?? throw new ArgumentNullException(nameof(options));
+        ArgumentNullException.ThrowIfNull(options);
+
+        _options = options;
         if (options.Dsn is null)
         {
             throw new ArgumentException("No DSN defined in the SentryOptions");
diff --git a/src/Sentry/SentryClient.cs b/src/Sentry/SentryClient.cs
@@ -45,7 +45,9 @@ internal SentryClient(
         ISessionManager? sessionManager = null,
         BackpressureMonitor? backpressureMonitor = null)
     {
-        _options = options ?? throw new ArgumentNullException(nameof(options));
+        ArgumentNullException.ThrowIfNull(options);
+
+        _options = options;
         _backpressureMonitor = backpressureMonitor;
         _randomValuesFactory = randomValuesFactory ?? new SynchronizedRandomValuesFactory();
         _sessionManager = sessionManager ?? new GlobalSessionManager(options);
diff --git a/src/Sentry/SentryOptions.cs b/src/Sentry/SentryOptions.cs
@@ -1204,10 +1204,7 @@ public StackTraceMode StackTraceMode
     public void AddJsonConverter(JsonConverter converter)
     {
         // protect against null because user may not have nullability annotations enabled
-        if (converter == null!)
-        {
-            throw new ArgumentNullException(nameof(converter));
-        }
+        ArgumentNullException.ThrowIfNull(converter);
 
         JsonExtensions.AddJsonConverter(converter);
     }
@@ -1228,10 +1225,7 @@ public void AddJsonSerializerContext<T>(Func<JsonSerializerOptions, T> contextBu
         where T : JsonSerializerContext
     {
         // protect against null because user may not have nullability annotations enabled
-        if (contextBuilder == null!)
-        {
-            throw new ArgumentNullException(nameof(contextBuilder));
-        }
+        ArgumentNullException.ThrowIfNull(contextBuilder);
 
         JsonExtensions.AddJsonSerializerContext(contextBuilder);
     }
@@ -1717,7 +1711,9 @@ public IEnumerable<ISentryEventExceptionProcessor> GetAllExceptionProcessors()
     /// <param name="sentryStackTraceFactory">The stack trace factory.</param>
     public SentryOptions UseStackTraceFactory(ISentryStackTraceFactory sentryStackTraceFactory)
     {
-        SentryStackTraceFactory = sentryStackTraceFactory ?? throw new ArgumentNullException(nameof(sentryStackTraceFactory));
+        ArgumentNullException.ThrowIfNull(sentryStackTraceFactory);
+
+        SentryStackTraceFactory = sentryStackTraceFactory;
         return this;
     }
 
diff --git a/test/Sentry.Tests/Protocol/DsnTests.cs b/test/Sentry.Tests/Protocol/DsnTests.cs
@@ -279,15 +279,8 @@ public override string ToString()
 
     private static void AssertEqual(DsnTestCase @case, Dsn dsn)
     {
-        if (@case == null)
-        {
-            throw new ArgumentNullException(nameof(@case));
-        }
-
-        if (dsn == null)
-        {
-            throw new ArgumentNullException(nameof(dsn));
-        }
+        Assert.NotNull(@case);
+        Assert.NotNull(dsn);
 
         var uri = dsn.GetStoreEndpointUri();
 

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,11 @@ internal class SystemWebRequestEventProcessor : ISentryEventProcessor`
`14`	`14`
`15`	`15`	`public SystemWebRequestEventProcessor(IRequestPayloadExtractor payloadExtractor, SentryOptions options)`
`16`	`16`	`{`
`17`		`- _options = options ?? throw new ArgumentNullException(nameof(options));`
`18`		`- PayloadExtractor = payloadExtractor ?? throw new ArgumentNullException(nameof(payloadExtractor));`
	`17`	`+ ArgumentNullException.ThrowIfNull(payloadExtractor);`
	`18`	`+ ArgumentNullException.ThrowIfNull(options);`
	`19`	`+`
	`20`	`+ _options = options;`
	`21`	`+ PayloadExtractor = payloadExtractor;`
`19`	`22`	`}`
`20`	`23`
`21`	`24`	`public SentryEvent? Process(SentryEvent? @event)`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@ internal class SentryAspNetCoreBuilder : ISentryBuilder`
`11`	`11`
`12`	`12`	`public SentryAspNetCoreBuilder(IServiceCollection services)`
`13`	`13`	`{`
`14`		`- Services = services ?? throw new ArgumentNullException(nameof(services));`
	`14`	`+ ArgumentNullException.ThrowIfNull(services);`
	`15`	`+`
	`16`	`+ Services = services;`
`15`	`17`	`}`
`16`	`18`	`}`