diff --git a/README.adoc b/README.adoc index 9db1dad..c432ab0 100644 --- a/README.adoc +++ b/README.adoc @@ -144,6 +144,39 @@ public Customizer slowCustomizer() { ---- ==== +==== Circuit Breaker Properties Configuration + +You can configure `CircuitBreaker` and `TimeLimiter` instances in your application's configuration properties file. +Property configuration has higher priority than Java `Customizer` configuration. + +==== +[source] +---- +resilience4j.circuitbreaker: + instances: + backendA: + registerHealthIndicator: true + slidingWindowSize: 100 + backendB: + registerHealthIndicator: true + slidingWindowSize: 10 + permittedNumberOfCallsInHalfOpenState: 3 + slidingWindowType: TIME_BASED + recordFailurePredicate: io.github.robwin.exception.RecordFailurePredicate + +resilience4j.timelimiter: + instances: + backendA: + timeoutDuration: 2s + cancelRunningFuture: true + backendB: + timeoutDuration: 1s + cancelRunningFuture: false +---- +==== + +For more information on Resilience4j property configuration, see https://resilience4j.readme.io/docs/getting-started-3#configuration[Resilience4J Spring Boot 2 Configuration]. + ==== Bulkhead pattern supporting If `resilience4j-bulkhead` is on the classpath, Spring Cloud CircuitBreaker will wrap all methods with a Resilience4j Bulkhead. You can disable the Resilience4j Bulkhead by setting `spring.cloud.circuitbreaker.bulkhead.resilience4j.enabled` to `false`. diff --git a/docs/pom.xml b/docs/pom.xml index 57cf81c..d185646 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ spring-cloud-circuitbreaker org.springframework.cloud - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/pom.xml b/pom.xml index 358dfc3..caf01c8 100644 --- a/pom.xml +++ b/pom.xml @@ -6,12 +6,12 @@ spring-cloud-circuitbreaker pom - 2.0.2-SNAPSHOT + 2.0.2 org.springframework.cloud spring-cloud-build - 3.0.3-SNAPSHOT + 3.0.3 @@ -21,7 +21,7 @@ reuseReports ${project.basedir}/../target/jacoco.exec java - 3.0.3-SNAPSHOT + 3.0.3 diff --git a/spring-cloud-circuitbreaker-dependencies/pom.xml b/spring-cloud-circuitbreaker-dependencies/pom.xml index 430b6e5..ecb6179 100644 --- a/spring-cloud-circuitbreaker-dependencies/pom.xml +++ b/spring-cloud-circuitbreaker-dependencies/pom.xml @@ -7,11 +7,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.0.2 + 3.0.3 spring-cloud-circuitbreaker-dependencies - 2.0.2-SNAPSHOT + 2.0.2 pom spring-cloud-circuitbreaker-dependencies Spring Cloud Circuit Breaker Dependencies diff --git a/spring-cloud-circuitbreaker-resilience4j/pom.xml b/spring-cloud-circuitbreaker-resilience4j/pom.xml index 1996d39..dffb7a1 100644 --- a/spring-cloud-circuitbreaker-resilience4j/pom.xml +++ b/spring-cloud-circuitbreaker-resilience4j/pom.xml @@ -5,7 +5,7 @@ spring-cloud-circuitbreaker org.springframework.cloud - 2.0.2-SNAPSHOT + 2.0.2 .. 4.0.0 diff --git a/spring-cloud-circuitbreaker-spring-retry/pom.xml b/spring-cloud-circuitbreaker-spring-retry/pom.xml index e465dde..cd7236b 100644 --- a/spring-cloud-circuitbreaker-spring-retry/pom.xml +++ b/spring-cloud-circuitbreaker-spring-retry/pom.xml @@ -5,7 +5,7 @@ spring-cloud-circuitbreaker org.springframework.cloud - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/spring-cloud-starter-circuitbreaker/pom.xml b/spring-cloud-starter-circuitbreaker/pom.xml index 5bb0ec8..5fd4c81 100644 --- a/spring-cloud-starter-circuitbreaker/pom.xml +++ b/spring-cloud-starter-circuitbreaker/pom.xml @@ -5,7 +5,7 @@ spring-cloud-circuitbreaker org.springframework.cloud - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-reactor-resilience4j/pom.xml b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-reactor-resilience4j/pom.xml index 485dc99..512cba6 100644 --- a/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-reactor-resilience4j/pom.xml +++ b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-reactor-resilience4j/pom.xml @@ -5,7 +5,7 @@ spring-cloud-starter-circuitbreaker org.springframework.cloud - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 diff --git a/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-resilience4j/pom.xml b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-resilience4j/pom.xml index 3f32ee6..aac25fe 100644 --- a/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-resilience4j/pom.xml +++ b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-resilience4j/pom.xml @@ -5,7 +5,7 @@ spring-cloud-starter-circuitbreaker org.springframework.cloud - 2.0.2-SNAPSHOT + 2.0.2 4.0.0 spring-cloud-starter-circuitbreaker-resilience4j diff --git a/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-spring-retry/pom.xml b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-spring-retry/pom.xml index 7078988..72a782a 100644 --- a/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-spring-retry/pom.xml +++ b/spring-cloud-starter-circuitbreaker/spring-cloud-starter-circuitbreaker-spring-retry/pom.xml @@ -5,7 +5,7 @@ spring-cloud-starter-circuitbreaker org.springframework.cloud - 2.0.2-SNAPSHOT + 2.0.2 4.0.0