Fix: Do not append threads that come from the EnvelopeFileObserver (#…

…1501)

CHANGELOG.md

@@ -1,5 +1,6 @@
 # Unreleased
 
+* Fix: Do not append threads that come from the EnvelopeFileObserver (#1501)
 * Ref: Deprecate cacheDirSize and add maxCacheItems (#1499)
 
 # 5.0.0-beta.6

sentry/src/main/java/io/sentry/MainEventProcessor.java

@@ -1,5 +1,6 @@
 package io.sentry;
 
+import io.sentry.hints.Cached;
 import io.sentry.protocol.SentryException;
 import io.sentry.protocol.SentryTransaction;
 import io.sentry.protocol.User;
@@ -65,7 +66,7 @@ public final class MainEventProcessor implements EventProcessor {
 
     if (shouldApplyScopeData(event, hint)) {
       processNonCachedEvent(event);
-      setThreads(event);
+      setThreads(event, hint);
     }
 
     return event;
@@ -185,8 +186,8 @@ private void setExceptions(final @NotNull SentryEvent event) {
     }
   }
 
-  private void setThreads(final @NotNull SentryEvent event) {
-    if (event.getThreads() == null) {
+  private void setThreads(final @NotNull SentryEvent event, final @Nullable Object hint) {
+    if (event.getThreads() == null && !isCachedHint(hint)) {
       // collecting threadIds that came from the exception mechanism, so we can mark threads as
       // crashed properly
       List<Long> mechanismThreadIds = null;
@@ -214,4 +215,15 @@ private void setThreads(final @NotNull SentryEvent event) {
       }
     }
   }
+
+  /**
+   * If the event has a Cached Hint, it means that it came from the EnvelopeFileObserver. We don't
+   * want to append this thread to the event.
+   *
+   * @param hint the Hint
+   * @return true if Cached or false otherwise
+   */
+  private boolean isCachedHint(final @Nullable Object hint) {
+    return (hint instanceof Cached);
+  }
 }

sentry/src/test/java/io/sentry/MainEventProcessorTest.kt

@@ -156,15 +156,14 @@ class MainEventProcessorTest {
         val sut = fixture.getSut()
         val crashedThread = Thread.currentThread()
         var event = generateCrashedEvent(crashedThread)
-        event = sut.process(event, mock<CustomCachedApplyScopeDataHint>())
+        event = sut.process(event, CustomCachedApplyScopeDataHint())
 
         assertEquals("release", event.release)
         assertEquals("environment", event.environment)
         assertEquals("dist", event.dist)
         assertEquals("server", event.serverName)
-        assertNotNull(event.threads) {
-            assertTrue(it.first { t -> t.id == crashedThread.id }.isCrashed == true)
-        }
+        // threads are special case if its a Cached hint
+        assertNull(event.threads)
     }
 
     @Test
@@ -394,6 +393,16 @@ class MainEventProcessorTest {
         assertNotNull(transaction.user)
     }
 
+    @Test
+    fun `when event has Cached hint, threads should not be set`() {
+        val sut = fixture.getSut()
+
+        var event = SentryEvent()
+        event = sut.process(event, CustomCachedApplyScopeDataHint())
+
+        assertNull(event.threads)
+    }
+
     private fun generateCrashedEvent(crashedThread: Thread = Thread.currentThread()) = SentryEvent().apply {
         val mockThrowable = mock<Throwable>()
         val actualThrowable = UncaughtExceptionHandlerIntegration.getUnhandledThrowable(crashedThread, mockThrowable)