MAUI SentryAppBuilder

src/Sentry.Maui.CommunityToolkit.Mvvm/SentryOptionsExtensions.cs → src/Sentry.Maui.CommunityToolkit.Mvvm/SentryMauiAppBuilderExtensions.cs

@@ -5,14 +5,11 @@ namespace Sentry.Maui;
 /// <summary>
 /// Methods to hook into MAUI and CommunityToolkit.Mvvm
 /// </summary>
-public static class SentryOptionsExtensions
+public static class SentryMauiAppBuilderExtensions
 {
     /// <summary>
     /// Automatically create traces for CommunityToolkit.Mvvm commands
     /// </summary>
-    public static SentryMauiOptions AddCommunityToolkitIntegration(this SentryMauiOptions options)
-    {
-        options.AddDefaultEventBinder<MauiCommunityToolkitMvvmEventsBinder>();
-        return options;
-    }
+    public static SentryMauiAppBuilder AddCommunityToolkitIntegration(this SentryMauiAppBuilder builder)
+        => builder.AddMauiElementBinder<MauiCommunityToolkitMvvmEventsBinder>();
 }

src/Sentry.Maui/SentryMauiAppBuilder.cs

@@ -0,0 +1,23 @@
+namespace Sentry.Maui;
+
+/// <summary>
+/// A builder for configuring Sentry in a .NET MAUI application.
+/// </summary>
+public class SentryMauiAppBuilder(IServiceCollection services)
+{
+    /// <summary>
+    /// Access the current service collection
+    /// </summary>
+    public IServiceCollection Services => services;
+
+    /// <summary>
+    /// Configures the application by adding a binding for a Maui element of the specified implementation type.
+    /// </summary>
+    /// <typeparam name="TEventBinder">The type of implementation for the Maui element binder to be added.</typeparam>
+    /// <returns>The current instance of <see cref="SentryMauiAppBuilder"/> to allow method chaining.</returns>
+    public SentryMauiAppBuilder AddMauiElementBinder<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TEventBinder>() where TEventBinder : class, IMauiElementEventBinder
+    {
+        Services.AddSingleton<IMauiElementEventBinder, TEventBinder>();
+        return this;
+    }
+}

src/Sentry.Maui/SentryMauiAppBuilderExtensions.cs

@@ -22,26 +22,30 @@
     /// </summary>
     /// <param name="builder">The builder.</param>
     /// <returns>The <paramref name="builder"/>.</returns>
-    public static MauiAppBuilder UseSentry(this MauiAppBuilder builder)
-        => UseSentry(builder, (Action<SentryMauiOptions>?)null);
+    public static MauiAppBuilder UseSentry(this MauiAppBuilder builder, Action<SentryMauiAppBuilder>? configureAppBuilder = null)
+        => UseSentry(builder, (Action<SentryMauiOptions>?)null, configureAppBuilder);
 
     /// <summary>
     /// Uses Sentry integration.
     /// </summary>
     /// <param name="builder">The builder.</param>
     /// <param name="dsn">The DSN.</param>
     /// <returns>The <paramref name="builder"/>.</returns>
-    public static MauiAppBuilder UseSentry(this MauiAppBuilder builder, string dsn)
-        => builder.UseSentry(o => o.Dsn = dsn);
+    public static MauiAppBuilder UseSentry(this MauiAppBuilder builder, string dsn, Action<SentryMauiAppBuilder>? configureAppBuilder = null)
+        => builder.UseSentry(o => o.Dsn = dsn, configureAppBuilder: configureAppBuilder);
 
     /// <summary>
     /// Uses Sentry integration.
     /// </summary>
     /// <param name="builder">The builder.</param>
     /// <param name="configureOptions">An action to configure the options.</param>
+    /// <param name="configureAppBuilder">Optional parameter that allows you to configure and add additional sentry services like MAUI element event binders</param>
     /// <returns>The <paramref name="builder"/>.</returns>
-    public static MauiAppBuilder UseSentry(this MauiAppBuilder builder,
-        Action<SentryMauiOptions>? configureOptions)
+    public static MauiAppBuilder UseSentry(
+        this MauiAppBuilder builder,
+        Action<SentryMauiOptions>? configureOptions,
+        Action<SentryMauiAppBuilder>? configureAppBuilder = null
+    )
     {
         var services = builder.Services;
 
@@ -56,20 +60,22 @@
         services.AddSingleton<IConfigureOptions<SentryMauiOptions>, SentryMauiOptionsSetup>();
         services.AddSingleton<Disposer>();
 
+        services.TryAddSingleton<IMauiElementEventBinder, MauiButtonEventsBinder>();
+        services.TryAddSingleton<IMauiElementEventBinder, MauiImageButtonEventsBinder>();
+        services.TryAddSingleton<IMauiElementEventBinder, MauiGestureRecognizerEventsBinder>();
+        services.TryAddSingleton<IMauiElementEventBinder, MauiVisualElementEventsBinder>();
         // Resolve the configured options and register any element event binders from these
-        IServiceProvider serviceProvider = services.BuildServiceProvider();
-        var options = serviceProvider.GetRequiredService<IOptions<SentryMauiOptions>>().Value;
-        services.TryAddSingleton<SentryOptions>(options); // Ensure this doesn't get resolved again in AddSentry
-        foreach (var eventBinder in options.DefaultEventBinders)
-        {
-            eventBinder.Register(services);
-        }
 
         // This is ultimately the class that enables all the MauiElementEventBinders above
         services.TryAddSingleton<IMauiEventsBinder, MauiEventsBinder>();
-
         services.AddSentry<SentryMauiOptions>();
 
+        if (configureAppBuilder != null)
+        {
+            var appBuilder = new SentryMauiAppBuilder(services);
+            configureAppBuilder.Invoke(appBuilder);
+        }
+
         builder.RegisterMauiEventsBinder();
 
         return builder;

src/Sentry.Maui/SentryMauiOptions.cs

@@ -23,18 +23,6 @@ public SentryMauiOptions()
 #if !PLATFORM_NEUTRAL
         CacheDirectoryPath = Microsoft.Maui.Storage.FileSystem.CacheDirectory;
 #endif
-        AddDefaultEventBinder<MauiButtonEventsBinder>();
-        AddDefaultEventBinder<MauiImageButtonEventsBinder>();
-        AddDefaultEventBinder<MauiGestureRecognizerEventsBinder>();
-        AddDefaultEventBinder<MauiVisualElementEventsBinder>();
-    }
-
-    internal List<IMauiElementEventBinderRegistration> DefaultEventBinders { get; } = [];
-
-    internal void AddDefaultEventBinder<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TEventBinder>()
-        where TEventBinder : class, IMauiElementEventBinder
-    {
-        DefaultEventBinders.Add(new MauiElementEventBinderRegistration<TEventBinder>());
     }
 
     /// <summary>