From 614b06fbf38b0f6def8629735f38be2f93a75126 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 3 Nov 2022 15:30:01 +0000 Subject: [PATCH 1/4] Update SNAPSHOT to 2.1.5 --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-circuitbreaker-dependencies/pom.xml | 4 ++-- spring-cloud-circuitbreaker-resilience4j/pom.xml | 2 +- spring-cloud-circuitbreaker-spring-retry/pom.xml | 2 +- spring-cloud-starter-circuitbreaker/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 5445518e..4254a755 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ spring-cloud-circuitbreaker org.springframework.cloud - 2.1.5-SNAPSHOT + 2.1.5 4.0.0 diff --git a/pom.xml b/pom.xml index a14a602d..17a06370 100644 --- a/pom.xml +++ b/pom.xml @@ -6,12 +6,12 @@ spring-cloud-circuitbreaker pom - 2.1.5-SNAPSHOT + 2.1.5 org.springframework.cloud spring-cloud-build - 3.1.5-SNAPSHOT + 3.1.5 @@ -21,7 +21,7 @@ reuseReports ${project.basedir}/../target/jacoco.exec java - 3.1.5-SNAPSHOT + 3.1.5 diff --git a/spring-cloud-circuitbreaker-dependencies/pom.xml b/spring-cloud-circuitbreaker-dependencies/pom.xml index 8518f719..a491da12 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.1.5-SNAPSHOT + 3.1.5 spring-cloud-circuitbreaker-dependencies - 2.1.5-SNAPSHOT + 2.1.5 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 a68f5ceb..d554b5e0 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.1.5-SNAPSHOT + 2.1.5 .. 4.0.0 diff --git a/spring-cloud-circuitbreaker-spring-retry/pom.xml b/spring-cloud-circuitbreaker-spring-retry/pom.xml index 134392ad..d5c9f6b4 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.1.5-SNAPSHOT + 2.1.5 4.0.0 diff --git a/spring-cloud-starter-circuitbreaker/pom.xml b/spring-cloud-starter-circuitbreaker/pom.xml index 9a6c034d..3161eef1 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.1.5-SNAPSHOT + 2.1.5 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 40f92623..49876db2 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.1.5-SNAPSHOT + 2.1.5 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 c2d46a76..1f74bd25 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.1.5-SNAPSHOT + 2.1.5 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 df6f8aa4..53b09914 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.1.5-SNAPSHOT + 2.1.5 4.0.0 From 7ad323079fdb7c0df1179832605f04937942c6b0 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 3 Nov 2022 15:31:20 +0000 Subject: [PATCH 2/4] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-circuitbreaker-dependencies/pom.xml | 4 ++-- spring-cloud-circuitbreaker-resilience4j/pom.xml | 2 +- spring-cloud-circuitbreaker-spring-retry/pom.xml | 2 +- spring-cloud-starter-circuitbreaker/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 4254a755..5445518e 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ spring-cloud-circuitbreaker org.springframework.cloud - 2.1.5 + 2.1.5-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 17a06370..a14a602d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,12 +6,12 @@ spring-cloud-circuitbreaker pom - 2.1.5 + 2.1.5-SNAPSHOT org.springframework.cloud spring-cloud-build - 3.1.5 + 3.1.5-SNAPSHOT @@ -21,7 +21,7 @@ reuseReports ${project.basedir}/../target/jacoco.exec java - 3.1.5 + 3.1.5-SNAPSHOT diff --git a/spring-cloud-circuitbreaker-dependencies/pom.xml b/spring-cloud-circuitbreaker-dependencies/pom.xml index a491da12..8518f719 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.1.5 + 3.1.5-SNAPSHOT spring-cloud-circuitbreaker-dependencies - 2.1.5 + 2.1.5-SNAPSHOT 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 d554b5e0..a68f5ceb 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.1.5 + 2.1.5-SNAPSHOT .. 4.0.0 diff --git a/spring-cloud-circuitbreaker-spring-retry/pom.xml b/spring-cloud-circuitbreaker-spring-retry/pom.xml index d5c9f6b4..134392ad 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.1.5 + 2.1.5-SNAPSHOT 4.0.0 diff --git a/spring-cloud-starter-circuitbreaker/pom.xml b/spring-cloud-starter-circuitbreaker/pom.xml index 3161eef1..9a6c034d 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.1.5 + 2.1.5-SNAPSHOT 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 49876db2..40f92623 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.1.5 + 2.1.5-SNAPSHOT 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 1f74bd25..c2d46a76 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.1.5 + 2.1.5-SNAPSHOT 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 53b09914..df6f8aa4 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.1.5 + 2.1.5-SNAPSHOT 4.0.0 From 0720de430816df3755ea519f0833519a2526599f Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 3 Nov 2022 15:31:21 +0000 Subject: [PATCH 3/4] Bumping versions to 2.1.6-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-circuitbreaker-dependencies/pom.xml | 4 ++-- spring-cloud-circuitbreaker-resilience4j/pom.xml | 2 +- spring-cloud-circuitbreaker-spring-retry/pom.xml | 2 +- spring-cloud-starter-circuitbreaker/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 5445518e..d6808f0c 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ spring-cloud-circuitbreaker org.springframework.cloud - 2.1.5-SNAPSHOT + 2.1.6-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index a14a602d..d94f3c77 100644 --- a/pom.xml +++ b/pom.xml @@ -6,12 +6,12 @@ spring-cloud-circuitbreaker pom - 2.1.5-SNAPSHOT + 2.1.6-SNAPSHOT org.springframework.cloud spring-cloud-build - 3.1.5-SNAPSHOT + 3.1.6-SNAPSHOT @@ -21,7 +21,7 @@ reuseReports ${project.basedir}/../target/jacoco.exec java - 3.1.5-SNAPSHOT + 3.1.6-SNAPSHOT diff --git a/spring-cloud-circuitbreaker-dependencies/pom.xml b/spring-cloud-circuitbreaker-dependencies/pom.xml index 8518f719..7c0f9c90 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.1.5-SNAPSHOT + 3.1.6-SNAPSHOT spring-cloud-circuitbreaker-dependencies - 2.1.5-SNAPSHOT + 2.1.6-SNAPSHOT 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 a68f5ceb..351008b1 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.1.5-SNAPSHOT + 2.1.6-SNAPSHOT .. 4.0.0 diff --git a/spring-cloud-circuitbreaker-spring-retry/pom.xml b/spring-cloud-circuitbreaker-spring-retry/pom.xml index 134392ad..439327f1 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.1.5-SNAPSHOT + 2.1.6-SNAPSHOT 4.0.0 diff --git a/spring-cloud-starter-circuitbreaker/pom.xml b/spring-cloud-starter-circuitbreaker/pom.xml index 9a6c034d..08b2b374 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.1.5-SNAPSHOT + 2.1.6-SNAPSHOT 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 40f92623..d92a667e 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.1.5-SNAPSHOT + 2.1.6-SNAPSHOT 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 c2d46a76..4e1a0d43 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.1.5-SNAPSHOT + 2.1.6-SNAPSHOT 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 df6f8aa4..3ad8ac63 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.1.5-SNAPSHOT + 2.1.6-SNAPSHOT 4.0.0 From 3417cc79180cd51c07480b9146137b165a19fa76 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Sun, 19 Feb 2023 20:20:42 -0500 Subject: [PATCH 4/4] Document How To Customize The ExecutorService. Fixes #161 --- README.adoc | 19 +++++++++++++++++++ ...ing-cloud-circuitbreaker-resilience4j.adoc | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/README.adoc b/README.adoc index b9d2abb5..ed8b9948 100644 --- a/README.adoc +++ b/README.adoc @@ -94,6 +94,25 @@ public Customizer defaultCustomizer() ---- ==== +===== Customizing The ExecutorService +If you would like to configure the `ExecutorService` which executes the circuit breaker you can do so using the `Resilience4JCircuitBreakerFactor`. + +For example if you would like to use a context aware `ExecutorService` you could do the following. + +==== +[source,java] +---- +@Bean +public Customizer defaultCustomizer() { + return factory -> { + ContextAwareScheduledThreadPoolExecutor executor = ContextAwareScheduledThreadPoolExecutor.newScheduledThreadPool().corePoolSize(5) + .build(); + factory.configureExecutorService(executor); + }; +} +---- +==== + ==== Specific Circuit Breaker Configuration Similarly to providing a default configuration, you can create a `Customize` bean this is passed a diff --git a/docs/src/main/asciidoc/spring-cloud-circuitbreaker-resilience4j.adoc b/docs/src/main/asciidoc/spring-cloud-circuitbreaker-resilience4j.adoc index 15e6914a..5499a35a 100644 --- a/docs/src/main/asciidoc/spring-cloud-circuitbreaker-resilience4j.adoc +++ b/docs/src/main/asciidoc/spring-cloud-circuitbreaker-resilience4j.adoc @@ -44,6 +44,25 @@ public Customizer defaultCustomizer() ---- ==== +===== Customizing The ExecutorService +If you would like to configure the `ExecutorService` which executes the circuit breaker you can do so using the `Resilience4JCircuitBreakerFactor`. + +For example if you would like to use a context aware `ExecutorService` you could do the following. + +==== +[source,java] +---- +@Bean +public Customizer defaultCustomizer() { + return factory -> { + ContextAwareScheduledThreadPoolExecutor executor = ContextAwareScheduledThreadPoolExecutor.newScheduledThreadPool().corePoolSize(5) + .build(); + factory.configureExecutorService(executor); + }; +} +---- +==== + ==== Specific Circuit Breaker Configuration Similarly to providing a default configuration, you can create a `Customize` bean this is passed a