Merge branch '1.3.x'

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

@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
 import org.springframework.cloud.sleuth.zipkin2.ZipkinLoadBalancer;
 import org.springframework.cloud.sleuth.zipkin2.ZipkinProperties;
@@ -26,6 +27,7 @@ import zipkin2.reporter.Sender;
 @Configuration
 @ConditionalOnMissingBean(Sender.class)
 @Conditional(ZipkinSenderCondition.class)
+@EnableConfigurationProperties(ZipkinSenderProperties.class)
 class ZipkinRestTemplateSenderConfiguration {
 	@Autowired ZipkinUrlExtractor extractor;
 

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

@@ -0,0 +1,30 @@
+package org.springframework.cloud.sleuth.zipkin2.sender;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Properties for Zipkin sender
+ *
+ * @author Marcin Grzejszczak
+ * @since 1.3.1
+ */
+@ConfigurationProperties("spring.zipkin.sender")
+public class ZipkinSenderProperties {
+
+	/**
+	 * Means of sending spans to Zipkin
+	 */
+	private SenderType type;
+
+	public SenderType getType() {
+		return this.type;
+	}
+
+	public void setType(SenderType type) {
+		this.type = type;
+	}
+
+	public enum SenderType {
+		RABBIT, KAFKA, WEB
+	}
+}