Skip to content

Commit

Permalink
chore: move the attemptFailed logic from BaseApiTracer to ApiTracer (
Browse files Browse the repository at this point in the history
  • Loading branch information
diegomarquezp authored Jul 9, 2024
1 parent e8deeaf commit b738de5
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
*/
package com.google.api.gax.tracing;

import static com.google.api.gax.util.TimeConversionUtils.toThreetenDuration;

import com.google.api.core.InternalApi;
import com.google.api.core.ObsoleteApi;

Expand Down Expand Up @@ -121,7 +123,13 @@ default Scope inScope() {
* @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 attemptFailedDuration(Throwable error, java.time.Duration delay) {};
default void attemptFailedDuration(Throwable error, java.time.Duration delay) {
// Defaults to do the same as attemptFailed(Throwable, org.threeten.bp.Duration). This
// is because customers may have older/legacy code that directly implements
// attemptFailed(Throwable, org.threeten.bp.Duration)} and their overridden logic should be
// invoked in gax.
attemptFailed(error, toThreetenDuration(delay));
};

/**
* Adds an annotation that the attempt failed and that no further attempts will be made because
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
*/
package com.google.api.gax.tracing;

import static com.google.api.gax.util.TimeConversionUtils.toThreetenDuration;

import com.google.api.core.InternalApi;
import com.google.api.core.ObsoleteApi;

Expand Down Expand Up @@ -105,12 +103,6 @@ public void attemptCancelled() {
// noop
}

@Override
public void attemptFailedDuration(Throwable error, java.time.Duration delay) {
// noop via attemptFailed(Throwable error, org.threeten.Duration)
attemptFailed(error, toThreetenDuration(delay));
}

/**
* This method is obsolete. Use {@link #attemptFailedDuration(Throwable, java.time.Duration)}
* instead.
Expand Down

0 comments on commit b738de5

Please sign in to comment.