Add IHostBuilder support

src/Sentry.AspNetCore/Extensions/DependencyInjection/ServiceCollectionExtensions.cs

@@ -1,4 +1,6 @@
 using System.ComponentModel;
+using System.Linq;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Sentry.AspNetCore;
 using Sentry.Extensibility;
@@ -20,17 +22,55 @@ internal static class ServiceCollectionExtensions
         /// <returns></returns>
         public static ISentryBuilder AddSentry(this IServiceCollection services)
         {
-            services.AddSingleton<ISentryEventProcessor, AspNetCoreEventProcessor>();
+            if(!services.IsRegistered<ISentryEventProcessor, AspNetCoreEventProcessor>())
+            {
+                services.AddSingleton<ISentryEventProcessor, AspNetCoreEventProcessor>();
+            }
+
             services.TryAddSingleton<IUserFactory, DefaultUserFactory>();
 
-            services
-                    .AddSingleton<IRequestPayloadExtractor, FormRequestPayloadExtractor>()
-                    // Last
-                    .AddSingleton<IRequestPayloadExtractor, DefaultRequestPayloadExtractor>();
+
+            if(!services.IsRegistered<IRequestPayloadExtractor, FormRequestPayloadExtractor>())
+            {
+                services.AddSingleton<IRequestPayloadExtractor, FormRequestPayloadExtractor>();
+            }
+
+            // Last
+            if(!services.IsRegistered<IRequestPayloadExtractor, DefaultRequestPayloadExtractor>())
+            {
+                services.AddSingleton<IRequestPayloadExtractor, DefaultRequestPayloadExtractor>();
+            }
 
             services.AddSentry<SentryAspNetCoreOptions>();
 
             return new SentryAspNetCoreBuilder(services);
         }
+
+        /// <summary>
+        /// Checks if a specific ServiceDescriptor was previously registered in the <see cref="IServiceCollection"/>
+        /// </summary>
+        /// <param name="serviceCollection"></param>
+        /// <typeparam name="T"></typeparam>
+        /// <typeparam name="TU"></typeparam>
+        /// <returns></returns>
+        internal static bool IsRegistered<T, TU>(this IServiceCollection serviceCollection)
+        {
+            return serviceCollection.Any(x => x.ImplementationType == typeof(T) && x.ServiceType == typeof(TU));
+        }
+
+        /// <summary>
+        /// Adds Sentry's StartupFilter to the <see cref="IServiceCollection"/>
+        /// </summary>
+        /// <param name="serviceCollection"></param>
+        /// <returns></returns>
+        internal static IServiceCollection AddSentryStartupFilter(this IServiceCollection serviceCollection)
+        {
+            if(!serviceCollection.IsRegistered<IStartupFilter, SentryStartupFilter>())
+            {
+                _ = serviceCollection.AddTransient<IStartupFilter, SentryStartupFilter>();
+            }
+
+            return serviceCollection;
+        }
     }
 }

src/Sentry.AspNetCore/Sentry.AspNetCore.csproj

@@ -15,6 +15,7 @@
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="2.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="2.1.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.0" />

src/Sentry.AspNetCore/SentryHostBuilderExtensions.cs

@@ -0,0 +1,93 @@
+using System;
+using System.ComponentModel;
+using Microsoft.Extensions.DependencyInjection;
+using Sentry.AspNetCore;
+
+// ReSharper disable once CheckNamespace
+namespace Microsoft.Extensions.Hosting
+{
+    /// <summary>
+    /// Extension methods to <see cref="IHostBuilder"/>
+    /// </summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public static class SentryHostBuilderExtensions
+    {
+        /// <summary>
+        /// Uses Sentry integration.
+        /// </summary>
+        /// <param name="builder">The builder.</param>
+        /// <returns></returns>
+        public static IHostBuilder UseSentry(this IHostBuilder builder)
+            => builder.UseSentry((Action<SentryAspNetCoreOptions>?)null);
+
+        /// <summary>
+        /// Uses Sentry integration.
+        /// </summary>
+        /// <param name="builder">The builder.</param>
+        /// <param name="dsn">The DSN.</param>
+        /// <returns></returns>
+        public static IHostBuilder UseSentry(this IHostBuilder builder, string dsn)
+            => builder.UseSentry(o => o.Dsn = dsn);
+
+        /// <summary>
+        /// Uses Sentry integration.
+        /// </summary>
+        /// <param name="builder">The builder.</param>
+        /// <param name="configureOptions">The configure options.</param>
+        /// <returns></returns>
+        public static IHostBuilder UseSentry(
+            this IHostBuilder builder,
+            Action<SentryAspNetCoreOptions>? configureOptions)
+            => builder.UseSentry((_, options) => configureOptions?.Invoke(options));
+
+        /// <summary>
+        /// Uses Sentry integration.
+        /// </summary>
+        /// <param name="builder">The builder.</param>
+        /// <param name="configureOptions">The configure options.</param>
+        /// <returns></returns>
+        public static IHostBuilder UseSentry(
+            this IHostBuilder builder,
+            Action<HostBuilderContext, SentryAspNetCoreOptions>? configureOptions)
+            => builder.UseSentry((context, sentryBuilder) =>
+                sentryBuilder.AddSentryOptions(options => configureOptions?.Invoke(context, options)));
+
+        /// <summary>
+        /// Uses Sentry integration.
+        /// </summary>
+        /// <param name="builder">The builder.</param>
+        /// <param name="configureSentry">The Sentry builder.</param>
+        /// <returns></returns>
+        public static IHostBuilder UseSentry(
+            this IHostBuilder builder,
+            Action<ISentryBuilder>? configureSentry) =>
+            builder.UseSentry((_, sentryBuilder) => configureSentry?.Invoke(sentryBuilder));
+
+        /// <summary>
+        /// Uses Sentry integration.
+        /// </summary>
+        /// <param name="builder">The builder.</param>
+        /// <param name="configureSentry">The Sentry builder.</param>
+        /// <returns></returns>
+        public static IHostBuilder UseSentry(
+            this IHostBuilder builder,
+            Action<HostBuilderContext, ISentryBuilder>? configureSentry)
+        {
+            // The earliest we can hook the SDK initialization code with the framework
+            // Initialization happens at a later time depending if the default MEL backend is enabled or not.
+            // In case the logging backend was replaced, init happens later, at the StartupFilter
+            _ = builder.ConfigureLogging((context, logging) =>
+            {
+                var sentryBuilder = logging.AddSentry(context.Configuration);
+                configureSentry?.Invoke(context, sentryBuilder);
+            });
+
+            _ = builder.ConfigureServices((c, s) =>
+            {
+                _ = s.AddSentryStartupFilter();
+            });
+
+            return builder;
+        }
+    }
+}

