ref: Add Millis suffix to ExternalOptions timeout fields

Rename shutdownTimeout/sessionFlushTimeout to
shutdownTimeoutMillis/sessionFlushTimeoutMillis in ExternalOptions
for consistency with SentryOptions naming convention. Also rename
the sentry.properties keys from shutdown-timeout to
shutdown-timeout-millis and session-flush-timeout to
session-flush-timeout-millis.

Co-Authored-By: Claude <noreply@anthropic.com>

Author: adinauer

CHANGELOG.md

@@ -4,7 +4,7 @@
 
 ### Features
 
-- Allow configuring `shutdown-timeout` and `session-flush-timeout` via `sentry.properties` and environment variables (`SENTRY_SHUTDOWN_TIMEOUT`, `SENTRY_SESSION_FLUSH_TIMEOUT`) ([#4641](https://github.com/getsentry/sentry-java/pull/4641))
+- Allow configuring `shutdown-timeout-millis` and `session-flush-timeout-millis` via `sentry.properties` and environment variables (`SENTRY_SHUTDOWN_TIMEOUT_MILLIS`, `SENTRY_SESSION_FLUSH_TIMEOUT_MILLIS`) ([#4641](https://github.com/getsentry/sentry-java/pull/4641))
 - Add experimental Sentry Android Distribution module for integrating with Sentry Build Distribution to check for and install updates ([#4804](https://github.com/getsentry/sentry-java/pull/4804))
 
 ### Fixes

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

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

sentry/src/main/java/io/sentry/ExternalOptions.java

@@ -135,8 +135,9 @@ public final class ExternalOptions {
       options.addBundleId(bundleId);
     }
     options.setIdleTimeout(propertiesProvider.getLongProperty("idle-timeout"));
-    options.setShutdownTimeoutMillis(propertiesProvider.getLongProperty("shutdown-timeout"));
-    options.setSessionFlushTimeoutMillis(propertiesProvider.getLongProperty("session-flush-timeout"));
+    options.setShutdownTimeoutMillis(propertiesProvider.getLongProperty("shutdown-timeout-millis"));
+    options.setSessionFlushTimeoutMillis(
+        propertiesProvider.getLongProperty("session-flush-timeout-millis"));
 
     options.setIgnoredErrors(propertiesProvider.getListOrNull("ignored-errors"));
 

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

@@ -177,12 +177,12 @@ class ExternalOptionsTest {
 
   @Test
   fun `creates options with shutdownTimeoutMillis using external properties`() {
-    withPropertiesFile("shutdown-timeout=2000") { assertEquals(2000L, it.shutdownTimeoutMillis) }
+    withPropertiesFile("shutdown-timeout-millis=2000") { assertEquals(2000L, it.shutdownTimeoutMillis) }
   }
 
   @Test
   fun `creates options with sessionFlushTimeoutMillis using external properties`() {
-    withPropertiesFile("session-flush-timeout=2000") { assertEquals(2000L, it.sessionFlushTimeoutMillis) }
+    withPropertiesFile("session-flush-timeout-millis=2000") { assertEquals(2000L, it.sessionFlushTimeoutMillis) }
   }
 
   @Test