diff --git a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/circuitbreaker/CircuitBreakerIntegrationTests.java b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/circuitbreaker/CircuitBreakerIntegrationTests.java index 084745a2c..154c80cd9 100644 --- a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/circuitbreaker/CircuitBreakerIntegrationTests.java +++ b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/circuitbreaker/CircuitBreakerIntegrationTests.java @@ -118,7 +118,8 @@ public abstract class CircuitBreakerIntegrationTests { @Bean Resilience4JCircuitBreakerFactory resilience4JCircuitBreakerFactory() { - return new Resilience4JCircuitBreakerFactory(CircuitBreakerRegistry.ofDefaults(), TimeLimiterRegistry.ofDefaults(), null); + return new Resilience4JCircuitBreakerFactory(CircuitBreakerRegistry.ofDefaults(), + TimeLimiterRegistry.ofDefaults(), null); } } diff --git a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/circuitbreaker/CircuitBreakerTests.java b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/circuitbreaker/CircuitBreakerTests.java index 41ccc9e58..2671d85b4 100644 --- a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/circuitbreaker/CircuitBreakerTests.java +++ b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/circuitbreaker/CircuitBreakerTests.java @@ -40,8 +40,9 @@ public abstract class CircuitBreakerTests implements TestTracingAwareSupplier { try { scopedSpan = tracer.startScopedSpan("start"); // when - Span span = new Resilience4JCircuitBreakerFactory(CircuitBreakerRegistry.ofDefaults(), TimeLimiterRegistry.ofDefaults(), null).create("name") - .run(new TraceSupplier<>(tracerTest().tracing().tracer(), tracer::currentSpan)); + Span span = new Resilience4JCircuitBreakerFactory(CircuitBreakerRegistry.ofDefaults(), + TimeLimiterRegistry.ofDefaults(), null).create("name") + .run(new TraceSupplier<>(tracerTest().tracing().tracer(), tracer::currentSpan)); BDDAssertions.then(span).isNotNull(); BDDAssertions.then(scopedSpan.context().traceId()).isEqualTo(span.context().traceId()); @@ -61,14 +62,16 @@ public abstract class CircuitBreakerTests implements TestTracingAwareSupplier { try { scopedSpan = tracer.startScopedSpan("start"); // when - BDDAssertions.thenThrownBy(() -> new Resilience4JCircuitBreakerFactory(CircuitBreakerRegistry.ofDefaults(), TimeLimiterRegistry.ofDefaults(), null).create("name") - .run(new TraceSupplier<>(tracerTest().tracing().tracer(), () -> { - first.set(tracer.currentSpan()); - throw new IllegalStateException("boom"); - }), new TraceFunction<>(tracerTest().tracing().tracer(), throwable -> { - second.set(tracer.currentSpan()); - throw new IllegalStateException("boom2"); - }))).isInstanceOf(IllegalStateException.class).hasMessageContaining("boom2"); + BDDAssertions.thenThrownBy(() -> new Resilience4JCircuitBreakerFactory(CircuitBreakerRegistry.ofDefaults(), + TimeLimiterRegistry.ofDefaults(), null).create("name") + .run(new TraceSupplier<>(tracerTest().tracing().tracer(), () -> { + first.set(tracer.currentSpan()); + throw new IllegalStateException("boom"); + }), new TraceFunction<>(tracerTest().tracing().tracer(), throwable -> { + second.set(tracer.currentSpan()); + throw new IllegalStateException("boom2"); + }))) + .isInstanceOf(IllegalStateException.class).hasMessageContaining("boom2"); BDDAssertions.then(tracerTest().handler().reportedSpans()).hasSize(2); BDDAssertions.then(first.get()).isNotNull();