Refactor zipkin properties in separate class

See spring-projectsgh-30156

Author: mhalbritter

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

@@ -27,41 +27,15 @@
 @ConfigurationProperties("management.tracing")
 public class TracingProperties {
 
-	/**
-	 * Zipkin configuration.
-	 */
-	private final Zipkin zipkin = new Zipkin();
-
 	/**
 	 * Sampling configuration.
 	 */
 	private final Sampling sampling = new Sampling();
 
-	public Zipkin getZipkin() {
-		return this.zipkin;
-	}
-
 	public Sampling getSampling() {
 		return this.sampling;
 	}
 
-	public static class Zipkin {
-
-		/**
-		 * URL to the Zipkin API.
-		 */
-		private String endpoint = "http://localhost:9411/api/v2/spans";
-
-		public String getEndpoint() {
-			return this.endpoint;
-		}
-
-		public void setEndpoint(String endpoint) {
-			this.endpoint = endpoint;
-		}
-
-	}
-
 	public static class Sampling {
 
 		/**

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

@@ -27,7 +27,6 @@
 import zipkin2.reporter.brave.ZipkinSpanHandler;
 import zipkin2.reporter.urlconnection.URLConnectionSender;
 
-import org.springframework.boot.actuate.autoconfigure.tracing.TracingProperties;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -50,22 +49,23 @@
 public class ZipkinAutoConfiguration {
 
 	@Configuration(proxyBeanMethods = false)
-	@EnableConfigurationProperties(TracingProperties.class)
+	@EnableConfigurationProperties(ZipkinProperties.class)
 	static class SenderConfiguration {
 
 		@Bean
 		@ConditionalOnMissingBean
 		@ConditionalOnClass(URLConnectionSender.class)
-		public Sender urlConnectionSender(TracingProperties properties) {
-			return URLConnectionSender.newBuilder().endpoint(properties.getZipkin().getEndpoint()).build();
+		public Sender urlConnectionSender(ZipkinProperties properties) {
+			return URLConnectionSender.newBuilder().endpoint(properties.getEndpoint()).build();
 		}
 
 		@Bean
 		@ConditionalOnMissingBean
 		@ConditionalOnClass(RestTemplate.class)
-		public Sender restTemplateSender(TracingProperties properties) {
-			return new ZipkinRestTemplateSender(properties.getZipkin().getEndpoint(), new RestTemplate());
+		public Sender restTemplateSender(ZipkinProperties properties) {
+			return new ZipkinRestTemplateSender(properties.getEndpoint(), new RestTemplate());
 		}
+
 	}
 
 	@Configuration(proxyBeanMethods = false)

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

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2012-2022 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.boot.actuate.autoconfigure.tracing.zipkin;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Configuration properties for {@link ZipkinAutoConfiguration}.
+ *
+ * @author Moritz Halbritter
+ * @since 3.0.0
+ */
+@ConfigurationProperties("management.tracing.zipkin")
+public class ZipkinProperties {
+
+	/**
+	 * URL to the Zipkin API.
+	 */
+	private String endpoint = "http://localhost:9411/api/v2/spans";
+
+	public String getEndpoint() {
+		return this.endpoint;
+	}
+
+	public void setEndpoint(String endpoint) {
+		this.endpoint = endpoint;
+	}
+
+}