SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Marcin Grzejszczak
2022-12-13 19:04:22 +01:00
parent dcfd714ee6
commit e953f2fa48
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/circuitbreaker/CircuitBreakerIntegrationTests.java
View File

@@ -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);
}
}

23
tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/circuitbreaker/CircuitBreakerTests.java
View File

@@ -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();