Ensure that service.namespace is set to same value in OtlpMetricsPropertiesConfigAdapter

Signed-off-by: Vanio Begic <[email protected]>

Author: thecooldrop

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsPropertiesConfigAdapter.java

@@ -82,6 +82,7 @@ public Map<String, String> resourceAttributes() {
 			.asMap();
 		attributes.computeIfAbsent("service.name", (key) -> getApplicationName());
 		attributes.computeIfAbsent("service.group", (key) -> getApplicationGroup());
+		attributes.computeIfAbsent("service.namespace", (key) -> getApplicationGroup());
 		return Collections.unmodifiableMap(attributes);
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/opentelemetry/OpenTelemetryAutoConfiguration.java

@@ -80,7 +80,8 @@ private Resource toResource(Environment environment, OpenTelemetryProperties pro
 			.asMap();
 		attributes.computeIfAbsent("service.name", (key) -> getApplicationName(environment));
 		attributes.computeIfAbsent("service.group", (key) -> getApplicationGroup(environment));
-		// See https://github.com/spring-projects/spring-boot/issues/44411 for potential information about deprecation of "service.group" attribute
+		// See https://github.com/spring-projects/spring-boot/issues/44411 for potential
+		// information about deprecation of "service.group" attribute
 		attributes.computeIfAbsent("service.namespace", (key) -> getApplicationGroup(environment));
 		attributes.forEach(builder::put);
 		return builder.build();

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsPropertiesConfigAdapterTests.java

@@ -163,6 +163,17 @@ void shouldUseDefaultApplicationGroupIfApplicationGroupIsNotSet() {
 		assertThat(createAdapter().resourceAttributes()).doesNotContainKey("service.group");
 	}
 
+	@Test
+	void shouldUseServiceGroupForServiceNamespaceIfServiceGroupIsSet() {
+		this.environment.setProperty("spring.application.group", "alpha");
+		assertThat(createAdapter().resourceAttributes()).containsEntry("service.namespace", "alpha");
+	}
+
+	@Test
+	void shouldNotSetServiceNamespaceIfServiceGroupIsNotSet() {
+		assertThat(createAdapter().resourceAttributes()).doesNotContainKey("service.namespace");
+	}
+
 	private OtlpMetricsPropertiesConfigAdapter createAdapter() {
 		return new OtlpMetricsPropertiesConfigAdapter(this.properties, this.openTelemetryProperties,
 				this.connectionDetails, this.environment);