pre merge preps.

Author: supervacuus

CHANGELOG.md

@@ -6,7 +6,6 @@
 
 - Add `installGroupsOverride` parameter and `installGroups` property to Build Distribution SDK ([#5062](https://github.com/getsentry/sentry-java/pull/5062))
 - Update Android targetSdk to API 36 (Android 16) ([#5016](https://github.com/getsentry/sentry-java/pull/5016))
-- Merge Tombstone and Native SDK events into single crash event. ([#5037](https://github.com/getsentry/sentry-java/pull/5037))
 - Add AndroidManifest support for Spotlight configuration via `io.sentry.spotlight.enable` and `io.sentry.spotlight.url` ([#5064](https://github.com/getsentry/sentry-java/pull/5064))
 - Collect database transaction spans (`BEGIN`, `COMMIT`, `ROLLBACK`) ([#5072](https://github.com/getsentry/sentry-java/pull/5072))
   - To enable creation of these spans, set `options.enableDatabaseTransactionTracing` to `true`
@@ -16,6 +15,20 @@
     sentry:
       enable-database-transaction-tracing: true
     ```
+- Add support for collecting native crashes using Tombstones ([#4933](https://github.com/getsentry/sentry-java/pull/4933), [#5037](https://github.com/getsentry/sentry-java/pull/5037))
+  - Added Tombstone integration that detects native crashes using `ApplicationExitInfo.REASON_CRASH_NATIVE` on Android 12+
+  - Crashes enriched with Tombstones contain more crash details and detailed thread info
+  - Tombstone and NDK integrations are now automatically merged into a single crash event, eliminating duplicate reports
+  - To enable it, add the integration in your Sentry initialization:
+    ```kotlin
+    SentryAndroid.init(context, options -> {
+        options.isTombstoneEnabled = true
+    })
+    ```
+    or in the `AndroidManifest.xml` using:
+    ```xml
+    <meta-data android:name="io.sentry.tombstone.enable" android:value="true" />
+    ```
 
 ### Fixes
 

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

@@ -321,7 +321,6 @@ public void setAnrReportInDebug(boolean anrReportInDebug) {
    *
    * @param enableTombstone true for enabled and false for disabled
    */
-  @ApiStatus.Internal
   public void setTombstoneEnabled(boolean enableTombstone) {
     this.enableTombstone = enableTombstone;
   }
@@ -332,7 +331,6 @@ public void setTombstoneEnabled(boolean enableTombstone) {
    *
    * @return true if enabled or false otherwise
    */
-  @ApiStatus.Internal
   public boolean isTombstoneEnabled() {
     return enableTombstone;
   }
@@ -615,12 +613,10 @@ public void setReportHistoricalAnrs(final boolean reportHistoricalAnrs) {
     this.reportHistoricalAnrs = reportHistoricalAnrs;
   }
 
-  @ApiStatus.Internal
   public boolean isReportHistoricalTombstones() {
     return reportHistoricalTombstones;
   }
 
-  @ApiStatus.Internal
   public void setReportHistoricalTombstones(final boolean reportHistoricalTombstones) {
     this.reportHistoricalTombstones = reportHistoricalTombstones;
   }

sentry-android-core/src/test/resources/envelopes/native-event.txt

@@ -1,3 +1,3 @@
 {"event_id":"9ec79c33ec9942ab8353589fcb2e04dc"}
-{"type":"event","length":123,"content_type":"application/json"}
+{"type":"event","length":122,"content_type":"application/json"}
 {"event_id":"9ec79c33ec9942ab8353589fcb2e04dc","timestamp":"2023-07-15T10:30:00.000Z","platform":"native","level":"fatal"}

sentry-android-core/src/test/resources/envelopes/native-with-attachment.txt

@@ -1,5 +1,5 @@
 {"event_id":"9ec79c33ec9942ab8353589fcb2e04dc"}
 {"type":"attachment","length":20,"filename":"log.txt","content_type":"text/plain"}
 some attachment data
-{"type":"event","length":123,"content_type":"application/json"}
+{"type":"event","length":122,"content_type":"application/json"}
 {"event_id":"9ec79c33ec9942ab8353589fcb2e04dc","timestamp":"2023-07-15T11:45:30.500Z","platform":"native","level":"fatal"}