tracerProvider,
@Bean
@ConditionalOnMissingBean
Resource openTelemetryResource(Environment environment, OpenTelemetryProperties properties) {
- String applicationName = environment.getProperty("spring.application.name", DEFAULT_APPLICATION_NAME);
- String applicationGroup = environment.getProperty("spring.application.group");
- Resource resource = Resource.getDefault()
- .merge(Resource.create(Attributes.of(ATTRIBUTE_KEY_SERVICE_NAME, applicationName)));
- if (StringUtils.hasLength(applicationGroup)) {
- resource = resource.merge(Resource.create(Attributes.of(ATTRIBUTE_KEY_SERVICE_GROUP, applicationGroup)));
- }
- return resource.merge(toResource(properties));
+ Resource resource = Resource.getDefault();
+ return resource.merge(toResource(environment, properties));
}
- private static Resource toResource(OpenTelemetryProperties properties) {
+ private Resource toResource(Environment environment, OpenTelemetryProperties properties) {
ResourceBuilder builder = Resource.builder();
- properties.getResourceAttributes().forEach(builder::put);
+ new OpenTelemetryResourceAttributes(environment, properties.getResourceAttributes()).applyTo(builder::put);
return builder.build();
}
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/opentelemetry/OpenTelemetryProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/opentelemetry/OpenTelemetryProperties.java
index 4c973ecf578b..bc3589af4769 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/opentelemetry/OpenTelemetryProperties.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/opentelemetry/OpenTelemetryProperties.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 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.
@@ -27,7 +27,7 @@
* @author Moritz Halbritter
* @since 3.2.0
*/
-@ConfigurationProperties(prefix = "management.opentelemetry")
+@ConfigurationProperties("management.opentelemetry")
public class OpenTelemetryProperties {
/**
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/opentelemetry/OpenTelemetryResourceAttributes.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/opentelemetry/OpenTelemetryResourceAttributes.java
new file mode 100644
index 000000000000..0acdf0fa0c3b
--- /dev/null
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/opentelemetry/OpenTelemetryResourceAttributes.java
@@ -0,0 +1,195 @@
+/*
+ * Copyright 2012-2025 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.opentelemetry;
+
+import java.io.ByteArrayOutputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+
+import org.springframework.core.env.Environment;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+/**
+ * {@link OpenTelemetryResourceAttributes} retrieves information from the
+ * {@code OTEL_RESOURCE_ATTRIBUTES} and {@code OTEL_SERVICE_NAME} environment variables
+ * and merges it with the resource attributes provided by the user. User-provided resource
+ * attributes take precedence. Additionally, {@code spring.application.*} related
+ * properties can be applied as defaults.
+ *
+ * OpenTelemetry
+ * Resource Specification
+ *
+ * @author Dmytro Nosan
+ * @since 3.5.0
+ */
+public final class OpenTelemetryResourceAttributes {
+
+ /**
+ * Default value for service name if {@code service.name} is not set.
+ */
+ private static final String DEFAULT_SERVICE_NAME = "unknown_service";
+
+ private final Environment environment;
+
+ private final Map resourceAttributes;
+
+ private final Function getEnv;
+
+ /**
+ * Creates a new instance of {@link OpenTelemetryResourceAttributes}.
+ * @param environment the environment
+ * @param resourceAttributes user-provided resource attributes to be used
+ */
+ public OpenTelemetryResourceAttributes(Environment environment, Map resourceAttributes) {
+ this(environment, resourceAttributes, null);
+ }
+
+ /**
+ * Creates a new {@link OpenTelemetryResourceAttributes} instance.
+ * @param environment the environment
+ * @param resourceAttributes user-provided resource attributes to be used
+ * @param getEnv a function to retrieve environment variables by name
+ */
+ OpenTelemetryResourceAttributes(Environment environment, Map resourceAttributes,
+ Function