ref: Add Millis suffix to ExternalOptions timeout fields

Rename shutdownTimeout/sessionFlushTimeout to
shutdownTimeoutMillis/sessionFlushTimeoutMillis for consistency
with SentryOptions naming convention.

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

Author: adinauer

sentry/api/sentry.api

@@ -498,8 +498,8 @@ public final class io/sentry/ExternalOptions {
 	public fun getRelease ()Ljava/lang/String;
 	public fun getSendClientReports ()Ljava/lang/Boolean;
 	public fun getServerName ()Ljava/lang/String;
-	public fun getSessionFlushTimeout ()Ljava/lang/Long;
-	public fun getShutdownTimeout ()Ljava/lang/Long;
+	public fun getSessionFlushTimeoutMillis ()Ljava/lang/Long;
+	public fun getShutdownTimeoutMillis ()Ljava/lang/Long;
 	public fun getSpotlightConnectionUrl ()Ljava/lang/String;
 	public fun getTags ()Ljava/util/Map;
 	public fun getTracePropagationTargets ()Ljava/util/List;
@@ -546,8 +546,8 @@ public final class io/sentry/ExternalOptions {
 	public fun setSendDefaultPii (Ljava/lang/Boolean;)V
 	public fun setSendModules (Ljava/lang/Boolean;)V
 	public fun setServerName (Ljava/lang/String;)V
-	public fun setSessionFlushTimeout (Ljava/lang/Long;)V
-	public fun setShutdownTimeout (Ljava/lang/Long;)V
+	public fun setSessionFlushTimeoutMillis (Ljava/lang/Long;)V
+	public fun setShutdownTimeoutMillis (Ljava/lang/Long;)V
 	public fun setSpotlightConnectionUrl (Ljava/lang/String;)V
 	public fun setTag (Ljava/lang/String;Ljava/lang/String;)V
 	public fun setTracesSampleRate (Ljava/lang/Double;)V

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

@@ -34,8 +34,8 @@ public final class ExternalOptions {
   private final @NotNull List<String> contextTags = new CopyOnWriteArrayList<>();
   private @Nullable String proguardUuid;
   private @Nullable Long idleTimeout;
-  private @Nullable Long shutdownTimeout;
-  private @Nullable Long sessionFlushTimeout;
+  private @Nullable Long shutdownTimeoutMillis;
+  private @Nullable Long sessionFlushTimeoutMillis;
   private final @NotNull Set<Class<? extends Throwable>> ignoredExceptionsForType =
       new CopyOnWriteArraySet<>();
   private @Nullable List<String> ignoredErrors;
@@ -135,8 +135,8 @@ public final class ExternalOptions {
       options.addBundleId(bundleId);
     }
     options.setIdleTimeout(propertiesProvider.getLongProperty("idle-timeout"));
-    options.setShutdownTimeout(propertiesProvider.getLongProperty("shutdown-timeout"));
-    options.setSessionFlushTimeout(propertiesProvider.getLongProperty("session-flush-timeout"));
+    options.setShutdownTimeoutMillis(propertiesProvider.getLongProperty("shutdown-timeout"));
+    options.setSessionFlushTimeoutMillis(propertiesProvider.getLongProperty("session-flush-timeout"));
 
     options.setIgnoredErrors(propertiesProvider.getListOrNull("ignored-errors"));
 
@@ -397,20 +397,20 @@ public void setIdleTimeout(final @Nullable Long idleTimeout) {
     this.idleTimeout = idleTimeout;
   }
 
-  public @Nullable Long getShutdownTimeout() {
-    return shutdownTimeout;
+  public @Nullable Long getShutdownTimeoutMillis() {
+    return shutdownTimeoutMillis;
   }
 
-  public void setShutdownTimeout(final @Nullable Long shutdownTimeout) {
-    this.shutdownTimeout = shutdownTimeout;
+  public void setShutdownTimeoutMillis(final @Nullable Long shutdownTimeoutMillis) {
+    this.shutdownTimeoutMillis = shutdownTimeoutMillis;
   }
 
-  public @Nullable Long getSessionFlushTimeout() {
-    return sessionFlushTimeout;
+  public @Nullable Long getSessionFlushTimeoutMillis() {
+    return sessionFlushTimeoutMillis;
   }
 
-  public void setSessionFlushTimeout(final @Nullable Long sessionFlushTimeout) {
-    this.sessionFlushTimeout = sessionFlushTimeout;
+  public void setSessionFlushTimeoutMillis(final @Nullable Long sessionFlushTimeoutMillis) {
+    this.sessionFlushTimeoutMillis = sessionFlushTimeoutMillis;
   }
 
   public @Nullable List<String> getIgnoredErrors() {

sentry/src/main/java/io/sentry/SentryOptions.java

@@ -3307,11 +3307,11 @@ public void merge(final @NotNull ExternalOptions options) {
     if (options.getIdleTimeout() != null) {
       setIdleTimeout(options.getIdleTimeout());
     }
-    if (options.getShutdownTimeout() != null) {
-      setShutdownTimeoutMillis(options.getShutdownTimeout());
+    if (options.getShutdownTimeoutMillis() != null) {
+      setShutdownTimeoutMillis(options.getShutdownTimeoutMillis());
     }
-    if (options.getSessionFlushTimeout() != null) {
-      setSessionFlushTimeoutMillis(options.getSessionFlushTimeout());
+    if (options.getSessionFlushTimeoutMillis() != null) {
+      setSessionFlushTimeoutMillis(options.getSessionFlushTimeoutMillis());
     }
     for (String bundleId : options.getBundleIds()) {
       addBundleId(bundleId);

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

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

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

@@ -384,8 +384,8 @@ class SentryOptionsTest {
     externalOptions.addContextTag("requestId")
     externalOptions.proguardUuid = "1234"
     externalOptions.idleTimeout = 1500L
-    externalOptions.shutdownTimeout = 1499L
-    externalOptions.sessionFlushTimeout = 1498L
+    externalOptions.shutdownTimeoutMillis = 1499L
+    externalOptions.sessionFlushTimeoutMillis = 1498L
     externalOptions.bundleIds.addAll(
       listOf("12ea7a02-46ac-44c0-a5bb-6d1fd9586411 ", " faa3ab42-b1bd-4659-af8e-1682324aa744")
     )