The two timestamps come from different sources: the tombstone timestamp is recorded by the + * system when the process died, the native event timestamp is recorded by the SDK signal handler. + * Raise the threshold when crashes are reported as separate 'signalhandler' events instead of a + * merged event, because the gap between the two exceeded the threshold. + * + *
Do not raise it more than necessary. The threshold is the only criterion used to pair the + * two, so a high value can merge a tombstone with a native crash that belongs to a different + * process death. The merged event then reports the wrong stack trace, and the native crash it + * consumed is never sent on its own. + * + *
A value of 0 merges only events with identical timestamps. A negative value disables merging
+ * completely, so tombstone and native crash are both reported as separate events.
+ *
+ * @param tombstoneMergeTimeThresholdMillis the threshold in milliseconds
+ */
+ public void setTombstoneMergeTimeThresholdMillis(final long tombstoneMergeTimeThresholdMillis) {
+ this.tombstoneMergeTimeThresholdMillis = tombstoneMergeTimeThresholdMillis;
+ }
+
public boolean isAttachRawTombstone() {
return attachRawTombstone;
}
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/TombstoneIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/TombstoneIntegration.java
index 48832ca8dce..43de4034ec5 100644
--- a/sentry-android-core/src/main/java/io/sentry/android/core/TombstoneIntegration.java
+++ b/sentry-android-core/src/main/java/io/sentry/android/core/TombstoneIntegration.java
@@ -241,7 +241,7 @@ public void markReported(final long timestamp) {
nativeEventCollector.findAndRemoveMatchingNativeEvent(tombstoneTimestamp);
if (matchingNativeEvent == null) {
- options.getLogger().log(SentryLevel.DEBUG, "No matching native event found for tombstone.");
+ // NativeEventCollector already logs why no event matched.
return null;
}
diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/ManifestMetadataReaderTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/ManifestMetadataReaderTest.kt
index 229e22d55f2..463b5d82ddb 100644
--- a/sentry-android-core/src/test/java/io/sentry/android/core/ManifestMetadataReaderTest.kt
+++ b/sentry-android-core/src/test/java/io/sentry/android/core/ManifestMetadataReaderTest.kt
@@ -464,6 +464,31 @@ class ManifestMetadataReaderTest {
assertEquals(false, fixture.options.isReportHistoricalTombstones)
}
+ @Test
+ fun `applyMetadata reads tombstone merge time threshold to options`() {
+ // Arrange
+ val bundle = bundleOf(ManifestMetadataReader.TOMBSTONE_MERGE_TIME_THRESHOLD_MILLIS to 10000)
+ val context = fixture.getContext(metaData = bundle)
+
+ // Act
+ ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)
+
+ // Assert
+ assertEquals(10000, fixture.options.tombstoneMergeTimeThresholdMillis)
+ }
+
+ @Test
+ fun `applyMetadata reads tombstone merge time threshold to options and keeps default`() {
+ // Arrange
+ val context = fixture.getContext()
+
+ // Act
+ ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)
+
+ // Assert
+ assertEquals(5000, fixture.options.tombstoneMergeTimeThresholdMillis)
+ }
+
@Test
fun `applyMetadata reads anr report historical to options`() {
// Arrange
diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/NativeEventCollectorTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/NativeEventCollectorTest.kt
index 243c20a2069..490847b3182 100644
--- a/sentry-android-core/src/test/java/io/sentry/android/core/NativeEventCollectorTest.kt
+++ b/sentry-android-core/src/test/java/io/sentry/android/core/NativeEventCollectorTest.kt
@@ -179,6 +179,35 @@ class NativeEventCollectorTest {
assertNull(noMatch)
}
+ @Test
+ fun `does not match when the gap exceeds the default threshold`() {
+ val sut = fixture.getSut(tmpDir)
+ copyEnvelopeToOutbox("native-event.txt")
+
+ val timestamp = DateUtils.getDateTime("2023-07-15T10:30:05.800Z").time
+ assertNull(sut.findAndRemoveMatchingNativeEvent(timestamp))
+ }
+
+ @Test
+ fun `matches when the gap is within a raised threshold`() {
+ fixture.options.tombstoneMergeTimeThresholdMillis = 10000
+ val sut = fixture.getSut(tmpDir)
+ copyEnvelopeToOutbox("native-event.txt")
+
+ val timestamp = DateUtils.getDateTime("2023-07-15T10:30:05.800Z").time
+ assertNotNull(sut.findAndRemoveMatchingNativeEvent(timestamp))
+ }
+
+ @Test
+ fun `does not match when the gap exceeds a lowered threshold`() {
+ fixture.options.tombstoneMergeTimeThresholdMillis = 1000
+ val sut = fixture.getSut(tmpDir)
+ copyEnvelopeToOutbox("native-event.txt")
+
+ val timestamp = DateUtils.getDateTime("2023-07-15T10:30:02.000Z").time
+ assertNull(sut.findAndRemoveMatchingNativeEvent(timestamp))
+ }
+
private fun copyEnvelopeToOutbox(name: String): File {
val resourcePath = "envelopes/$name"
val inputStream =
diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/SentryAndroidOptionsTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/SentryAndroidOptionsTest.kt
index 94857b91058..d580ff54cd0 100644
--- a/sentry-android-core/src/test/java/io/sentry/android/core/SentryAndroidOptionsTest.kt
+++ b/sentry-android-core/src/test/java/io/sentry/android/core/SentryAndroidOptionsTest.kt
@@ -246,6 +246,15 @@ class SentryAndroidOptionsTest {
assertEquals(5000L, sentryOptions.ndkAppHangTimeoutIntervalMillis)
}
+ @Test
+ fun `tombstone merge time threshold defaults to 5s and is configurable`() {
+ val sentryOptions = SentryAndroidOptions()
+ assertEquals(5000L, sentryOptions.tombstoneMergeTimeThresholdMillis)
+
+ sentryOptions.tombstoneMergeTimeThresholdMillis = 10000L
+ assertEquals(10000L, sentryOptions.tombstoneMergeTimeThresholdMillis)
+ }
+
private class CustomDebugImagesLoader : IDebugImagesLoader {
override fun loadDebugImages(): List