Nicer logging

Worklytics · Feb 1, 2025 · 09fc121 · 09fc121
1 parent 68710d1
commit 09fc121
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/java/src/main/java/com/google/appengine/tools/mapreduce/RetryUtils.java b/java/src/main/java/com/google/appengine/tools/mapreduce/RetryUtils.java
@@ -9,6 +9,7 @@
 import com.google.common.base.Throwables;
 import com.google.common.collect.Iterables;
 
+import java.time.Duration;
 import java.util.Iterator;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
@@ -21,7 +22,8 @@ public class RetryUtils {
 
   public static WaitStrategy defaultWaitStrategy() {
     return WaitStrategies.join(
-      WaitStrategies.exponentialWait(1_000,30_000, TimeUnit.MILLISECONDS)
+      WaitStrategies.randomWait(200,TimeUnit.MILLISECONDS),
+      WaitStrategies.exponentialWait(1_000,10_000, TimeUnit.MILLISECONDS)
     );
   }
 
@@ -31,9 +33,9 @@ public static RetryListener logRetry(final Logger log, String className) {
       public <V> void onRetry(Attempt<V> attempt) {
         if (attempt.getAttemptNumber() > 1 || attempt.hasException()) {
           if (attempt.hasException()) {
-            log.log(Level.WARNING, "%s, Retry attempt: %d, wait: %d".formatted(className, attempt.getAttemptNumber(), attempt.getDelaySinceFirstAttempt()), attempt.getExceptionCause());
+            log.log(Level.WARNING, "%s, Attempt #%d. Retrying...".formatted(className, attempt.getAttemptNumber()), attempt.getExceptionCause());
           } else {
-            log.log(Level.WARNING, "%s, Retry attempt: %d, wait: %d. No exception?".formatted(className, attempt.getAttemptNumber(), attempt.getDelaySinceFirstAttempt()));
+            log.log(Level.WARNING, "%s, Attempt #%d OK, wait: %s".formatted(className, attempt.getAttemptNumber(), Duration.ofMillis(attempt.getDelaySinceFirstAttempt())));
           }
         }
       }

diff --git a/java/src/main/java/com/google/appengine/tools/pipeline/impl/backend/AppEngineBackEnd.java b/java/src/main/java/com/google/appengine/tools/pipeline/impl/backend/AppEngineBackEnd.java
@@ -41,6 +41,7 @@
 import lombok.extern.java.Log;
 
 import java.io.IOException;
+import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
@@ -97,9 +98,9 @@ public <V> void onRetry(Attempt<V> attempt) {
                   if (attempt.getAttemptNumber() > 1 || attempt.hasException()) {
                     String className = AppEngineBackEnd.class.getName();
                     if (attempt.hasException()) {
-                      log.log(Level.WARNING, "%s, Retry attempt: %d, wait: %d".formatted(className, attempt.getAttemptNumber(), attempt.getDelaySinceFirstAttempt()), attempt.getExceptionCause());
+                      log.log(Level.WARNING, "%s, Attempt #%d. Retrying...".formatted(className, attempt.getAttemptNumber()), attempt.getExceptionCause());
                     } else {
-                      log.log(Level.WARNING, "%s, Retry attempt: %d, wait: %d. No exception?".formatted(className, attempt.getAttemptNumber(), attempt.getDelaySinceFirstAttempt()));
+                      log.log(Level.WARNING, "%s, Attempt #%d OK, wait: %s".formatted(className, attempt.getAttemptNumber(), Duration.ofMillis(attempt.getDelaySinceFirstAttempt())));
                     }
                   }
                 }