remove tombstone-native correlation via processStateSummary

Author: supervacuus

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

@@ -295,11 +295,10 @@ public final class io/sentry/android/core/NativeEventCollector {
 	public fun <init> (Lio/sentry/android/core/SentryAndroidOptions;)V
 	public fun collect ()V
 	public fun deleteNativeEventFile (Lio/sentry/android/core/NativeEventCollector$NativeEventData;)Z
-	public fun findAndRemoveMatchingNativeEvent (JLjava/lang/String;)Lio/sentry/android/core/NativeEventCollector$NativeEventData;
+	public fun findAndRemoveMatchingNativeEvent (J)Lio/sentry/android/core/NativeEventCollector$NativeEventData;
 }
 
 public final class io/sentry/android/core/NativeEventCollector$NativeEventData {
-	public fun getCorrelationId ()Ljava/lang/String;
 	public fun getEnvelope ()Lio/sentry/SentryEnvelope;
 	public fun getEvent ()Lio/sentry/SentryEvent;
 	public fun getFile ()Ljava/io/File;
@@ -354,7 +353,6 @@ public final class io/sentry/android/core/SentryAndroidOptions : io/sentry/Sentr
 	public fun getBeforeViewHierarchyCaptureCallback ()Lio/sentry/android/core/SentryAndroidOptions$BeforeCaptureCallback;
 	public fun getDebugImagesLoader ()Lio/sentry/android/core/IDebugImagesLoader;
 	public fun getFrameMetricsCollector ()Lio/sentry/android/core/internal/util/SentryFrameMetricsCollector;
-	public fun getNativeCrashCorrelationId ()Ljava/lang/String;
 	public fun getNativeSdkName ()Ljava/lang/String;
 	public fun getNdkHandlerStrategy ()I
 	public fun getStartupCrashDurationThresholdMillis ()J
@@ -408,7 +406,6 @@ public final class io/sentry/android/core/SentryAndroidOptions : io/sentry/Sentr
 	public fun setEnableSystemEventBreadcrumbs (Z)V
 	public fun setEnableSystemEventBreadcrumbsExtras (Z)V
 	public fun setFrameMetricsCollector (Lio/sentry/android/core/internal/util/SentryFrameMetricsCollector;)V
-	public fun setNativeCrashCorrelationId (Ljava/lang/String;)V
 	public fun setNativeHandlerStrategy (Lio/sentry/android/core/NdkHandlerStrategy;)V
 	public fun setNativeSdkName (Ljava/lang/String;)V
 	public fun setReportHistoricalAnrs (Z)V

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

@@ -2,7 +2,6 @@
 
 import static io.sentry.android.core.NdkIntegration.SENTRY_NDK_CLASS_NAME;
 
-import android.app.ActivityManager;
 import android.app.Application;
 import android.content.Context;
 import android.content.pm.PackageInfo;
@@ -58,10 +57,8 @@
 import io.sentry.util.Objects;
 import io.sentry.util.thread.NoOpThreadChecker;
 import java.io.File;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.UUID;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
@@ -248,11 +245,6 @@ static void initializeIntegrationsAndProcessors(
       options.setSocketTagger(AndroidSocketTagger.getInstance());
     }
 
-    // Set native crash correlation ID before NDK integration is registered
-    if (buildInfoProvider.getSdkInfoVersion() >= Build.VERSION_CODES.R) {
-      setNativeCrashCorrelationId(context, options);
-    }
-
     if (options.getPerformanceCollectors().isEmpty()) {
       options.addPerformanceCollector(new AndroidMemoryCollector());
       options.addPerformanceCollector(new AndroidCpuCollector(options.getLogger()));
@@ -506,33 +498,4 @@ private static void readDefaultOptionValues(
   static @NotNull File getCacheDir(final @NotNull Context context) {
     return new File(context.getCacheDir(), "sentry");
   }
-
-  /**
-   * Sets a native crash correlation ID that can be used to associate native crash events (from
-   * sentry-native) with tombstone events (from ApplicationExitInfo). The ID is stored via
-   * ActivityManager.setProcessStateSummary() and passed to the native SDK.
-   *
-   * @param context the Application context
-   * @param options the SentryAndroidOptions
-   */
-  private static void setNativeCrashCorrelationId(
-      final @NotNull Context context, final @NotNull SentryAndroidOptions options) {
-    final String correlationId = UUID.randomUUID().toString();
-    options.setNativeCrashCorrelationId(correlationId);
-
-    try {
-      final ActivityManager am =
-          (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-      if (am != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-        am.setProcessStateSummary(correlationId.getBytes(StandardCharsets.UTF_8));
-        options
-            .getLogger()
-            .log(SentryLevel.DEBUG, "Native crash correlation ID set: %s", correlationId);
-      }
-    } catch (Throwable e) {
-      options
-          .getLogger()
-          .log(SentryLevel.WARNING, "Failed to set process state summary for correlation ID", e);
-    }
-  }
 }

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

@@ -78,19 +78,6 @@ public static final class NativeEventData {
     public long getTimestampMs() {
       return timestampMs;
     }
-
-    /**
-     * Extracts the correlation ID from the event's extra data.
-     *
-     * @return the correlation ID, or null if not present
-     */
-    public @Nullable String getCorrelationId() {
-      final @Nullable Object correlationId = event.getExtra("sentry.native.correlation_id");
-      if (correlationId instanceof String) {
-        return (String) correlationId;
-      }
-      return null;
-    }
   }
 
   /**
@@ -151,36 +138,20 @@ public void collect() {
   }
 
   /**
-   * Finds a native event that matches the given tombstone timestamp or correlation ID. If a match
-   * is found, it is removed from the internal list so it won't be matched again.
+   * Finds a native event that matches the given tombstone timestamp. If a match is found, it is
+   * removed from the internal list so it won't be matched again.
    *
    * <p>This method will lazily collect native events from the outbox on first call.
    *
    * @param tombstoneTimestampMs the timestamp from ApplicationExitInfo
-   * @param correlationId the correlation ID from processStateSummary, or null
    * @return the matching native event data, or null if no match found
    */
   public @Nullable NativeEventData findAndRemoveMatchingNativeEvent(
-      final long tombstoneTimestampMs, final @Nullable String correlationId) {
+      final long tombstoneTimestampMs) {
 
     // Lazily collect on first use (runs on executor thread, not main thread)
     collect();
 
-    // First, try to match by correlation ID (when sentry-native supports it)
-    if (correlationId != null) {
-      for (final NativeEventData nativeEvent : nativeEvents) {
-        final @Nullable String nativeCorrelationId = nativeEvent.getCorrelationId();
-        if (correlationId.equals(nativeCorrelationId)) {
-          options
-              .getLogger()
-              .log(SentryLevel.DEBUG, "Matched native event by correlation ID: %s", correlationId);
-          nativeEvents.remove(nativeEvent);
-          return nativeEvent;
-        }
-      }
-    }
-
-    // Fall back to timestamp-based matching
     for (final NativeEventData nativeEvent : nativeEvents) {
       final long timeDiff = Math.abs(tombstoneTimestampMs - nativeEvent.getTimestampMs());
       if (timeDiff <= TIMESTAMP_TOLERANCE_MS) {

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

@@ -174,13 +174,6 @@ public final class SentryAndroidOptions extends SentryOptions {
    */
   private boolean enableScopeSync = true;
 
-  /**
-   * A correlation ID used to associate native crash events (from sentry-native) with tombstone
-   * events (from ApplicationExitInfo). This is set via ActivityManager.setProcessStateSummary() and
-   * passed to the native SDK during initialization.
-   */
-  private @Nullable String nativeCrashCorrelationId;
-
   /**
    * Whether to enable automatic trace ID generation. This is mainly used by the Hybrid SDKs to
    * control the trace ID generation from the outside.
@@ -614,27 +607,6 @@ public void setEnableScopeSync(boolean enableScopeSync) {
     this.enableScopeSync = enableScopeSync;
   }
 
-  /**
-   * Returns the correlation ID used to associate native crash events with tombstone events.
-   *
-   * @return the correlation ID, or null if not set
-   */
-  @ApiStatus.Internal
-  public @Nullable String getNativeCrashCorrelationId() {
-    return nativeCrashCorrelationId;
-  }
-
-  /**
-   * Sets the correlation ID used to associate native crash events with tombstone events. This is
-   * typically set automatically during SDK initialization.
-   *
-   * @param nativeCrashCorrelationId the correlation ID
-   */
-  @ApiStatus.Internal
-  public void setNativeCrashCorrelationId(final @Nullable String nativeCrashCorrelationId) {
-    this.nativeCrashCorrelationId = nativeCrashCorrelationId;
-  }
-
   public boolean isReportHistoricalAnrs() {
     return reportHistoricalAnrs;
   }

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

@@ -34,7 +34,6 @@
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
@@ -181,17 +180,9 @@ public boolean shouldReportHistorical() {
       final long tombstoneTimestamp = exitInfo.getTimestamp();
       event.setTimestamp(DateUtils.getDateTime(tombstoneTimestamp));
 
-      // Extract correlation ID from process state summary (if set during previous session)
-      final @Nullable String correlationId = extractCorrelationId(exitInfo);
-      if (correlationId != null) {
-        options
-            .getLogger()
-            .log(SentryLevel.DEBUG, "Tombstone correlation ID found: %s", correlationId);
-      }
-
       // Try to find and remove matching native event from outbox
       final @Nullable NativeEventData matchingNativeEvent =
-          nativeEventCollector.findAndRemoveMatchingNativeEvent(tombstoneTimestamp, correlationId);
+          nativeEventCollector.findAndRemoveMatchingNativeEvent(tombstoneTimestamp);
 
       if (matchingNativeEvent != null) {
         options
@@ -248,24 +239,6 @@ private SentryEvent mergeNativeCrashes(
 
       return nativeEvent;
     }
-
-    @RequiresApi(api = Build.VERSION_CODES.R)
-    private @Nullable String extractCorrelationId(final @NotNull ApplicationExitInfo exitInfo) {
-      try {
-        final byte[] summary = exitInfo.getProcessStateSummary();
-        if (summary != null && summary.length > 0) {
-          return new String(summary, StandardCharsets.UTF_8);
-        }
-      } catch (Throwable e) {
-        options
-            .getLogger()
-            .log(
-                SentryLevel.DEBUG,
-                "Failed to extract correlation ID from process state summary",
-                e);
-      }
-      return null;
-    }
   }
 
   @ApiStatus.Internal

sentry-android-ndk/src/main/java/io/sentry/android/ndk/SentryNdk.java

@@ -73,12 +73,6 @@ public static void init(@NotNull final SentryAndroidOptions options) {
           ndkOptions.setTracesSampleRate(tracesSampleRate.floatValue());
         }
 
-        // TODO: Pass correlation ID to native SDK when sentry-native supports it
-        // final @Nullable String correlationId = options.getNativeCrashCorrelationId();
-        // if (correlationId != null) {
-        //   ndkOptions.setCorrelationId(correlationId);
-        // }
-
         //noinspection UnstableApiUsage
         io.sentry.ndk.SentryNdk.init(ndkOptions);