fix: Android - make sure logcat.log is attached to unhandled event (SIGSEGV Segfault)

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## Unreleased
+
+### Fixes
+
+- Android: Fix for SIGSEGV reported by Sentry when a NullReferenceException is thrown in Release mode ([#3694](https://github.com/getsentry/sentry-dotnet/pull/3694))
+  - To turn it on, set: `options.HandlerStrategy = NdkHandlerStrategy.SENTRY_HANDLER_STRATEGY_CHAIN_AT_START;`
+
 ## 4.12.1
 
 ### Fixes

src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj

@@ -1,9 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net7.0-android</TargetFramework>
     <!-- BG8605 and BG8606 happen because there's a missing androidx.lifecycle dependency, but we don't need it here.  (The native Android Sentry SDK will use it if it exists.) -->
     <NoWarn>$(NoWarn);BG8605;BG8606</NoWarn>
-    <SentryAndroidSdkVersion>7.14.0</SentryAndroidSdkVersion>
+    <SentryAndroidSdkVersion>7.15.0-alpha.1</SentryAndroidSdkVersion>
     <SentryAndroidSdkDirectory>$(BaseIntermediateOutputPath)sdks\Sentry\Android\$(SentryAndroidSdkVersion)\</SentryAndroidSdkDirectory>
     <Description>.NET Bindings for the Sentry Android SDK</Description>
   </PropertyGroup>
@@ -57,4 +57,4 @@
     />
   </Target>
 
-</Project>
+</Project>

src/Sentry/NdkHandlerStrategy.cs

@@ -0,0 +1,32 @@
+namespace Sentry
+{
+    /// <summary>
+    /// Handler strategy
+    /// </summary>
+    /// 
+    public enum NdkHandlerStrategy
+    {
+        /// <summary>
+        /// default handler strategy -> value 0
+        /// </summary>
+        SENTRY_HANDLER_STRATEGY_DEFAULT,
+        /// <summary>
+        /// Handle strategy chain at start -> value 1
+        /// </summary>
+        SENTRY_HANDLER_STRATEGY_CHAIN_AT_START,
+
+
+    }
+    /// <summary>
+    /// Extension class of strategy containing relevant its actions 
+    /// </summary>
+    public static class  HandlerStrategyExtension
+    {
+#if ANDROID
+        internal static JavaSdk.Android.Core.NdkHandlerStrategy ToJava(this NdkHandlerStrategy strategy)
+        {
+            return JavaSdk.Android.Core.NdkHandlerStrategy.Values()?[(int)strategy] ?? JavaSdk.Android.Core.NdkHandlerStrategy.SentryHandlerStrategyDefault;
+        }
+#endif
+    }
+}

src/Sentry/Platforms/Android/SentrySdk.cs

@@ -59,6 +59,9 @@ private static void InitSentryAndroidSdk(SentryOptions options)
 
         // Define the configuration for the Android SDK
         SentryAndroidOptions? nativeOptions = null;
+
+        var handlerStrategy = options.HandlerStrategy.ToJava();
+
         var configuration = new OptionsConfigurationCallback(o =>
         {
             // Capture the android options reference on the outer scope
@@ -87,6 +90,7 @@ private static void InitSentryAndroidSdk(SentryOptions options)
             o.ServerName = options.ServerName;
             o.SessionTrackingIntervalMillis = (long)options.AutoSessionTrackingInterval.TotalMilliseconds;
             o.ShutdownTimeoutMillis = (long)options.ShutdownTimeout.TotalMilliseconds;
+            o.SetNativeHandlerStrategy(handlerStrategy ?? JavaSdk.Android.Core.NdkHandlerStrategy.SentryHandlerStrategyDefault);
 
             if (options.CacheDirectoryPath is { } cacheDirectoryPath)
             {
@@ -185,11 +189,11 @@ private static void InitSentryAndroidSdk(SentryOptions options)
         }
         else
         {
-            SentryAndroid.Init(AppContext, configuration);
+            SentryAndroid.Init(AppContext);
         }
 
         // Set options for the managed SDK that depend on the Android SDK. (The user will not be able to modify these.)
-        options.AddEventProcessor(new AndroidEventProcessor(nativeOptions!));
+        options.AddEventProcessor(new AndroidEventProcessor((SentryAndroidOptions)nativeOptions!));
         if (options.Android.LogCatIntegration != LogCatIntegrationType.None)
         {
             options.AddEventProcessor(new LogCatAttachmentEventProcessor(options.DiagnosticLogger, options.Android.LogCatIntegration, options.Android.LogCatMaxLines));

src/Sentry/SentryOptions.cs

@@ -77,6 +77,10 @@ public bool IsGlobalModeEnabled
         set => _isGlobalModeEnabled = value;
     }
 #endif
+    /// <summary>
+    /// Handler Strategy
+    /// </summary>
+    public NdkHandlerStrategy HandlerStrategy { get; set; } = NdkHandlerStrategy.SENTRY_HANDLER_STRATEGY_DEFAULT;
 
     /// <summary>
     /// A scope set outside of Sentry SDK. If set, the global parameters from the SDK's scope will be sent to the observed scope.<br/>

test/Sentry.Maui.Tests/SentryMauiOptionsTests.cs

@@ -56,4 +56,31 @@ public void AttachScreenshots_Default()
         var options = new SentryMauiOptions();
         Assert.False(options.AttachScreenshot);
     }
+
+    [Fact]
+    public void HandlerStrategy_Default()
+    {
+        // Arrange
+        var options = new SentryMauiOptions();
+        var expected = NdkHandlerStrategy.SENTRY_HANDLER_STRATEGY_DEFAULT;
+
+        // Assert
+        // testing default state here so nothing to assert
+
+        // Act
+        Assert.Equal(expected, options.HandlerStrategy);
+    }
+    [Fact]
+    public void HandlerStrategy_set()
+    {
+        // Arrange
+        var options = new SentryMauiOptions();
+        var notExpected = NdkHandlerStrategy.SENTRY_HANDLER_STRATEGY_DEFAULT;
+
+        // Assert
+        options.HandlerStrategy = NdkHandlerStrategy.SENTRY_HANDLER_STRATEGY_CHAIN_AT_START;
+
+        // Act
+        Assert.NotEqual(notExpected, options.HandlerStrategy);
+    }
 }