Skip to content

Commit

Permalink
take async retry to separate class and reduce retry waiting time
Browse files Browse the repository at this point in the history
  • Loading branch information
@Romeh
Romeh committed Apr 4, 2019
1 parent 367c22b commit cc1a12a
Show file tree
Hide file tree
Showing 5 changed files with 132 additions and 72 deletions.
127 changes: 127 additions & 0 deletions ...ing-boot2/src/test/java/io/github/resilience4j/retry/RetryAutoConfigurationAsyncTest.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
/*
* Copyright 2019 Mahmoud Romeh
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.github.resilience4j.retry;

import static io.github.resilience4j.service.test.retry.ReactiveRetryDummyService.BACKEND_C;
import static io.github.resilience4j.service.test.retry.RetryDummyService.RETRY_BACKEND_A;
import static io.github.resilience4j.service.test.retry.RetryDummyService.RETRY_BACKEND_B;
import static org.assertj.core.api.Assertions.assertThat;

import java.io.IOException;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;

import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.http.ResponseEntity;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

import io.github.resilience4j.circuitbreaker.IgnoredException;
import io.github.resilience4j.retry.autoconfigure.RetryProperties;
import io.github.resilience4j.retry.configure.RetryAspect;
import io.github.resilience4j.retry.monitoring.endpoint.RetryEndpointResponse;
import io.github.resilience4j.retry.monitoring.endpoint.RetryEventsEndpointResponse;
import io.github.resilience4j.service.test.TestApplication;
import io.github.resilience4j.service.test.retry.RetryDummyService;

@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
classes = TestApplication.class)
public class RetryAutoConfigurationAsyncTest {

@Autowired
RetryRegistry retryRegistry;

@Autowired
RetryProperties retryProperties;

@Autowired
RetryAspect retryAspect;

@Autowired
RetryDummyService retryDummyService;

@Autowired
private TestRestTemplate restTemplate;

/**
* The test verifies that a Async Retry instance is created and configured properly when the RetryDummyService is invoked and
* that the Async Retry logic is properly handled
*/
@Test
@DirtiesContext
public void testRetryAutoConfigurationAsync() throws Throwable {
assertThat(retryRegistry).isNotNull();

try {
final CompletionStage<String> stringCompletionStage = retryDummyService.doSomethingAsync(true);
String result = awaitResult(stringCompletionStage, 5);
assertThat(result).isNull();

} catch (IOException ex) {
// Do nothing. The IOException is recorded by the retry as it is one of failure exceptions
assertThat(ex.getMessage()).contains("Test Message");
}
// The invocation is recorded by the CircuitBreaker as a success.
String resultSuccess = awaitResult(retryDummyService.doSomethingAsync(false), 5);
assertThat(resultSuccess).isNotEmpty();
Retry retry = retryRegistry.retry(RETRY_BACKEND_B);
assertThat(retry).isNotNull();

// expect retry is configured as defined in application.yml
assertThat(retry.getRetryConfig().getMaxAttempts()).isEqualTo(3);
assertThat(retry.getName()).isEqualTo(RETRY_BACKEND_B);
assertThat(retry.getRetryConfig().getExceptionPredicate().test(new IOException())).isTrue();

// expect retry actuator endpoint contains both retries
ResponseEntity<RetryEndpointResponse> retriesList = restTemplate.getForEntity("/actuator/retries", RetryEndpointResponse.class);
assertThat(retriesList.getBody().getRetries()).hasSize(3).containsOnly(RETRY_BACKEND_A, RETRY_BACKEND_B, BACKEND_C);

// expect retry-event actuator endpoint recorded both events
ResponseEntity<RetryEventsEndpointResponse> retryEventList = restTemplate.getForEntity("/actuator/retryevents", RetryEventsEndpointResponse.class);
assertThat(retryEventList.getBody().getRetryEvents()).hasSize(3);

retryEventList = restTemplate.getForEntity("/actuator/retryevents/" + RETRY_BACKEND_B, RetryEventsEndpointResponse.class);
assertThat(retryEventList.getBody().getRetryEvents()).hasSize(3);

assertThat(retry.getRetryConfig().getExceptionPredicate().test(new IOException())).isTrue();
assertThat(retry.getRetryConfig().getExceptionPredicate().test(new IgnoredException())).isFalse();

assertThat(retry.getMetrics().getNumberOfFailedCallsWithoutRetryAttempt()).isEqualTo(0);
assertThat(retry.getMetrics().getNumberOfFailedCallsWithRetryAttempt()).isEqualTo(1);
assertThat(retry.getMetrics().getNumberOfSuccessfulCallsWithoutRetryAttempt()).isEqualTo(1);
assertThat(retry.getMetrics().getNumberOfSuccessfulCallsWithRetryAttempt()).isEqualTo(0);
// expect aspect configured as defined in application.yml
assertThat(retryAspect.getOrder()).isEqualTo(399);
}


