Shoulda checked the history, reverting to seconds

Author: MichaelGHSeg

analytics/src/main/java/com/segment/analytics/internal/AnalyticsClient.java

@@ -44,8 +44,8 @@ public class AnalyticsClient {
   private static final Charset ENCODING = StandardCharsets.UTF_8;
   private Gson gsonInstance;
   private static final String instanceId = UUID.randomUUID().toString();
-  private static final int WAIT_FOR_THREAD_COMPLETE_MS = 5000;
-  private static final int TERMINATION_TIMEOUT_MS = 1000;
+  private static final int WAIT_FOR_THREAD_COMPLETE_S = 5;
+  private static final int TERMINATION_TIMEOUT_S = 1;
 
   static {
     Map<String, String> library = new LinkedHashMap<>();
@@ -245,7 +245,7 @@ private void waitForLooperCompletion() {
       try {
         // Wait for the looper to complete processing the STOP message and finish
         // Use a reasonable timeout to avoid hanging indefinitely
-        looperFuture.get(WAIT_FOR_THREAD_COMPLETE_MS, TimeUnit.MILLISECONDS);
+        looperFuture.get(WAIT_FOR_THREAD_COMPLETE_S, TimeUnit.SECONDS);
         log.print(VERBOSE, "Looper completed successfully.");
       } catch (Exception e) {
         log.print(ERROR, e, "Error waiting for looper to complete.");
@@ -262,14 +262,14 @@ public void shutdownAndWait(ExecutorService executor, String name) {
     boolean isLooperExecutor = name != null && name.equalsIgnoreCase("looper");
     try {
       executor.shutdown();
-      boolean terminated = executor.awaitTermination(TERMINATION_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+      boolean terminated = executor.awaitTermination(TERMINATION_TIMEOUT_S, TimeUnit.SECONDS);
       if (terminated) {
         log.print(VERBOSE, "%s executor terminated normally.", name);
         return;
       }
       if (isLooperExecutor) { // Handle looper - network could be passed in and should finish on its own
         // not terminated within timeout -> force shutdown
-        log.print(VERBOSE, "%s did not terminate in %d ms; requesting shutdownNow().", name, TERMINATION_TIMEOUT_MS);
+        log.print(VERBOSE, "%s did not terminate in %d seconds; requesting shutdownNow().", name, TERMINATION_TIMEOUT_S);
         List<Runnable> dropped = executor.shutdownNow(); // interrupts running tasks
         log.print(
             VERBOSE,
@@ -278,7 +278,7 @@ public void shutdownAndWait(ExecutorService executor, String name) {
             dropped.size());
 
         // optional short wait to give interrupted tasks a chance to exit
-        boolean terminatedAfterForce = executor.awaitTermination(TERMINATION_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+        boolean terminatedAfterForce = executor.awaitTermination(TERMINATION_TIMEOUT_S, TimeUnit.SECONDS);
         log.print(
             VERBOSE,
             "%s executor %s after shutdownNow().",