src/Sentry.AspNetCore/SentryLoggingBuilderExtensions.cs

@@ -0,0 +1,41 @@
+using System.ComponentModel;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Configuration;
+using Microsoft.Extensions.Options;
+
+namespace Sentry.AspNetCore
+{
+    /// <summary>
+    /// Extension methods for <see cref="ILoggingBuilder"/>
+    /// </summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    internal static class SentryLoggingBuilderExtensions
+    {
+        public static ISentryBuilder AddSentry(this ILoggingBuilder builder, IConfiguration configuration)
+        {
+            builder.AddConfiguration();
+
+            var section = configuration.GetSection("Sentry");
+            _ = builder.Services.Configure<SentryAspNetCoreOptions>(section);
+
+            if(!builder.Services.IsRegistered<IConfigureOptions<SentryAspNetCoreOptions>, SentryAspNetCoreOptionsSetup>())
+            {
+                _ = builder.Services
+                    .AddSingleton<IConfigureOptions<SentryAspNetCoreOptions>, SentryAspNetCoreOptionsSetup>();
+            }
+
+            if(!builder.Services.IsRegistered<ILoggerProvider, SentryAspNetCoreLoggerProvider>())
+            {
+                _ = builder.Services.AddSingleton<ILoggerProvider, SentryAspNetCoreLoggerProvider>();
+            }
+
+            _ = builder.AddFilter<SentryAspNetCoreLoggerProvider>(
+                "Microsoft.AspNetCore.Diagnostics.ExceptionHandlerMiddleware",
+                LogLevel.None);
+
+            return builder.Services.AddSentry();
+        }
+    }
+}

src/Sentry.AspNetCore/SentryWebHostBuilderExtensions.cs

@@ -1,9 +1,6 @@
 using System;
 using System.ComponentModel;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Configuration;
-using Microsoft.Extensions.Options;
 using Sentry.AspNetCore;
 
 // ReSharper disable once CheckNamespace
@@ -81,24 +78,14 @@ public static IWebHostBuilder UseSentry(
             // In case the logging backend was replaced, init happens later, at the StartupFilter
             _ = builder.ConfigureLogging((context, logging) =>
             {
-                logging.AddConfiguration();
-
-                var section = context.Configuration.GetSection("Sentry");
-                _ = logging.Services.Configure<SentryAspNetCoreOptions>(section);
-
-                _ = logging.Services
-                    .AddSingleton<IConfigureOptions<SentryAspNetCoreOptions>, SentryAspNetCoreOptionsSetup>();
-                _ = logging.Services.AddSingleton<ILoggerProvider, SentryAspNetCoreLoggerProvider>();
-
-                _ = logging.AddFilter<SentryAspNetCoreLoggerProvider>(
-                    "Microsoft.AspNetCore.Diagnostics.ExceptionHandlerMiddleware",
-                    LogLevel.None);
-
-                var sentryBuilder = logging.Services.AddSentry();
+                var sentryBuilder = logging.AddSentry(context.Configuration);
                 configureSentry?.Invoke(context, sentryBuilder);
             });
 
-            _ = builder.ConfigureServices(c => _ = c.AddTransient<IStartupFilter, SentryStartupFilter>());
+            _ = builder.ConfigureServices(c =>
+            {
+                _ = c.AddSentryStartupFilter();
+            });
 
             return builder;
         }