Merge bfc3606 into 85d7417

Author: stefanosiano

CHANGELOG.md

@@ -9,6 +9,10 @@
 - Replace `UUIDGenerator` implementation with Apache licensed code ([#4662](https://github.com/getsentry/sentry-java/pull/4662))
 - Replace `Random` implementation with MIT licensed code ([#4664](https://github.com/getsentry/sentry-java/pull/4664))
 
+### Fixes
+
+- Flush logs on crash ([#4684](https://github.com/getsentry/sentry-java/pull/4684))
+
 ## 8.20.0
 
 ### Fixes

sentry/src/main/java/io/sentry/SentryClient.java

@@ -245,6 +245,12 @@ private boolean shouldApplyScopeData(final @NotNull CheckIn event, final @NotNul
       finalizeTransaction(scope, hint);
     }
 
+    // if event is backfillable or cached we don't need to flush the logs, because it's an event
+    // from the past. Otherwise we need to flush the logs to ensure they are sent on crash
+    if (event != null && !isBackfillable && !isCached && event.isCrashed()) {
+      loggerBatchProcessor.flush(options.getFlushTimeoutMillis());
+    }
+
     return sentryId;
   }
 

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

@@ -3023,6 +3023,25 @@ class SentryClientTest {
     assertTrue(terminated == true)
   }
 
+  @Test
+  fun `flush logs for crash events`() {
+    val sut = fixture.getSut()
+    val batchProcessor = mock<ILoggerBatchProcessor>()
+    sut.injectForField("loggerBatchProcessor", batchProcessor)
+    sut.captureLog(
+      SentryLogEvent(SentryId(), SentryNanotimeDate(), "message", SentryLogLevel.WARN),
+      fixture.scopes.scope,
+    )
+
+    sut.captureEvent(
+      SentryEvent().apply {
+        exceptions =
+          listOf(SentryException().apply { mechanism = Mechanism().apply { isHandled = false } })
+      }
+    )
+    verify(batchProcessor).flush(any())
+  }
+
   @Test
   fun `cleans up replay folder for Backfillable replay events`() {
     val dir = File(tmpDir.newFolder().absolutePath)