Allow to set Wavefront service name

Both the application and the service name default to 'spring.application.name'

Author: mhalbritter

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

@@ -32,6 +32,7 @@
 import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.wavefront.WavefrontAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.wavefront.WavefrontProperties;
+import org.springframework.boot.actuate.autoconfigure.wavefront.WavefrontProperties.Tracing;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -62,8 +63,12 @@ public class WavefrontTracingAutoConfiguration {
 	@Bean
 	@ConditionalOnMissingBean
 	public ApplicationTags applicationTags(Environment environment, WavefrontProperties properties) {
-		String applicationName = environment.getProperty("spring.application.name", DEFAULT_APPLICATION_NAME);
-		return new ApplicationTags.Builder(applicationName, properties.getTracing().getServiceName()).build();
+		String springApplicationName = environment.getProperty("spring.application.name", DEFAULT_APPLICATION_NAME);
+		Tracing tracing = properties.getTracing();
+		String applicationName = tracing.getApplicationName() != null ? tracing.getApplicationName()
+				: springApplicationName;
+		String serviceName = tracing.getServiceName() != null ? tracing.getServiceName() : springApplicationName;
+		return new ApplicationTags.Builder(applicationName, serviceName).build();
 	}
 
 	@Configuration(proxyBeanMethods = false)

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/wavefront/WavefrontProperties.java

@@ -66,31 +66,55 @@ public class WavefrontProperties {
 	 */
 	private final Tracing tracing = new Tracing();
 
-	/**
-	 * Returns the effective URI of the wavefront instance. This will not be the same URI
-	 * given through {@link #setUri(URI)} when a proxy is used.
-	 * @return the effective URI of the wavefront instance
-	 */
-	public URI getEffectiveUri() {
-		if (usesProxy()) {
-			// See io.micrometer.wavefront.WavefrontMeterRegistry.getWavefrontReportingUri
-			return URI.create(this.uri.toString().replace("proxy://", "http://"));
-		}
+	public Sender getSender() {
+		return this.sender;
+	}
+
+	public Metrics getMetrics() {
+		return this.metrics;
+	}
+
+	public Tracing getTracing() {
+		return this.tracing;
+	}
+
+	public URI getUri() {
 		return this.uri;
 	}
 
 	public void setUri(URI uri) {
 		this.uri = uri;
 	}
 
+	public String getSource() {
+		return this.source;
+	}
+
 	public void setSource(String source) {
 		this.source = source;
 	}
 
+	public String getApiToken() {
+		return this.apiToken;
+	}
+
 	public void setApiToken(String apiToken) {
 		this.apiToken = apiToken;
 	}
 
+	/**
+	 * Returns the effective URI of the wavefront instance. This will not be the same URI
+	 * given through {@link #setUri(URI)} when a proxy is used.
+	 * @return the effective URI of the wavefront instance
+	 */
+	public URI getEffectiveUri() {
+		if (usesProxy()) {
+			// See io.micrometer.wavefront.WavefrontMeterRegistry.getWavefrontReportingUri
+			return URI.create(this.uri.toString().replace("proxy://", "http://"));
+		}
+		return this.uri;
+	}
+
 	/**
 	 * Returns the API token or throws an exception if the API token is mandatory. If a
 	 * proxy is used, the API token is optional.
@@ -104,14 +128,6 @@ public String getApiTokenOrThrow() {
 		return this.apiToken;
 	}
 
-	public Sender getSender() {
-		return this.sender;
-	}
-
-	public Metrics getMetrics() {
-		return this.metrics;
-	}
-
 	public String getSourceOrDefault() {
 		if (this.source != null) {
 			return this.source;
@@ -132,10 +148,6 @@ private boolean usesProxy() {
 		return "proxy".equals(this.uri.getScheme());
 	}
 
-	public Tracing getTracing() {
-		return this.tracing;
-	}
-
 	public static class Sender {
 
 		/**
@@ -252,7 +264,12 @@ public void setBatchSize(Integer batchSize) {
 	public static class Tracing {
 
 		/**
-		 * Service name.
+		 * Application name. Defaults to 'spring.application.name'.
+		 */
+		private String applicationName;
+
+		/**
+		 * Service name. Defaults to 'spring.application.name'.
 		 */
 		private String serviceName;
 
@@ -264,6 +281,14 @@ public void setServiceName(String serviceName) {
 			this.serviceName = serviceName;
 		}
 
+		public String getApplicationName() {
+			return this.applicationName;
+		}
+
+		public void setApplicationName(String applicationName) {
+			this.applicationName = applicationName;
+		}
+
 	}
 
 }