private <T> T awaitResult(CompletionStage<T> completionStage, long timeoutSeconds) throws Throwable {
try {
return completionStage.toCompletableFuture().get(timeoutSeconds, TimeUnit.SECONDS);
} catch (InterruptedException | TimeoutException e) {
throw new AssertionError(e);
} catch (ExecutionException e) {
throw e.getCause();
}
}
}
2 changes: 1 addition & 1 deletion ...g-boot2/src/test/java/io/github/resilience4j/retry/RetryAutoConfigurationReactorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
classes = TestApplication.class)
@DirtiesContext
public class RetryAutoConfigurationReactorTest {

@Autowired
Expand All @@ -64,6 +63,7 @@ public class RetryAutoConfigurationReactorTest {
* that the Retry logic is properly handled
*/
@Test
@DirtiesContext
public void testRetryAutoConfigurationReactor() throws IOException {
assertThat(retryRegistry).isNotNull();
assertThat(retryProperties).isNotNull();
Expand Down
2 changes: 1 addition & 1 deletion ...ng-boot2/src/test/java/io/github/resilience4j/retry/RetryAutoConfigurationRxJavaTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
classes = TestApplication.class)
@DirtiesContext
public class RetryAutoConfigurationRxJavaTest {

@Autowired
Expand All @@ -64,6 +63,7 @@ public class RetryAutoConfigurationRxJavaTest {
* that the Retry logic is properly handled
*/
@Test
@DirtiesContext
public void testRetryAutoConfigurationRxJava2() throws IOException {
assertThat(retryRegistry).isNotNull();
assertThat(retryProperties).isNotNull();
Expand Down
67 changes: 0 additions & 67 deletions ...j-spring-boot2/src/test/java/io/github/resilience4j/retry/RetryAutoConfigurationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@
import static org.assertj.core.api.Assertions.assertThat;

import java.io.IOException;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;

import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down Expand Up @@ -111,67 +107,4 @@ public void testRetryAutoConfiguration() throws IOException {
// expect aspect configured as defined in application.yml
assertThat(retryAspect.getOrder()).isEqualTo(399);
}

/**
* The test verifies that a Async Retry instance is created and configured properly when the RetryDummyService is invoked and
* that the Async Retry logic is properly handled
*/
@Test
@DirtiesContext
public void testRetryAutoConfigurationAsync() throws Throwable {
assertThat(retryRegistry).isNotNull();

try {
final CompletionStage<String> stringCompletionStage = retryDummyService.doSomethingAsync(true);
String result = awaitResult(stringCompletionStage, 5);
assertThat(result).isNull();

} catch (IOException ex) {
// Do nothing. The IOException is recorded by the retry as it is one of failure exceptions
assertThat(ex.getMessage()).contains("Test Message");
}
// The invocation is recorded by the CircuitBreaker as a success.
String resultSuccess = awaitResult(retryDummyService.doSomethingAsync(false), 5);
assertThat(resultSuccess).isNotEmpty();
Retry retry = retryRegistry.retry(RETRY_BACKEND_B);
assertThat(retry).isNotNull();

// expect retry is configured as defined in application.yml
assertThat(retry.getRetryConfig().getMaxAttempts()).isEqualTo(3);
assertThat(retry.getName()).isEqualTo(RETRY_BACKEND_B);
assertThat(retry.getRetryConfig().getExceptionPredicate().test(new IOException())).isTrue();

assertThat(retry.getMetrics().getNumberOfFailedCallsWithoutRetryAttempt()).isEqualTo(0);
assertThat(retry.getMetrics().getNumberOfFailedCallsWithRetryAttempt()).isEqualTo(1);
assertThat(retry.getMetrics().getNumberOfSuccessfulCallsWithoutRetryAttempt()).isEqualTo(1);
assertThat(retry.getMetrics().getNumberOfSuccessfulCallsWithRetryAttempt()).isEqualTo(0);

// expect retry actuator endpoint contains both retries
ResponseEntity<RetryEndpointResponse> retriesList = restTemplate.getForEntity("/actuator/retries", RetryEndpointResponse.class);
assertThat(retriesList.getBody().getRetries()).hasSize(3).containsOnly(RETRY_BACKEND_A, RETRY_BACKEND_B, BACKEND_C);

// expect retry-event actuator endpoint recorded both events
ResponseEntity<RetryEventsEndpointResponse> retryEventList = restTemplate.getForEntity("/actuator/retryevents", RetryEventsEndpointResponse.class);
assertThat(retryEventList.getBody().getRetryEvents()).hasSize(3);

retryEventList = restTemplate.getForEntity("/actuator/retryevents/" + RETRY_BACKEND_B, RetryEventsEndpointResponse.class);
assertThat(retryEventList.getBody().getRetryEvents()).hasSize(3);

assertThat(retry.getRetryConfig().getExceptionPredicate().test(new IOException())).isTrue();
assertThat(retry.getRetryConfig().getExceptionPredicate().test(new IgnoredException())).isFalse();

// expect aspect configured as defined in application.yml
assertThat(retryAspect.getOrder()).isEqualTo(399);
}


private <T> T awaitResult(CompletionStage<T> completionStage, long timeoutSeconds) throws Throwable {
try {
return completionStage.toCompletableFuture().get(timeoutSeconds, TimeUnit.SECONDS);
} catch (InterruptedException | TimeoutException e) {
throw new AssertionError(e);
} catch (ExecutionException e) {
throw e.getCause();
}
}
}
6 changes: 3 additions & 3 deletions resilience4j-spring-boot2/src/test/resources/application.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@ resilience4j.retry:
backends:
retryBackendA:
maxRetryAttempts: 3
waitDuration: 600
waitDuration: 100
retryExceptionPredicate: io.github.resilience4j.circuitbreaker.RecordFailurePredicate
retryExceptions:
- java.io.IOException
ignoreExceptions:
- io.github.resilience4j.circuitbreaker.IgnoredException
retryBackendB:
maxRetryAttempts: 3
waitDuration: 600
waitDuration: 100
retryExceptionPredicate: io.github.resilience4j.circuitbreaker.RecordFailurePredicate
retryExceptions:
- java.io.IOException
ignoreExceptions:
- io.github.resilience4j.circuitbreaker.IgnoredException
retryBackendC:
maxRetryAttempts: 3
waitDuration: 600
waitDuration: 100
retryExceptionPredicate: io.github.resilience4j.circuitbreaker.RecordFailurePredicate
retryExceptions:
- java.lang.IllegalArgumentException
Expand Down

0 comments on commit cc1a12a

Please sign in to comment.