Fix misinterpretation of rpcTimeout in ExponentialRetryAlgorithm

gax/src/main/java/com/google/api/gax/retrying/ExponentialRetryAlgorithm.java

@@ -88,18 +88,25 @@ public TimedAttemptSettings createFirstAttempt() {
   public TimedAttemptSettings createNextAttempt(TimedAttemptSettings prevSettings) {
     RetrySettings settings = prevSettings.getGlobalSettings();
 
+    // The retry delay is used as follows:
+    //     attempt #0  - not used (initial attempt is always made immediately);
+    //     attempt #1  - use initialRetryDelay;
+    //     attempt #2+ - use the calculated value (i.e. the following if statement is true only
+    //                   if we are about to calculate the value for the upcoming 2nd+ attempt).
     long newRetryDelay = settings.getInitialRetryDelay().toMillis();
-    long newRpcTimeout = settings.getInitialRpcTimeout().toMillis();
-
     if (prevSettings.getAttemptCount() > 0) {
       newRetryDelay =
           (long) (settings.getRetryDelayMultiplier() * prevSettings.getRetryDelay().toMillis());
       newRetryDelay = Math.min(newRetryDelay, settings.getMaxRetryDelay().toMillis());
-      newRpcTimeout =
-          (long) (settings.getRpcTimeoutMultiplier() * prevSettings.getRpcTimeout().toMillis());
-      newRpcTimeout = Math.min(newRpcTimeout, settings.getMaxRpcTimeout().toMillis());
     }
 
+    // The rpc timeout is used as follows:
+    //     attempt #0  - use the initialRpcTimeout;
+    //     attempt #1+ - use the calculated value.
+    long newRpcTimeout =
+        (long) (settings.getRpcTimeoutMultiplier() * prevSettings.getRpcTimeout().toMillis());
+    newRpcTimeout = Math.min(newRpcTimeout, settings.getMaxRpcTimeout().toMillis());
+
     return TimedAttemptSettings.newBuilder()
         .setGlobalSettings(prevSettings.getGlobalSettings())
         .setRetryDelay(Duration.ofMillis(newRetryDelay))

gax/src/test/java/com/google/api/gax/rpc/OperationCallableImplTest.java

@@ -138,6 +138,7 @@ public void setUp() throws IOException {
   }
 
   private static class ResponseTransformer implements ApiFunction<OperationSnapshot, Color> {
+
     @Override
     public Color apply(OperationSnapshot operationSnapshot) {
       if (!operationSnapshot.getErrorCode().getCode().equals(StatusCode.Code.OK)) {
@@ -169,6 +170,7 @@ public Color apply(OperationSnapshot operationSnapshot) {
   }
 
   private static class MetadataTransformer implements ApiFunction<OperationSnapshot, Currency> {
+
     @Override
     public Currency apply(OperationSnapshot operationSnapshot) {
       if (operationSnapshot.getMetadata() == null) {
@@ -469,9 +471,6 @@ public void testFutureCallPollDoneOnSecond() throws Exception {
 
   @Test
   public void testFutureCallPollRPCTimeout() throws Exception {
-    // Note: there is a bug in Rechecking callable that will return the initial RPC timeouts
-    // twice. So, this test works around the issue by polling 3 times and checking for the first
-    // 2 timeout durations
     String opName = "testFutureCallPollRPCTimeout";
     pollingAlgorithm =
         OperationTimedPollAlgorithm.create(
@@ -518,18 +517,17 @@ public void testFutureCallPollRPCTimeout() throws Exception {
     for (ApiCallContext callContext : callContextCaptor.getAllValues()) {
       actualTimeouts.add(callContext.getTimeout());
     }
-    assertThat(actualTimeouts).containsAllOf(Duration.ofMillis(100), Duration.ofMillis(200));
+
+    List<Duration> expectedTimeouts =
+        Lists.newArrayList(Duration.ofMillis(100), Duration.ofMillis(200), Duration.ofMillis(400));
+    assertThat(actualTimeouts).isEqualTo(expectedTimeouts);
   }
 
   @Test
   public void testFutureCallContextPropagation() throws Exception {
-    // Note: there is a bug in Rechecking callable that will return the initial RPC timeouts
-    // twice. So, this test works around the issue by polling 3 times and checking for the first
-    // 2 timeout durations
     String opName = "testFutureCallContextPropagation";
 
     Color resp = getColor(0.5f);
-    Currency meta1 = Currency.getInstance("UAH");
     Currency meta2 = Currency.getInstance("USD");
     OperationSnapshot initialOperation = getOperation(opName, null, null, null, false);
     OperationSnapshot resultOperation = getOperation(opName, resp, null, meta2, true);
@@ -1178,6 +1176,7 @@ public ApiFuture<OperationSnapshot> futureCall(Integer request, ApiCallContext c
   }
 
   private class UnsupportedOperationApi implements LongRunningClient {
+
     @Override
     public UnaryCallable<String, OperationSnapshot> getOperationCallable() {
       throw new UnsupportedOperationException("Didn't expect call to getOperationCallable()");