Reduce timeout of AsyncHttpTransport to avoid ANR

CHANGELOG.md

@@ -9,6 +9,7 @@ Breaking changes:
 - Reduce flush timeout to 4s on Android to avoid ANRs ([#2858](https://github.com/getsentry/sentry-java/pull/2858))
 - Set ip_address to {{auto}} by default, even if sendDefaultPII is disabled ([#2860](https://github.com/getsentry/sentry-java/pull/2860))
   - Instead use the "Prevent Storing of IP Addresses" option in the "Security & Privacy" project settings on sentry.io
+- Reduce timeout of AsyncHttpTransport to avoid ANR ([#2879](https://github.com/getsentry/sentry-java/pull/2879))
 
 ### Fixes
 

sentry/src/main/java/io/sentry/transport/AsyncHttpTransport.java

@@ -140,7 +140,7 @@ public void close() throws IOException {
     executor.shutdown();
     options.getLogger().log(SentryLevel.DEBUG, "Shutting down");
     try {
-      if (!executor.awaitTermination(1, TimeUnit.MINUTES)) {
+      if (!executor.awaitTermination(options.getFlushTimeoutMillis(), TimeUnit.MILLISECONDS)) {
         options
             .getLogger()
             .log(

sentry/src/test/java/io/sentry/transport/AsyncHttpTransportTest.kt

@@ -25,6 +25,7 @@ import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
 import java.io.IOException
 import java.util.Date
+import java.util.concurrent.TimeUnit
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
@@ -321,6 +322,15 @@ class AsyncHttpTransportTest {
         )
     }
 
+    @Test
+    fun `close uses flushTimeoutMillis option to schedule termination`() {
+        fixture.sentryOptions.flushTimeoutMillis = 123
+        val sut = fixture.getSUT()
+        sut.close()
+
+        verify(fixture.executor).awaitTermination(eq(123), eq(TimeUnit.MILLISECONDS))
+    }
+
     private fun createSession(): Session {
         return Session("123", User(), "env", "release")
     }