Fixed: SentryHttpMessageHandler added when AddHttpClient is before Us…

…eSentry (#2390) * Fixed #2373: SentryHttpMessageHandler not being added when AddHttpClient is before UseSentry Fixes #2373 * Updated changelog
getsentry · May 24, 2023 · dcc32b2 · dcc32b2
1 parent 3e8edb7
commit dcc32b2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,8 +2,9 @@
 
 ## Unreleased
 
-## Fixes
+### Fixes
 
+- SentryHttpMessageHandler added when AddHttpClient is before UseSentry ([#2390](https://github.com/getsentry/sentry-dotnet/pull/2390))
 - Set the native sdk name for Android ([#2389](https://github.com/getsentry/sentry-dotnet/pull/2389))
 
 ## 3.33.0

diff --git a/src/Sentry.Extensions.Logging/Extensions/DependencyInjection/ServiceCollectionExtensions.cs b/src/Sentry.Extensions.Logging/Extensions/DependencyInjection/ServiceCollectionExtensions.cs
@@ -40,7 +40,8 @@ public static IServiceCollection AddSentry<TOptions>(this IServiceCollection ser
 
         // Custom handler for HttpClientFactory.
         // Must be singleton: https://github.com/getsentry/sentry-dotnet/issues/785
-        services.TryAddSingleton<IHttpMessageHandlerBuilderFilter, SentryHttpMessageHandlerBuilderFilter>();
+        // Must use AddSingleton: https://github.com/getsentry/sentry-dotnet/issues/2373
+        services.AddSingleton<IHttpMessageHandlerBuilderFilter, SentryHttpMessageHandlerBuilderFilter>();
 
         return services;
     }

diff --git a/src/Sentry.Extensions.Logging/SentryHttpMessageHandlerBuilderFilter.cs b/src/Sentry.Extensions.Logging/SentryHttpMessageHandlerBuilderFilter.cs
@@ -14,7 +14,13 @@ public Action<HttpMessageHandlerBuilder> Configure(Action<HttpMessageHandlerBuil
         handlerBuilder =>
         {
             var hub = _getHub();
-            handlerBuilder.AdditionalHandlers.Add(new SentryHttpMessageHandler(hub));
+            if (!handlerBuilder.AdditionalHandlers.Any(h => h is SentryHttpMessageHandler))
+            {
+                handlerBuilder.AdditionalHandlers.Add(
+                    new SentryHttpMessageHandler(hub)
+                );
+            }
+
             next(handlerBuilder);
         };
 }