Polish "Auto-configure Micrometer or OTEL semantic conventions"

See spring-projectsgh-49241

Author: wilkinsona

module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/autoconfigure/SemanticConventionAutoConfiguration.java

@@ -19,6 +19,7 @@
 import java.util.Collections;
 
 import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Tags;
 import io.micrometer.core.instrument.binder.MeterBinder;
 import io.micrometer.core.instrument.binder.jvm.ClassLoaderMetrics;
 import io.micrometer.core.instrument.binder.jvm.JvmCompilationMetrics;
@@ -30,6 +31,12 @@
 import io.micrometer.core.instrument.binder.jvm.convention.JvmClassLoadingMeterConventions;
 import io.micrometer.core.instrument.binder.jvm.convention.JvmMemoryMeterConventions;
 import io.micrometer.core.instrument.binder.jvm.convention.JvmThreadMeterConventions;
+import io.micrometer.core.instrument.binder.jvm.convention.micrometer.MicrometerJvmClassLoadingMeterConventions;
+import io.micrometer.core.instrument.binder.jvm.convention.micrometer.MicrometerJvmMemoryMeterConventions;
+import io.micrometer.core.instrument.binder.jvm.convention.micrometer.MicrometerJvmThreadMeterConventions;
+import io.micrometer.core.instrument.binder.jvm.convention.otel.OpenTelemetryJvmClassLoadingMeterConventions;
+import io.micrometer.core.instrument.binder.jvm.convention.otel.OpenTelemetryJvmMemoryMeterConventions;
+import io.micrometer.core.instrument.binder.jvm.convention.otel.OpenTelemetryJvmThreadMeterConventions;
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.aot.hint.MemberCategory;
@@ -44,6 +51,8 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.micrometer.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration;
 import org.springframework.boot.micrometer.metrics.autoconfigure.MetricsAutoConfiguration;
+import org.springframework.boot.micrometer.observation.autoconfigure.condition.ConditionalOnSemanticConventions;
+import org.springframework.boot.micrometer.observation.autoconfigure.condition.SemanticConventions;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportRuntimeHints;
@@ -111,6 +120,54 @@ JvmCompilationMetrics jvmCompilationMetrics() {
 		return new JvmCompilationMetrics();
 	}
 
+	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnSemanticConventions(SemanticConventions.MICROMETER)
+	static class MicrometerJvmConventionsConfiguration {
+
+		@Bean
+		@ConditionalOnMissingBean(JvmMemoryMeterConventions.class)
+		MicrometerJvmMemoryMeterConventions micrometerJvmMemoryMeterConventions() {
+			return new MicrometerJvmMemoryMeterConventions();
+		}
+
+		@Bean
+		@ConditionalOnMissingBean(JvmClassLoadingMeterConventions.class)
+		MicrometerJvmClassLoadingMeterConventions micrometerJvmClassLoadingMeterConventions() {
+			return new MicrometerJvmClassLoadingMeterConventions();
+		}
+
+		@Bean
+		@ConditionalOnMissingBean(JvmThreadMeterConventions.class)
+		MicrometerJvmThreadMeterConventions micrometerJvmThreadMeterConventions() {
+			return new MicrometerJvmThreadMeterConventions(Tags.empty());
+		}
+
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnSemanticConventions(SemanticConventions.OPEN_TELEMETRY)
+	static class OpenTelemetryJvmConventionsConfiguration {
+
+		@Bean
+		@ConditionalOnMissingBean(JvmMemoryMeterConventions.class)
+		OpenTelemetryJvmMemoryMeterConventions openTelemetryJvmMemoryMeterConventions() {
+			return new OpenTelemetryJvmMemoryMeterConventions(Tags.empty());
+		}
+
+		@Bean
+		@ConditionalOnMissingBean(JvmClassLoadingMeterConventions.class)
+		OpenTelemetryJvmClassLoadingMeterConventions openTelemetryJvmClassLoadingMeterConventions() {
+			return new OpenTelemetryJvmClassLoadingMeterConventions();
+		}
+
+		@Bean
+		@ConditionalOnMissingBean(JvmThreadMeterConventions.class)
+		OpenTelemetryJvmThreadMeterConventions openTelemetryJvmThreadMeterConventions() {
+			return new OpenTelemetryJvmThreadMeterConventions(Tags.empty());
+		}
+
+	}
+
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(name = VIRTUAL_THREAD_METRICS_CLASS)
 	static class VirtualThreadMetricsConfiguration {

module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/autoconfigure/jvm/JvmMetricsAutoConfiguration.java

@@ -23,6 +23,8 @@
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tags;
 import io.micrometer.core.instrument.binder.jvm.convention.JvmCpuMeterConventions;
+import io.micrometer.core.instrument.binder.jvm.convention.micrometer.MicrometerJvmCpuMeterConventions;
+import io.micrometer.core.instrument.binder.jvm.convention.otel.OpenTelemetryJvmCpuMeterConventions;
 import io.micrometer.core.instrument.binder.system.FileDescriptorMetrics;
 import io.micrometer.core.instrument.binder.system.ProcessorMetrics;
 import io.micrometer.core.instrument.binder.system.UptimeMetrics;
@@ -38,7 +40,10 @@
 import org.springframework.boot.micrometer.metrics.autoconfigure.MetricsAutoConfiguration;
 import org.springframework.boot.micrometer.metrics.autoconfigure.MetricsProperties;
 import org.springframework.boot.micrometer.metrics.system.DiskSpaceMetricsBinder;
+import org.springframework.boot.micrometer.observation.autoconfigure.condition.ConditionalOnSemanticConventions;
+import org.springframework.boot.micrometer.observation.autoconfigure.condition.SemanticConventions;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for system metrics.
@@ -80,4 +85,28 @@ DiskSpaceMetricsBinder diskSpaceMetrics(MetricsProperties properties) {
 		return new DiskSpaceMetricsBinder(paths, Tags.empty());
 	}
 
+	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnSemanticConventions(SemanticConventions.MICROMETER)
+	static class MicrometerSystemConventionsConfiguration {
+
+		@Bean
+		@ConditionalOnMissingBean(JvmCpuMeterConventions.class)
+		MicrometerJvmCpuMeterConventions micrometerJvmCpuMeterConventions() {
+			return new MicrometerJvmCpuMeterConventions(Tags.empty());
+		}
+
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnSemanticConventions(SemanticConventions.OPEN_TELEMETRY)
+	static class OpenTelemetrySystemConventionsConfiguration {
+
+		@Bean
+		@ConditionalOnMissingBean(JvmCpuMeterConventions.class)
+		OpenTelemetryJvmCpuMeterConventions openTelemetryJvmCpuMeterConventions() {
+			return new OpenTelemetryJvmCpuMeterConventions(Tags.empty());
+		}
+
+	}
+
 }