Set application name in Otel

Author: mhalbritter

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

@@ -41,7 +41,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
-import org.springframework.util.StringUtils;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for Brave.
@@ -64,10 +63,9 @@ public class BraveAutoConfiguration {
 	public Tracing braveTracing(Environment environment, List<SpanHandler> spanHandlers,
 			List<TracingCustomizer> tracingCustomizers, CurrentTraceContext currentTraceContext,
 			Factory propagationFactory, Sampler sampler) {
-		String applicationName = environment.getProperty("spring.application.name");
+		String applicationName = environment.getProperty("spring.application.name", DEFAULT_APPLICATION_NAME);
 		Builder builder = Tracing.newBuilder().currentTraceContext(currentTraceContext)
-				.propagationFactory(propagationFactory).sampler(sampler)
-				.localServiceName(StringUtils.hasLength(applicationName) ? applicationName : DEFAULT_APPLICATION_NAME);
+				.propagationFactory(propagationFactory).sampler(sampler).localServiceName(applicationName);
 		for (SpanHandler spanHandler : spanHandlers) {
 			builder.addSpanHandler(spanHandler);
 		}

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

@@ -24,16 +24,19 @@
 import io.micrometer.tracing.otel.bridge.OtelTracer;
 import io.micrometer.tracing.otel.bridge.OtelTracer.EventPublisher;
 import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.propagation.ContextPropagators;
 import io.opentelemetry.context.propagation.TextMapPropagator;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
+import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
 import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
 import io.opentelemetry.sdk.trace.SpanProcessor;
 import io.opentelemetry.sdk.trace.export.BatchSpanProcessor;
 import io.opentelemetry.sdk.trace.export.SpanExporter;
 import io.opentelemetry.sdk.trace.samplers.Sampler;
+import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
 
 import org.springframework.boot.SpringBootVersion;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -42,6 +45,7 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
 
 /**
  * Configurations for Open Telemetry. Those are imported by
@@ -56,6 +60,12 @@ class OpenTelemetryConfigurations {
 	@EnableConfigurationProperties(TracingProperties.class)
 	static class SdkConfiguration {
 
+		/**
+		 * Default value for application name if {@code spring.application.name} is not
+		 * set.
+		 */
+		private static final String DEFAULT_APPLICATION_NAME = "application";
+
 		@Bean
 		@ConditionalOnMissingBean
 		OpenTelemetry openTelemetry(SdkTracerProvider sdkTracerProvider, ContextPropagators contextPropagators) {
@@ -65,8 +75,11 @@ OpenTelemetry openTelemetry(SdkTracerProvider sdkTracerProvider, ContextPropagat
 
 		@Bean
 		@ConditionalOnMissingBean
-		SdkTracerProvider otelSdkTracerProvider(List<SpanProcessor> spanProcessors, Sampler sampler) {
-			SdkTracerProviderBuilder builder = SdkTracerProvider.builder().setSampler(sampler);
+		SdkTracerProvider otelSdkTracerProvider(Environment environment, List<SpanProcessor> spanProcessors,
+				Sampler sampler) {
+			String applicationName = environment.getProperty("spring.application.name", DEFAULT_APPLICATION_NAME);
+			SdkTracerProviderBuilder builder = SdkTracerProvider.builder().setSampler(sampler)
+					.setResource(Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, applicationName)));
 			for (SpanProcessor spanProcessor : spanProcessors) {
 				builder.addSpanProcessor(spanProcessor);
 			}

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

@@ -41,7 +41,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
-import org.springframework.util.StringUtils;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for Wavefront.
@@ -63,10 +62,8 @@ public class WavefrontTracingAutoConfiguration {
 	@Bean
 	@ConditionalOnMissingBean
 	public ApplicationTags applicationTags(Environment environment, WavefrontProperties properties) {
-		String applicationName = environment.getProperty("spring.application.name");
-		return new ApplicationTags.Builder(
-				StringUtils.hasLength(applicationName) ? applicationName : DEFAULT_APPLICATION_NAME,
-				properties.getTracing().getServiceName()).build();
+		String applicationName = environment.getProperty("spring.application.name", DEFAULT_APPLICATION_NAME);
+		return new ApplicationTags.Builder(applicationName, properties.getTracing().getServiceName()).build();
 	}
 
 	@Configuration(proxyBeanMethods = false)