modify overloads in ApiTracer

Author: diegomarquezp

gax-java/gax/src/main/java/com/google/api/gax/retrying/BasicRetryingFuture.java

@@ -187,7 +187,7 @@ void handleAttempt(Throwable throwable, ResponseT response) {
                   "retriableException: " + throwable
                 });
           }
-          tracer.attemptFailed(throwable, nextAttemptSettings.getRandomizedRetryDelayDuration());
+          tracer.attemptFailedDuration(throwable, nextAttemptSettings.getRandomizedRetryDelayDuration());
           attemptSettings = nextAttemptSettings;
           setAttemptResult(throwable, response, true);
           // a new attempt will be (must be) scheduled by an external executor

gax-java/gax/src/main/java/com/google/api/gax/tracing/ApiTracer.java

@@ -110,10 +110,10 @@ default Scope inScope() {
   /** Add an annotation that the attempt was cancelled by the user. */
   default void attemptCancelled() {};
 
-  /** Backport of {@link #attemptFailed(Throwable, java.time.Duration)} */
-  @ObsoleteApi("Use attemptFailed(Throwable, java.time.Duration) instead")
+  /** Backport of {@link #attemptFailedDuration(Throwable, java.time.Duration)} */
+  @ObsoleteApi("Use attemptFailedDuration(Throwable, java.time.Duration) instead")
   default void attemptFailed(Throwable error, org.threeten.bp.Duration delay) {
-    attemptFailed(error, toJavaTimeDuration(delay));
+    attemptFailedDuration(error, toJavaTimeDuration(delay));
   };
 
   /**
@@ -122,7 +122,7 @@ default void attemptFailed(Throwable error, org.threeten.bp.Duration delay) {
    * @param error the transient error that caused the attempt to fail.
    * @param delay the amount of time to wait before the next attempt will start.
    */
-  default void attemptFailed(Throwable error, java.time.Duration delay) {};
+  default void attemptFailedDuration(Throwable error, java.time.Duration delay) {};
 
   /**
    * Adds an annotation that the attempt failed and that no further attempts will be made because

gax-java/gax/src/main/java/com/google/api/gax/tracing/BaseApiTracer.java

@@ -106,15 +106,15 @@ public void attemptCancelled() {
   }
 
   @Override
-  public void attemptFailed(Throwable error, java.time.Duration delay) {
+  public void attemptFailedDuration(Throwable error, java.time.Duration delay) {
     // noop
   }
 
-  /** Backport of {@link #attemptFailed(Throwable, java.time.Duration)} */
+  /** Backport of {@link #attemptFailedDuration(Throwable, java.time.Duration)} */
   @Override
   @ObsoleteApi("Use attemptFailed(Throwable, java.time.Duration) instead")
   public void attemptFailed(Throwable error, org.threeten.bp.Duration delay) {
-    attemptFailed(error, toJavaTimeDuration(delay));
+    attemptFailedDuration(error, toJavaTimeDuration(delay));
   }
 
   @Override

gax-java/gax/src/main/java/com/google/api/gax/tracing/MetricsTracer.java

@@ -173,17 +173,17 @@ public void attemptCancelled() {
    *     key.
    */
   @Override
-  public void attemptFailed(Throwable error, java.time.Duration delay) {
+  public void attemptFailedDuration(Throwable error, java.time.Duration delay) {
     attributes.put(STATUS_ATTRIBUTE, extractStatus(error));
     metricsRecorder.recordAttemptLatency(attemptTimer.elapsed(TimeUnit.MILLISECONDS), attributes);
     metricsRecorder.recordAttemptCount(1, attributes);
   }
 
-  /** Backport of {@link #attemptFailed(Throwable, java.time.Duration)} */
+  /** Backport of {@link #attemptFailedDuration(Throwable, java.time.Duration)} */
   @Override
-  @ObsoleteApi("Use attemptFailed(Throwable, java.time.Duration) instead")
+  @ObsoleteApi("Use attemptFailedDuration(Throwable, java.time.Duration) instead")
   public void attemptFailed(Throwable error, org.threeten.bp.Duration delay) {
-    attemptFailed(error, toJavaTimeDuration(delay));
+    attemptFailedDuration(error, toJavaTimeDuration(delay));
   }
 
   /**

gax-java/gax/src/main/java/com/google/api/gax/tracing/OpencensusTracer.java

@@ -344,7 +344,7 @@ public void attemptCancelled() {
 
   /** {@inheritDoc} */
   @Override
-  public void attemptFailed(Throwable error, java.time.Duration delay) {
+  public void attemptFailedDuration(Throwable error, java.time.Duration delay) {
     Map<String, AttributeValue> attributes = baseAttemptAttributes();
     attributes.put("delay ms", AttributeValue.longAttributeValue(delay.toMillis()));
     populateError(attributes, error);
@@ -359,11 +359,11 @@ public void attemptFailed(Throwable error, java.time.Duration delay) {
     lastConnectionId = null;
   }
 
-  /** Backport of {@link #attemptFailed(Throwable, java.time.Duration)} */
+  /** Backport of {@link #attemptFailedDuration(Throwable, java.time.Duration)} */
   @Override
-  @ObsoleteApi("Use attemptFailed(Throwable, java.time.Duration) instead")
+  @ObsoleteApi("Use attemptFailedDuration(Throwable, java.time.Duration) instead")
   public void attemptFailed(Throwable error, org.threeten.bp.Duration delay) {
-    attemptFailed(error, toJavaTimeDuration(delay));
+    attemptFailedDuration(error, toJavaTimeDuration(delay));
   }
 
   /** {@inheritDoc} */

gax-java/gax/src/test/java/com/google/api/gax/retrying/AbstractRetryingExecutorTest.java

@@ -143,7 +143,7 @@ public void testSuccessWithFailures() throws Exception {
     assertEquals(5, future.getAttemptSettings().getAttemptCount());
 
     verify(tracer, times(6)).attemptStarted(eq("request"), anyInt());
-    verify(tracer, times(5)).attemptFailed(any(Throwable.class), any(java.time.Duration.class));
+    verify(tracer, times(5)).attemptFailedDuration(any(Throwable.class), any(java.time.Duration.class));
     verify(tracer, times(1)).attemptSucceeded();
     verifyNoMoreInteractions(tracer);
   }
@@ -188,7 +188,7 @@ public void testMaxRetriesExceeded() throws Exception {
     assertEquals(5, future.getAttemptSettings().getAttemptCount());
 
     verify(tracer, times(6)).attemptStarted(eq("request"), anyInt());
-    verify(tracer, times(5)).attemptFailed(any(Throwable.class), any(java.time.Duration.class));
+    verify(tracer, times(5)).attemptFailedDuration(any(Throwable.class), any(java.time.Duration.class));
     verify(tracer, times(1)).attemptFailedRetriesExhausted(any(Throwable.class));
     verifyNoMoreInteractions(tracer);
   }
@@ -266,7 +266,7 @@ public void testCancelByRetryingAlgorithm() throws Exception {
 
     verify(tracer, times(5)).attemptStarted(eq("request"), anyInt());
     // Pre-apocalypse failures
-    verify(tracer, times(4)).attemptFailed(any(Throwable.class), any(java.time.Duration.class));
+    verify(tracer, times(4)).attemptFailedDuration(any(Throwable.class), any(java.time.Duration.class));
     // Apocalypse failure
     verify(tracer, times(1)).attemptFailedRetriesExhausted(any(CancellationException.class));
     verifyNoMoreInteractions(tracer);
@@ -286,7 +286,7 @@ public void testUnexpectedExceptionFromRetryAlgorithm() throws Exception {
 
     verify(tracer, times(5)).attemptStarted(eq("request"), anyInt());
     // Pre-apocalypse failures
-    verify(tracer, times(4)).attemptFailed(any(Throwable.class), any(java.time.Duration.class));
+    verify(tracer, times(4)).attemptFailedDuration(any(Throwable.class), any(java.time.Duration.class));
     // Apocalypse failure
     verify(tracer, times(1)).attemptPermanentFailure(any(RuntimeException.class));
     verifyNoMoreInteractions(tracer);

gax-java/gax/src/test/java/com/google/api/gax/retrying/BasicRetryingFutureTest.java

@@ -95,7 +95,7 @@ public void testHandleAttemptDoesNotThrowNPEWhenLogLevelLowerThanFiner() throws
     future.handleAttempt(null, null);
 
     Mockito.verify(tracer)
-        .attemptFailed(
+        .attemptFailedDuration(
             ArgumentMatchers.<Throwable>any(), ArgumentMatchers.<java.time.Duration>any());
     Mockito.verifyNoMoreInteractions(tracer);
   }

gax-java/gax/src/test/java/com/google/api/gax/tracing/MetricsTestUtils.java

@@ -36,10 +36,11 @@
 public class MetricsTestUtils {
   public static void reportFailedAttempt(ApiTracer tracer, Exception ex, Object delayValue) {
     try {
+      final String methodName = delayValue.getClass().getName().startsWith("java.time") ? "attemptFailedDuration" : "attemptFailed";
       Method attemptFailed =
           tracer
               .getClass()
-              .getDeclaredMethod("attemptFailed", Throwable.class, delayValue.getClass());
+              .getDeclaredMethod(methodName, Throwable.class, delayValue.getClass());
       attemptFailed.invoke(tracer, ex, delayValue);
     } catch (Exception e) {
       fail();