Merge branch 'main' into alwx/ci/group-codeql-action-dependabot

Author: alwx

CHANGELOG.md

@@ -11,6 +11,7 @@
 ### Features
 
 - Add `Sentry.reportFullyDisplayed()` imperative API for signaling Time to Full Display ([#6419](https://github.com/getsentry/sentry-react-native/pull/6419))
+- Add `enableHistoricalTombstoneReporting` option to report historical tombstones from Android's `ApplicationExitInfo` ([#6450](https://github.com/getsentry/sentry-react-native/pull/6450))
 
 ### Fixes
 

packages/core/RNSentryAndroidTester/app/src/test/java/io/sentry/react/RNSentryStartTest.kt

@@ -314,6 +314,39 @@ class RNSentryStartTest {
         assertFalse("Tombstone should be disabled by default", options.isTombstoneEnabled)
     }
 
+    @Test
+    fun `when enableHistoricalTombstoneReporting is true, historical tombstone reporting is enabled`() {
+        val rnOptions = JavaOnlyMap.of("enableHistoricalTombstoneReporting", true)
+        val options = SentryAndroidOptions()
+
+        RNSentryStart.getSentryAndroidOptions(options, rnOptions, logger)
+
+        assertTrue("Historical tombstone reporting should be enabled", options.isReportHistoricalTombstones)
+    }
+
+    @Test
+    fun `when enableHistoricalTombstoneReporting is false, historical tombstone reporting is disabled`() {
+        val rnOptions = JavaOnlyMap.of("enableHistoricalTombstoneReporting", false)
+        val options = SentryAndroidOptions()
+
+        RNSentryStart.getSentryAndroidOptions(options, rnOptions, logger)
+
+        assertFalse("Historical tombstone reporting should be disabled", options.isReportHistoricalTombstones)
+    }
+
+    @Test
+    fun `when enableHistoricalTombstoneReporting is not set, it remains at default (disabled)`() {
+        val rnOptions = JavaOnlyMap()
+        val options = SentryAndroidOptions()
+
+        RNSentryStart.getSentryAndroidOptions(options, rnOptions, logger)
+
+        assertFalse(
+            "Historical tombstone reporting should be disabled by default",
+            options.isReportHistoricalTombstones,
+        )
+    }
+
     @Test
     fun `network detail replay options are forwarded to the native replay options`() {
         val mobileReplayOptions =

packages/core/android/src/main/java/io/sentry/react/RNSentryStart.java

@@ -195,6 +195,10 @@ static void getSentryAndroidOptions(
     if (rnOptions.hasKey("enableTombstone")) {
       options.setTombstoneEnabled(rnOptions.getBoolean("enableTombstone"));
     }
+    if (rnOptions.hasKey("enableHistoricalTombstoneReporting")) {
+      options.setReportHistoricalTombstones(
+          rnOptions.getBoolean("enableHistoricalTombstoneReporting"));
+    }
     if (rnOptions.hasKey("enableAnrFingerprinting")) {
       options.setEnableAnrFingerprinting(rnOptions.getBoolean("enableAnrFingerprinting"));
     }

packages/core/src/js/options.ts

@@ -69,6 +69,20 @@ export interface BaseReactNativeOptions {
    */
   enableTombstone?: boolean;
 
+  /**
+   * When enabled, the SDK reports historical tombstones from Android's
+   * ApplicationExitInfo system API, as opposed to reporting only the tombstone
+   * of the latest application run. Historical events are reported without
+   * current scope data (e.g. breadcrumbs), as it's not possible to know
+   * the state of the app at the time they happened.
+   *
+   * Only has an effect if `enableTombstone` is `true`.
+   *
+   * @default false
+   * @platform android
+   */
+  enableHistoricalTombstoneReporting?: boolean;
+
   /** Enable scope sync from Java to NDK on Android
    * Only has an effect if `enableNdk` is `true`.
    *