From 385aedbdff34b47117bc450bc6bf6a4e9f573089 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Thu, 24 Mar 2022 11:59:48 +0100 Subject: [PATCH] Added autoconfiguration before rabbit & kafka hints; fixes gh-2134 --- .../sleuth/autoconfig/zipkin2/ZipkinAutoConfiguration.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/zipkin2/ZipkinAutoConfiguration.java b/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/zipkin2/ZipkinAutoConfiguration.java index d91765d1b..06420396f 100644 --- a/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/zipkin2/ZipkinAutoConfiguration.java +++ b/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/zipkin2/ZipkinAutoConfiguration.java @@ -79,7 +79,9 @@ import org.springframework.web.client.RestTemplate; @EnableConfigurationProperties(ZipkinProperties.class) @ConditionalOnClass({ Sender.class, EndpointLocator.class }) @ConditionalOnProperty(value = { "spring.sleuth.enabled", "spring.zipkin.enabled" }, matchIfMissing = true) -@AutoConfigureAfter(name = "org.springframework.cloud.autoconfigure.RefreshAutoConfiguration") +@AutoConfigureAfter(name = { "org.springframework.cloud.autoconfigure.RefreshAutoConfiguration", + "org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration", + "org.springframework.boot.autoconfigure.kafka.KafkaAutoConfiguration" }) @AutoConfigureBefore(BraveAutoConfiguration.class) @Import({ ZipkinSenderConfigurationImportSelector.class, ZipkinBraveConfiguration.class }) public class ZipkinAutoConfiguration {