Skip to content

Commit e57b4db

Browse files
diegomarquezpdiegomarquezp
committed
remove retries exhausted
1 parent 87f807a commit e57b4db

File tree

2 files changed

+0
-19
lines changed

2 files changed

+0
-19
lines changed

‎gax-java/gax-httpjson/src/test/java/com/google/api/gax/httpjson/RetryingTest.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ void retry() {
152152
assertThat(tracerFactory.getInstance().getAttemptsFailed().get()).isEqualTo(3);
153153
assertThat(tracerFactory.getInstance().getAttemptsStarted().get()).isEqualTo(4);
154154
assertThat(tracerFactory.getInstance().getOperationFailed().get()).isFalse();
155-
assertThat(tracerFactory.getInstance().getRetriesExhausted().get()).isFalse();
156155

157156
// Capture the argument passed to futureCall
158157
ArgumentCaptor<Integer> argumentCaptor = ArgumentCaptor.forClass(Integer.class);
@@ -192,7 +191,6 @@ void retryTotalTimeoutExceeded() {
192191
assertThrows(ApiException.class, () -> callable.call(initialRequest));
193192
assertThat(tracerFactory.getInstance().getAttemptsStarted().get()).isEqualTo(1);
194193
assertThat(tracerFactory.getInstance().getAttemptsFailed().get()).isEqualTo(0);
195-
assertThat(tracerFactory.getInstance().getRetriesExhausted().get()).isFalse();
196194
assertThat(tracerFactory.getInstance().getOperationFailed().get()).isTrue();
197195
// Capture the argument passed to futureCall
198196
ArgumentCaptor<Integer> argumentCaptor = ArgumentCaptor.forClass(Integer.class);
@@ -216,7 +214,6 @@ void retryMaxAttemptsExceeded() {
216214
assertThrows(ApiException.class, () -> callable.call(initialRequest));
217215
assertThat(tracerFactory.getInstance().getAttemptsStarted().get()).isEqualTo(2);
218216
assertThat(tracerFactory.getInstance().getAttemptsFailed().get()).isEqualTo(1);
219-
assertThat(tracerFactory.getInstance().getRetriesExhausted().get()).isTrue();
220217
assertThat(tracerFactory.getInstance().getOperationFailed().get()).isTrue();
221218
// Capture the argument passed to futureCall
222219
ArgumentCaptor<Integer> argumentCaptor = ArgumentCaptor.forClass(Integer.class);
@@ -240,7 +237,6 @@ void retryWithinMaxAttempts() {
240237
assertThat(callable.call(initialRequest)).isEqualTo(2);
241238
assertThat(tracerFactory.getInstance().getAttemptsStarted().get()).isEqualTo(3);
242239
assertThat(tracerFactory.getInstance().getAttemptsFailed().get()).isEqualTo(2);
243-
assertThat(tracerFactory.getInstance().getRetriesExhausted().get()).isFalse();
244240
assertThat(tracerFactory.getInstance().getOperationFailed().get()).isFalse();
245241
// Capture the argument passed to futureCall
246242
ArgumentCaptor<Integer> argumentCaptor = ArgumentCaptor.forClass(Integer.class);
@@ -270,7 +266,6 @@ void retryOnStatusUnknown() {
270266
assertThat(callable.call(initialRequest)).isEqualTo(2);
271267
assertThat(tracerFactory.getInstance().getAttemptsStarted().get()).isEqualTo(4);
272268
assertThat(tracerFactory.getInstance().getAttemptsFailed().get()).isEqualTo(3);
273-
assertThat(tracerFactory.getInstance().getRetriesExhausted().get()).isFalse();
274269
assertThat(tracerFactory.getInstance().getOperationFailed().get()).isFalse();
275270
// Capture the argument passed to futureCall
276271
ArgumentCaptor<Integer> argumentCaptor = ArgumentCaptor.forClass(Integer.class);
@@ -292,7 +287,6 @@ void retryOnUnexpectedException() {
292287
ApiException exception = assertThrows(ApiException.class, () -> callable.call(initialRequest));
293288
assertThat(tracerFactory.getInstance().getAttemptsStarted().get()).isEqualTo(1);
294289
assertThat(tracerFactory.getInstance().getAttemptsFailed().get()).isEqualTo(0);
295-
assertThat(tracerFactory.getInstance().getRetriesExhausted().get()).isFalse();
296290
assertThat(tracerFactory.getInstance().getOperationFailed().get()).isTrue();
297291
assertThat(exception).hasCauseThat().isSameInstanceAs(throwable);
298292
// Capture the argument passed to futureCall
@@ -325,7 +319,6 @@ void retryNoRecover() {
325319
ApiException exception = assertThrows(ApiException.class, () -> callable.call(initialRequest));
326320
assertThat(tracerFactory.getInstance().getAttemptsStarted().get()).isEqualTo(1);
327321
assertThat(tracerFactory.getInstance().getAttemptsFailed().get()).isEqualTo(0);
328-
assertThat(tracerFactory.getInstance().getRetriesExhausted().get()).isFalse();
329322
assertThat(tracerFactory.getInstance().getOperationFailed().get()).isTrue();
330323
assertThat(exception).isSameInstanceAs(apiException);
331324
// Capture the argument passed to futureCall
@@ -359,7 +352,6 @@ void retryKeepFailing() {
359352
assertThat(tracerFactory.getInstance().getAttemptsFailed().get()).isGreaterThan(0);
360353
assertThat(tracerFactory.getInstance().getAttemptsFailed().get())
361354
.isEqualTo(tracerFactory.getInstance().getAttemptsStarted().get() - 1);
362-
assertThat(tracerFactory.getInstance().getRetriesExhausted().get()).isTrue();
363355
assertThat(tracerFactory.getInstance().getOperationFailed().get()).isTrue();
364356
assertThat(exception).hasCauseThat().isInstanceOf(ApiException.class);
365357
assertThat(exception).hasCauseThat().hasMessageThat().contains("Unavailable");
@@ -403,7 +395,6 @@ void testKnownStatusCode() {
403395
assertThrows(FailedPreconditionException.class, () -> callable.call(initialRequest));
404396
assertThat(tracerFactory.getInstance().getAttemptsStarted().get()).isEqualTo(1);
405397
assertThat(tracerFactory.getInstance().getAttemptsFailed().get()).isEqualTo(0);
406-
assertThat(tracerFactory.getInstance().getRetriesExhausted().get()).isFalse();
407398
assertThat(tracerFactory.getInstance().getOperationFailed().get()).isTrue();
408399
assertThat(exception.getStatusCode().getTransportCode())
409400
.isEqualTo(HTTP_CODE_PRECONDITION_FAILED);
@@ -431,7 +422,6 @@ void testUnknownStatusCode() {
431422
assertThat(exception).hasMessageThat().isEqualTo("java.lang.RuntimeException: unknown");
432423
assertThat(tracerFactory.getInstance().getAttemptsStarted().get()).isEqualTo(1);
433424
assertThat(tracerFactory.getInstance().getAttemptsFailed().get()).isEqualTo(0);
434-
assertThat(tracerFactory.getInstance().getRetriesExhausted().get()).isFalse();
435425
assertThat(tracerFactory.getInstance().getOperationFailed().get()).isTrue();
436426
// Capture the argument passed to futureCall
437427
ArgumentCaptor<Integer> argumentCaptor = ArgumentCaptor.forClass(Integer.class);

‎gax-java/gax-httpjson/src/test/java/com/google/api/gax/httpjson/testing/TestApiTracer.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,6 @@ public AtomicBoolean getOperationFailed() {
5959
return operationFailed;
6060
}
6161

62-
public AtomicBoolean getRetriesExhausted() {
63-
return retriesExhausted;
64-
}
65-
6662
@Override
6763
public void attemptStarted(int attemptNumber) {
6864
attemptsStarted.incrementAndGet();
@@ -82,9 +78,4 @@ public void attemptFailed(Throwable error, Duration delay) {
8278
public void operationFailed(Throwable error) {
8379
operationFailed.set(true);
8480
}
85-
86-
@Override
87-
public void attemptFailedRetriesExhausted(Throwable error) {
88-
retriesExhausted.set(true);
89-
}
9081
};

0 commit comments

Comments
 (0)