Allow configuring shutdown and session flush timeouts externally and speed up tests

CHANGELOG.md

@@ -4,6 +4,10 @@
 
 ### Features
 
+- Allow configuring shutdown and session flush timeouts externally ([#4641](https://github.com/getsentry/sentry-java/pull/4641))
+  - `sentry.properties`: `shutdown-timeout-millis`, `session-flush-timeout-millis`
+  - Environment variables: `SENTRY_SHUTDOWN_TIMEOUT_MILLIS`, `SENTRY_SESSION_FLUSH_TIMEOUT_MILLIS`
+  - Spring Boot `application.properties`: `sentry.shutdownTimeoutMillis`, `sentry.sessionFlushTimeoutMillis`
 - Add scope-level attributes API ([#5118](https://github.com/getsentry/sentry-java/pull/5118)) via ([#5148](https://github.com/getsentry/sentry-java/pull/5148))
   - Automatically include scope attributes in logs and metrics ([#5120](https://github.com/getsentry/sentry-java/pull/5120))
   - New APIs are `Sentry.setAttribute`, `Sentry.setAttributes`, `Sentry.removeAttribute`

sentry-jul/src/test/kotlin/io/sentry/jul/SentryHandlerTest.kt

@@ -7,6 +7,7 @@ import io.sentry.SentryLogLevel
 import io.sentry.SentryOptions
 import io.sentry.checkEvent
 import io.sentry.checkLogs
+import io.sentry.test.applyTestOptions
 import io.sentry.test.initForTest
 import io.sentry.transport.ITransport
 import java.time.Instant
@@ -44,6 +45,7 @@ class SentryHandlerTest {
       val options = SentryOptions()
       options.dsn = "http://key@localhost/proj"
       options.setTransportFactory { _, _ -> transport }
+      applyTestOptions(options)
       contextTags?.forEach { options.addContextTag(it) }
       logger = Logger.getLogger("jul.SentryHandlerTest")
       handler = SentryHandler(options, configureWithLogManager, true)
@@ -415,7 +417,7 @@ class SentryHandlerTest {
     fixture = Fixture(minimumLevel = Level.FINEST)
     fixture.logger.finest("testing trace level")
 
-    Sentry.flush(1000)
+    Sentry.flush(10)
 
     verify(fixture.transport)
       .send(
@@ -431,7 +433,7 @@ class SentryHandlerTest {
     fixture = Fixture(minimumLevel = Level.FINE)
     fixture.logger.fine("testing trace level")
 
-    Sentry.flush(1000)
+    Sentry.flush(10)
 
     verify(fixture.transport)
       .send(checkLogs { event -> assertEquals(SentryLogLevel.DEBUG, event.items.first().level) })
@@ -442,7 +444,7 @@ class SentryHandlerTest {
     fixture = Fixture(minimumLevel = Level.CONFIG)
     fixture.logger.config("testing debug level")
 
-    Sentry.flush(1000)
+    Sentry.flush(10)
 
     verify(fixture.transport)
       .send(checkLogs { event -> assertEquals(SentryLogLevel.DEBUG, event.items.first().level) })
@@ -453,7 +455,7 @@ class SentryHandlerTest {
     fixture = Fixture(minimumLevel = Level.INFO)
     fixture.logger.info("testing info level")
 
-    Sentry.flush(1000)
+    Sentry.flush(10)
 
     verify(fixture.transport)
       .send(checkLogs { event -> assertEquals(SentryLogLevel.INFO, event.items.first().level) })
@@ -464,7 +466,7 @@ class SentryHandlerTest {
     fixture = Fixture(minimumLevel = Level.WARNING)
     fixture.logger.warning("testing warn level")
 
-    Sentry.flush(1000)
+    Sentry.flush(10)
 
     verify(fixture.transport)
       .send(checkLogs { event -> assertEquals(SentryLogLevel.WARN, event.items.first().level) })
@@ -475,7 +477,7 @@ class SentryHandlerTest {
     fixture = Fixture(minimumLevel = Level.SEVERE)
     fixture.logger.severe("testing error level")
 
-    Sentry.flush(1000)
+    Sentry.flush(10)
 
     verify(fixture.transport)
       .send(checkLogs { event -> assertEquals(SentryLogLevel.ERROR, event.items.first().level) })

sentry-log4j2/src/test/kotlin/io/sentry/log4j2/SentryAppenderTest.kt

@@ -248,7 +248,7 @@ class SentryAppenderTest {
     val logger = fixture.getSut(minimumLevel = Level.TRACE)
     logger.trace("testing trace level")
 
-    Sentry.flush(1000)
+    Sentry.flush(10)
 
     verify(fixture.transport)
       .send(
@@ -267,7 +267,7 @@ class SentryAppenderTest {
     val logger = fixture.getSut(minimumLevel = Level.DEBUG)
     logger.debug("testing debug level")
 
-    Sentry.flush(1000)
+    Sentry.flush(10)
 
     verify(fixture.transport)
       .send(checkLogs { event -> assertEquals(SentryLogLevel.DEBUG, event.items.first().level) })
@@ -278,7 +278,7 @@ class SentryAppenderTest {
     val logger = fixture.getSut(minimumLevel = Level.INFO)
     logger.info("testing info level")
 
-    Sentry.flush(1000)
+    Sentry.flush(10)
 
     verify(fixture.transport)
       .send(checkLogs { event -> assertEquals(SentryLogLevel.INFO, event.items.first().level) })
@@ -289,7 +289,7 @@ class SentryAppenderTest {
     val logger = fixture.getSut(minimumLevel = Level.WARN)
     logger.warn("testing warn level")
 
-    Sentry.flush(1000)
+    Sentry.flush(10)
 
     verify(fixture.transport)
       .send(checkLogs { event -> assertEquals(SentryLogLevel.WARN, event.items.first().level) })
@@ -300,7 +300,7 @@ class SentryAppenderTest {
     val logger = fixture.getSut(minimumLevel = Level.ERROR)
     logger.error("testing error level")
 
-    Sentry.flush(1000)
+    Sentry.flush(10)
 
     verify(fixture.transport)
       .send(checkLogs { event -> assertEquals(SentryLogLevel.ERROR, event.items.first().level) })
@@ -311,7 +311,7 @@ class SentryAppenderTest {
     val logger = fixture.getSut(minimumLevel = Level.FATAL)
     logger.fatal("testing fatal level")
 
-    Sentry.flush(1000)
+    Sentry.flush(10)
 
     verify(fixture.transport)
       .send(checkLogs { event -> assertEquals(SentryLogLevel.FATAL, event.items.first().level) })

sentry-log4j2/src/test/resources/sentry.properties

@@ -1,2 +1,4 @@
 release=release from sentry.properties
 logs.enabled=true
+shutdown-timeout-millis=0
+session-flush-timeout-millis=0

sentry-logback/src/test/kotlin/io/sentry/logback/SentryAppenderTest.kt

@@ -18,6 +18,7 @@ import io.sentry.SentryLogLevel
 import io.sentry.SentryOptions
 import io.sentry.checkEvent
 import io.sentry.checkLogs
+import io.sentry.test.applyTestOptions
 import io.sentry.test.initForTest
 import io.sentry.transport.ITransport
 import java.time.Instant
@@ -68,6 +69,7 @@ class SentryAppenderTest {
       options.dsn = dsn
       options.isSendDefaultPii = sendDefaultPii
       options.logs.isEnabled = enableLogs
+      applyTestOptions(options)
       contextTags?.forEach { options.addContextTag(it) }
       appender.setOptions(options)
       appender.setMinimumBreadcrumbLevel(minimumBreadcrumbLevel)
@@ -317,7 +319,7 @@ class SentryAppenderTest {
     fixture = Fixture(minimumLevel = Level.TRACE, enableLogs = true)
     fixture.logger.trace("testing trace level")
 
-    Sentry.flush(1000)
+    Sentry.flush(10)
 
     verify(fixture.transport)
       .send(checkLogs { logs -> assertEquals(SentryLogLevel.TRACE, logs.items.first().level) })
@@ -328,7 +330,7 @@ class SentryAppenderTest {
     fixture = Fixture(minimumLevel = Level.DEBUG, enableLogs = true)
     fixture.logger.debug("testing debug level")
 
-    Sentry.flush(1000)
+    Sentry.flush(10)
 
     verify(fixture.transport)
       .send(checkLogs { logs -> assertEquals(SentryLogLevel.DEBUG, logs.items.first().level) })
@@ -339,7 +341,7 @@ class SentryAppenderTest {
     fixture = Fixture(minimumLevel = Level.INFO, enableLogs = true)
     fixture.logger.info("testing info level")
 
-    Sentry.flush(1000)
+    Sentry.flush(10)
 
     verify(fixture.transport)
       .send(checkLogs { logs -> assertEquals(SentryLogLevel.INFO, logs.items.first().level) })
@@ -350,7 +352,7 @@ class SentryAppenderTest {
     fixture = Fixture(minimumLevel = Level.WARN, enableLogs = true)
     fixture.logger.warn("testing warn level")
 
-    Sentry.flush(1000)
+    Sentry.flush(10)
 
     verify(fixture.transport)
       .send(checkLogs { logs -> assertEquals(SentryLogLevel.WARN, logs.items.first().level) })
@@ -361,7 +363,7 @@ class SentryAppenderTest {
     fixture = Fixture(minimumLevel = Level.ERROR, enableLogs = true)
     fixture.logger.error("testing error level")
 
-    Sentry.flush(1000)
+    Sentry.flush(10)
 
     verify(fixture.transport)
       .send(checkLogs { logs -> assertEquals(SentryLogLevel.ERROR, logs.items.first().level) })
@@ -372,7 +374,7 @@ class SentryAppenderTest {
     fixture = Fixture(minimumLevel = Level.TRACE, enableLogs = true)
     fixture.logger.trace("Testing {} level", "TRACE")
 
-    Sentry.flush(1000)
+    Sentry.flush(10)
 
     verify(fixture.transport)
       .send(
@@ -394,7 +396,7 @@ class SentryAppenderTest {
     fixture = Fixture(minimumLevel = Level.TRACE, enableLogs = true, encoder = encoder)
     fixture.logger.trace("Testing {} level", "TRACE")
 
-    Sentry.flush(1000)
+    Sentry.flush(10)
 
     verify(fixture.transport)
       .send(
@@ -420,7 +422,7 @@ class SentryAppenderTest {
       )
     fixture.logger.trace("Testing {} level", "TRACE")
 
-    Sentry.flush(1000)
+    Sentry.flush(10)
 
     verify(fixture.transport)
       .send(
@@ -447,7 +449,7 @@ class SentryAppenderTest {
       )
     fixture.logger.trace("Testing {} level", "TRACE")
 
-    Sentry.flush(1000)
+    Sentry.flush(10)
 
     verify(fixture.transport)
       .send(