From 36d2c3cc2cf7e4e8d4f8bb2a32b19d1f82bf3b09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julio=20G=C3=B3mez=20D=C3=ADaz?= Date: Fri, 28 Aug 2020 18:21:15 +0000 Subject: [PATCH] Broaden the catched exception when the calculation of patterns could provoke a cyclic reference. Fixes gh-1679 (#1722) --- .../sleuth/instrument/web/TraceWebAutoConfiguration.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java index 5858ba405..32fa512f6 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java @@ -25,7 +25,7 @@ import java.util.stream.Collectors; 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.web.server.ConditionalOnManagementPort; import org.springframework.boot.actuate.autoconfigure.web.server.ManagementPortType; @@ -90,7 +90,7 @@ public class TraceWebAutoConfiguration { } return () -> result; } - catch (BeanCurrentlyInCreationException e) { + catch (BeanCreationException e) { // Most likely, there is an actuator endpoint that indirectly references an // instrumented HTTP client. return () -> consolidateSkipPatterns(patterns);