Merge branch '2.1.x'

spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRestTemplateSenderConfiguration.java

@@ -91,7 +91,7 @@ class ZipkinRestTemplateSenderConfiguration {
 	static class DiscoveryClientZipkinUrlExtractorConfiguration {
 
 		@Configuration
-		@ConditionalOnProperty(value = "spring.zipkin.discoveryClientEnabled",
+		@ConditionalOnProperty(value = "spring.zipkin.discovery-client-enabled",
 				havingValue = "true", matchIfMissing = true)
 		static class ZipkinClientLoadBalancedConfiguration {
 
@@ -109,7 +109,7 @@ class ZipkinRestTemplateSenderConfiguration {
 		}
 
 		@Configuration
-		@ConditionalOnProperty(value = "spring.zipkin.discoveryClientEnabled",
+		@ConditionalOnProperty(value = "spring.zipkin.discovery-client-enabled",
 				havingValue = "false")
 		static class ZipkinClientNoOpConfiguration {
 

spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRestTemplateSenderConfigurationTest.java

@@ -0,0 +1,99 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.sleuth.zipkin2.sender;
+
+import org.junit.Test;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
+import org.springframework.cloud.sleuth.zipkin2.ZipkinLoadBalancer;
+import org.springframework.cloud.sleuth.zipkin2.ZipkinProperties;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author liaochuntao
+ */
+public class ZipkinRestTemplateSenderConfigurationTest {
+
+	@Test
+	public void disableZipkinDiscoveryClient() {
+		ConfigurableApplicationContext ctxt = new SpringApplication(
+				ZipkinRestTemplateSenderConfigurationTest.MyDiscoveryClientZipkinUrlExtractorConfiguration.class,
+				ZipkinProperties.class)
+						.run("--spring.zipkin.discovery-client-enabled=false");
+		assertThat(ctxt.getBean(ZipkinLoadBalancer.class))
+				.isInstanceOf(NoOpZipkinLoadBalancer.class);
+		ctxt.close();
+	}
+
+	@Test
+	public void enableZipkinDiscoveryClient() {
+		ConfigurableApplicationContext ctxt = new SpringApplication(
+				ZipkinRestTemplateSenderConfigurationTest.MyDiscoveryClientZipkinUrlExtractorConfiguration.class,
+				ZipkinProperties.class)
+						.run("--spring.zipkin.discovery-client-enabled=true");
+		assertThat(ctxt.getBean(ZipkinLoadBalancer.class))
+				.isInstanceOf(LoadBalancerClientZipkinLoadBalancer.class);
+		ctxt.close();
+	}
+
+	@Configuration
+	@ConditionalOnClass(LoadBalancerClient.class)
+	static class MyDiscoveryClientZipkinUrlExtractorConfiguration {
+
+		@Configuration
+		@ConditionalOnProperty(value = "spring.zipkin.discovery-client-enabled",
+				havingValue = "true", matchIfMissing = true)
+		static class ZipkinClientLoadBalancedConfiguration {
+
+			@Autowired(required = false)
+			LoadBalancerClient client;
+
+			@Bean
+			@ConditionalOnMissingBean
+			ZipkinLoadBalancer loadBalancerClientZipkinLoadBalancer(
+					ZipkinProperties zipkinProperties) {
+				return new LoadBalancerClientZipkinLoadBalancer(this.client,
+						zipkinProperties);
+			}
+
+		}
+
+		@Configuration
+		@ConditionalOnProperty(value = "spring.zipkin.discovery-client-enabled",
+				havingValue = "false")
+		static class ZipkinClientNoOpConfiguration {
+
+			@Bean
+			@ConditionalOnMissingBean
+			ZipkinLoadBalancer noOpLoadBalancer(final ZipkinProperties zipkinProperties) {
+				return new NoOpZipkinLoadBalancer(zipkinProperties);
+			}
+
+		}
+
+	}
+
+}