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

Broaden the catched exception when the calculation of patterns could provoke a cyclic reference. Fixes gh-1679 (#1722)

Browse Source
This commit is contained in:
Julio Gómez Díaz
2020-08-28 18:21:15 +00:00
committed by GitHub
parent 4830ef383e
commit 36d2c3cc2c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java
View File

@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
import brave.Tracing; import brave.Tracing;
import org.springframework.beans.factory.BeanCurrentlyInCreationException; import org.springframework.beans.factory.BeanCreationException;
import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties; import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties;
import org.springframework.boot.actuate.autoconfigure.web.server.ConditionalOnManagementPort; import org.springframework.boot.actuate.autoconfigure.web.server.ConditionalOnManagementPort;
import org.springframework.boot.actuate.autoconfigure.web.server.ManagementPortType; import org.springframework.boot.actuate.autoconfigure.web.server.ManagementPortType;
@@ -90,7 +90,7 @@ public class TraceWebAutoConfiguration {
} }
return () -> result; return () -> result;
} }
catch (BeanCurrentlyInCreationException e) { catch (BeanCreationException e) {
// Most likely, there is an actuator endpoint that indirectly references an // Most likely, there is an actuator endpoint that indirectly references an
// instrumented HTTP client. // instrumented HTTP client.
return () -> consolidateSkipPatterns(patterns); return () -> consolidateSkipPatterns(patterns);