Http client zipkin order change

without this change we're registering WebClient sender only for webflux applications and we fallback to a RestTemplate sender in all the other cases

with this change we're always trying to register a WebClient sender and fallback to RestTemplate only when WebClient is not on the classpath

Author: marcingrzejszczak

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinConfigurations.java

@@ -46,8 +46,8 @@
 class ZipkinConfigurations {
 
 	@Configuration(proxyBeanMethods = false)
-	@Import({ UrlConnectionSenderConfiguration.class, RestTemplateSenderConfiguration.class,
-			WebClientSenderConfiguration.class })
+	@Import({ UrlConnectionSenderConfiguration.class, WebClientSenderConfiguration.class,
+			RestTemplateSenderConfiguration.class })
 	static class SenderConfiguration {
 
 	}
@@ -85,7 +85,7 @@ ZipkinRestTemplateSender restTemplateSender(ZipkinProperties properties,
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
+	@ConditionalOnClass(WebClient.class)
 	@EnableConfigurationProperties(ZipkinProperties.class)
 	static class WebClientSenderConfiguration {
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinConfigurationsSenderConfigurationTests.java

@@ -77,7 +77,9 @@ void shouldNotUseWebClientSenderIfNoBuilderIsAvailable() {
 	@Test
 	void shouldUseRestTemplateSenderIfUrlConnectionSenderIsNotAvailableAndWebAppIsNotReactive() {
 		this.contextRunner.withUserConfiguration(RestTemplateConfiguration.class)
-				.withClassLoader(new FilteredClassLoader("zipkin2.reporter.urlconnection")).run((context) -> {
+				.withClassLoader(
+						new FilteredClassLoader("zipkin2.reporter.urlconnection", "org.springframework.web.reactive"))
+				.run((context) -> {
 					assertThat(context).doesNotHaveBean(URLConnectionSender.class);
 					assertThat(context).hasSingleBean(Sender.class);
 					assertThat(context).hasSingleBean(ZipkinRestTemplateSender.class);