From ad1b62b5605dbfb91d85c1fd42c436a2ca0854e6 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 23 Mar 2016 22:32:22 +0100 Subject: [PATCH] One more fix for TraceWebSocketAutoConfig --- .../messaging/websocket/TraceWebSocketAutoConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/websocket/TraceWebSocketAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/websocket/TraceWebSocketAutoConfiguration.java index 0ee075639..40bcc504b 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/websocket/TraceWebSocketAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/websocket/TraceWebSocketAutoConfiguration.java @@ -33,7 +33,7 @@ import org.springframework.web.socket.config.annotation.StompEndpointRegistry; @Configuration @AutoConfigureAfter(TraceSpanMessagingAutoConfiguration.class) @ConditionalOnClass(DelegatingWebSocketMessageBrokerConfiguration.class) -@ConditionalOnBean({ AbstractWebSocketMessageBrokerConfigurer.class, Tracer.class} ) +@ConditionalOnBean(Tracer.class) @ConditionalOnProperty(value = "spring.sleuth.integration.websockets.enabled", matchIfMissing = true) public class TraceWebSocketAutoConfiguration extends AbstractWebSocketMessageBrokerConfigurer {