Merge 50c62ab into a22aea0

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## Unreleased
+
+### Features
+
+- Add support for setting sentry-native handler_strategy ([#3671](https://github.com/getsentry/sentry-java/pull/3671))
+
+### Dependencies
+
+- Bump `sentry-native` SDK to `d11359b` of [feat/inproc_handler_strategy](https://github.com/getsentry/sentry-native/pull/1027/)
+  - See the following issue for more details: https://github.com/getsentry/sentry-native/issues/1026
+
 ## 7.14.0
 
 ### Features

build.gradle.kts

@@ -225,7 +225,7 @@ spotless {
         target("**/*.java")
         removeUnusedImports()
         googleJavaFormat()
-        targetExclude("**/generated/**", "**/vendor/**")
+        targetExclude("**/generated/**", "**/vendor/**", "**/sentry-native/**")
     }
     kotlin {
         target("**/*.kt")

sentry-android-core/api/sentry-android-core.api

@@ -219,6 +219,14 @@ public final class io/sentry/android/core/LoadClass {
 	public fun loadClass (Ljava/lang/String;Lio/sentry/ILogger;)Ljava/lang/Class;
 }
 
+public final class io/sentry/android/core/NdkHandlerStrategy : java/lang/Enum {
+	public static final field SENTRY_HANDLER_STRATEGY_CHAIN_AT_START Lio/sentry/android/core/NdkHandlerStrategy;
+	public static final field SENTRY_HANDLER_STRATEGY_DEFAULT Lio/sentry/android/core/NdkHandlerStrategy;
+	public fun getValue ()I
+	public static fun valueOf (Ljava/lang/String;)Lio/sentry/android/core/NdkHandlerStrategy;
+	public static fun values ()[Lio/sentry/android/core/NdkHandlerStrategy;
+}
+
 public final class io/sentry/android/core/NdkIntegration : io/sentry/Integration, java/io/Closeable {
 	public static final field SENTRY_NDK_CLASS_NAME Ljava/lang/String;
 	public fun <init> (Ljava/lang/Class;)V
@@ -265,6 +273,7 @@ public final class io/sentry/android/core/SentryAndroidOptions : io/sentry/Sentr
 	public fun getDebugImagesLoader ()Lio/sentry/android/core/IDebugImagesLoader;
 	public fun getFrameMetricsCollector ()Lio/sentry/android/core/internal/util/SentryFrameMetricsCollector;
 	public fun getNativeSdkName ()Ljava/lang/String;
+	public fun getNdkHandlerStrategy ()I
 	public fun getProfilingTracesIntervalMillis ()I
 	public fun getStartupCrashDurationThresholdMillis ()J
 	public fun isAnrEnabled ()Z
@@ -309,6 +318,7 @@ public final class io/sentry/android/core/SentryAndroidOptions : io/sentry/Sentr
 	public fun setEnableScopeSync (Z)V
 	public fun setEnableSystemEventBreadcrumbs (Z)V
 	public fun setFrameMetricsCollector (Lio/sentry/android/core/internal/util/SentryFrameMetricsCollector;)V
+	public fun setNativeHandlerStrategy (Lio/sentry/android/core/NdkHandlerStrategy;)V
 	public fun setNativeSdkName (Ljava/lang/String;)V
 	public fun setProfilingTracesIntervalMillis (I)V
 	public fun setReportHistoricalAnrs (Z)V

sentry-android-core/src/main/java/io/sentry/android/core/NdkHandlerStrategy.java

@@ -0,0 +1,19 @@
+package io.sentry.android.core;
+
+import org.jetbrains.annotations.ApiStatus;
+
+@ApiStatus.Internal
+public enum NdkHandlerStrategy {
+  SENTRY_HANDLER_STRATEGY_DEFAULT(0),
+  SENTRY_HANDLER_STRATEGY_CHAIN_AT_START(1);
+
+  private final int value;
+
+  NdkHandlerStrategy(final int value) {
+    this.value = value;
+  }
+
+  public int getValue() {
+    return value;
+  }
+}

sentry-android-core/src/main/java/io/sentry/android/core/SentryAndroidOptions.java

@@ -157,6 +157,9 @@ public final class SentryAndroidOptions extends SentryOptions {
   /** Turns NDK on or off. Default is enabled. */
   private boolean enableNdk = true;
 
+  @NotNull
+  private NdkHandlerStrategy ndkHandlerStrategy =
+      NdkHandlerStrategy.SENTRY_HANDLER_STRATEGY_DEFAULT;
   /**
    * Enable the Java to NDK Scope sync. The default value for sentry-java is disabled and enabled
    * for sentry-android.
@@ -472,6 +475,16 @@ public void setNativeSdkName(final @Nullable String nativeSdkName) {
     this.nativeSdkName = nativeSdkName;
   }
 
+  @ApiStatus.Internal
+  public void setNativeHandlerStrategy(final @NotNull NdkHandlerStrategy ndkHandlerStrategy) {
+    this.ndkHandlerStrategy = ndkHandlerStrategy;
+  }
+
+  @ApiStatus.Internal
+  public int getNdkHandlerStrategy() {
+    return ndkHandlerStrategy.getValue();
+  }
+
   /**
    * Returns the sdk name for the sentry native ndk module.
    *

sentry-android-core/src/test/java/io/sentry/android/core/SentryAndroidOptionsTest.kt

@@ -167,6 +167,19 @@ class SentryAndroidOptionsTest {
         assertTrue(SentryAndroidOptions().isEnableScopeSync)
     }
 
+    @Test
+    fun `ndk handler option defaults to default strategy`() {
+        val sentryOptions = SentryAndroidOptions()
+        assertEquals(NdkHandlerStrategy.SENTRY_HANDLER_STRATEGY_DEFAULT.value, sentryOptions.ndkHandlerStrategy)
+    }
+
+    @Test
+    fun `ndk handler strategy option can be changed`() {
+        val sentryOptions = SentryAndroidOptions()
+        sentryOptions.setNativeHandlerStrategy(NdkHandlerStrategy.SENTRY_HANDLER_STRATEGY_CHAIN_AT_START)
+        assertEquals(NdkHandlerStrategy.SENTRY_HANDLER_STRATEGY_CHAIN_AT_START.value, sentryOptions.ndkHandlerStrategy)
+    }
+
     private class CustomDebugImagesLoader : IDebugImagesLoader {
         override fun loadDebugImages(): List<DebugImage>? = null
         override fun clearDebugImages() {}

sentry-android-ndk/src/main/jni/sentry.c

@@ -255,6 +255,8 @@ Java_io_sentry_android_ndk_SentryNdk_initSentryNative(
     jmethodID native_sdk_name_mid = (*env)->GetMethodID(env, options_cls, "getNativeSdkName",
                                                     "()Ljava/lang/String;");
 
+    jmethodID handler_strategy_mid = (*env)->GetMethodID(env, options_cls, "getNdkHandlerStrategy", "()I");
+
     (*env)->DeleteLocalRef(env, options_cls);
 
     char *outbox_path = NULL;
@@ -337,6 +339,9 @@ Java_io_sentry_android_ndk_SentryNdk_initSentryNative(
         sentry_free(native_sdk_name_str);
     }
 
+    jint handler_strategy = (jint) (*env)->CallIntMethod(env, sentry_sdk_options, handler_strategy_mid);
+    sentry_options_set_handler_strategy(options, handler_strategy);
+
     sentry_init(options);
     return;