chore: ensure backoff is reset along with retryContext

Author: BenWhitehead

google-cloud-storage/src/main/java/com/google/cloud/storage/DefaultRetryContext.java

@@ -82,6 +82,7 @@ public void reset() {
       }
       lastRecordedErrorNs = retryingDependencies.getClock().nanoTime();
       clearPendingBackoff();
+      backoff.reset();
     } finally {
       lock.unlock();
     }

google-cloud-storage/src/test/java/com/google/cloud/storage/RetryContextTest.java

@@ -210,7 +210,7 @@ public boolean shouldRetry(Throwable previousThrowable, Object previousResponse)
               Arrays.stream(suppressed).map(Throwable::getMessage).collect(Collectors.toList());
           assertThat(suppressedMessages)
               .containsExactly(
-                  "Unretryable error (attempts: 1, maxAttempts: 6, elapsed: PT9.002S, nextBackoff: PT3S)");
+                  "Unretryable error (attempts: 1, maxAttempts: 6, elapsed: PT0S, nextBackoff: PT3S)");
         });
   }
 
@@ -381,6 +381,35 @@ public boolean shouldRetry(Throwable previousThrowable, Object previousResponse)
     assertThat(retryContextSplits.size()).isEqualTo(retryHelperSplits.size());
   }
 
+  @Test
+  public void resetAlsoResetsBackoffState() throws Exception {
+    Throwable t1 = apiException(Code.INTERNAL, "{err1}");
+    Throwable t2 = apiException(Code.INTERNAL, "{err2}");
+    RetryContext ctx =
+        RetryContext.of(
+            scheduledExecutorService, maxAttempts(1), Retrying.alwaysRetry(), Jitterer.noJitter());
+
+    AtomicReference<Throwable> err1 = new AtomicReference<>();
+    AtomicReference<Throwable> err2 = new AtomicReference<>();
+    ctx.recordError(t1, failOnSuccess(), err1::set);
+    ctx.reset();
+    ctx.recordError(t2, failOnSuccess(), err2::set);
+
+    assertAll(
+        () -> {
+          String messages = TestUtils.messagesToText(err1.get());
+          assertThat(messages)
+              .contains(
+                  "Operation failed to complete within attempt budget (attempts: 1, maxAttempts: 1, elapsed: PT0S, nextBackoff: PT3S)");
+        },
+        () -> {
+          String messages = TestUtils.messagesToText(err2.get());
+          assertThat(messages)
+              .contains(
+                  "Operation failed to complete within attempt budget (attempts: 1, maxAttempts: 1, elapsed: PT0S, nextBackoff: PT3S)");
+        });
+  }
+
   private static ApiException apiException(Code code, String message) {
     return ApiExceptionFactory.createException(message, null, GrpcStatusCode.of(code), false);
   }