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

Moving away from deprecated code

Browse Source
This commit is contained in:
Marcin Grzejszczak
2022-09-15 14:20:49 +02:00
parent 12d0220d25
commit a57f0501fb
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,8 @@ package org.springframework.cloud.sleuth.instrument.circuitbreaker;
import java.util.concurrent.atomic.AtomicReference;
import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry;
import io.github.resilience4j.timelimiter.TimeLimiterRegistry;
import org.assertj.core.api.BDDAssertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -116,7 +118,7 @@ public abstract class CircuitBreakerIntegrationTests {
@Bean
Resilience4JCircuitBreakerFactory resilience4JCircuitBreakerFactory() {
return new Resilience4JCircuitBreakerFactory();
return new Resilience4JCircuitBreakerFactory(CircuitBreakerRegistry.ofDefaults(), TimeLimiterRegistry.ofDefaults(), null);
}
}

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

@@ -18,6 +18,8 @@ package org.springframework.cloud.sleuth.instrument.circuitbreaker;
import java.util.concurrent.atomic.AtomicReference;
import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry;
import io.github.resilience4j.timelimiter.TimeLimiterRegistry;
import org.assertj.core.api.BDDAssertions;
import org.junit.jupiter.api.Test;
@@ -38,7 +40,7 @@ public abstract class CircuitBreakerTests implements TestTracingAwareSupplier {
try {
scopedSpan = tracer.startScopedSpan("start");
// when
Span span = new Resilience4JCircuitBreakerFactory().create("name")
Span span = new Resilience4JCircuitBreakerFactory(CircuitBreakerRegistry.ofDefaults(), TimeLimiterRegistry.ofDefaults(), null).create("name")
.run(new TraceSupplier<>(tracerTest().tracing().tracer(), tracer::currentSpan));
BDDAssertions.then(span).isNotNull();
@@ -59,7 +61,7 @@ public abstract class CircuitBreakerTests implements TestTracingAwareSupplier {
try {
scopedSpan = tracer.startScopedSpan("start");
// when
BDDAssertions.thenThrownBy(() -> new Resilience4JCircuitBreakerFactory().create("name")
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");