Align with latest changes in Micrometer 1.9 snapshots

See gh-30605

Author: wilkinsona

spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

@@ -48,7 +48,6 @@ dependencies {
 	optional("io.dropwizard.metrics:metrics-jmx")
 	optional("io.lettuce:lettuce-core")
 	optional("io.micrometer:micrometer-core")
-	optional("io.micrometer:micrometer-binders")
 	optional("io.micrometer:micrometer-registry-appoptics")
 	optional("io.micrometer:micrometer-registry-atlas") {
 		exclude group: "javax.inject", module: "javax.inject"

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/JvmMetricsAutoConfiguration.java

@@ -16,12 +16,12 @@
 
 package org.springframework.boot.actuate.autoconfigure.metrics;
 
-import io.micrometer.binder.jvm.ClassLoaderMetrics;
-import io.micrometer.binder.jvm.JvmGcMetrics;
-import io.micrometer.binder.jvm.JvmHeapPressureMetrics;
-import io.micrometer.binder.jvm.JvmMemoryMetrics;
-import io.micrometer.binder.jvm.JvmThreadMetrics;
 import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.binder.jvm.ClassLoaderMetrics;
+import io.micrometer.core.instrument.binder.jvm.JvmGcMetrics;
+import io.micrometer.core.instrument.binder.jvm.JvmHeapPressureMetrics;
+import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
+import io.micrometer.core.instrument.binder.jvm.JvmThreadMetrics;
 
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -39,39 +39,34 @@
 @AutoConfiguration(after = { MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class })
 @ConditionalOnClass(MeterRegistry.class)
 @ConditionalOnBean(MeterRegistry.class)
-@SuppressWarnings("deprecation")
 public class JvmMetricsAutoConfiguration {
 
 	@Bean
-	@ConditionalOnMissingBean({ JvmGcMetrics.class, io.micrometer.core.instrument.binder.jvm.JvmGcMetrics.class })
+	@ConditionalOnMissingBean
 	public JvmGcMetrics jvmGcMetrics() {
 		return new JvmGcMetrics();
 	}
 
 	@Bean
-	@ConditionalOnMissingBean({ JvmHeapPressureMetrics.class,
-			io.micrometer.core.instrument.binder.jvm.JvmHeapPressureMetrics.class })
+	@ConditionalOnMissingBean
 	public JvmHeapPressureMetrics jvmHeapPressureMetrics() {
 		return new JvmHeapPressureMetrics();
 	}
 
 	@Bean
-	@ConditionalOnMissingBean({ JvmMemoryMetrics.class,
-			io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics.class })
+	@ConditionalOnMissingBean
 	public JvmMemoryMetrics jvmMemoryMetrics() {
 		return new JvmMemoryMetrics();
 	}
 
 	@Bean
-	@ConditionalOnMissingBean({ JvmThreadMetrics.class,
-			io.micrometer.core.instrument.binder.jvm.JvmThreadMetrics.class })
+	@ConditionalOnMissingBean
 	public JvmThreadMetrics jvmThreadMetrics() {
 		return new JvmThreadMetrics();
 	}
 
 	@Bean
-	@ConditionalOnMissingBean({ ClassLoaderMetrics.class,
-			io.micrometer.core.instrument.binder.jvm.ClassLoaderMetrics.class })
+	@ConditionalOnMissingBean
 	public ClassLoaderMetrics classLoaderMetrics() {
 		return new ClassLoaderMetrics();
 	}

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/KafkaMetricsAutoConfiguration.java

@@ -16,9 +16,9 @@
 
 package org.springframework.boot.actuate.autoconfigure.metrics;
 
-import io.micrometer.binder.kafka.KafkaClientMetrics;
-import io.micrometer.binder.kafka.KafkaStreamsMetrics;
 import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.binder.kafka.KafkaClientMetrics;
+import io.micrometer.core.instrument.binder.kafka.KafkaStreamsMetrics;
 
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsAutoConfiguration.java

@@ -16,8 +16,8 @@
 
 package org.springframework.boot.actuate.autoconfigure.metrics;
 
-import io.micrometer.binder.logging.Log4j2Metrics;
 import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.binder.logging.Log4j2Metrics;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.spi.LoggerContext;
 
@@ -44,11 +44,10 @@
 		name = "org.apache.logging.log4j.core.LoggerContext")
 @ConditionalOnBean(MeterRegistry.class)
 @Conditional(Log4JCoreLoggerContextCondition.class)
-@SuppressWarnings("deprecation")
 public class Log4J2MetricsAutoConfiguration {
 
 	@Bean
-	@ConditionalOnMissingBean({ Log4j2Metrics.class, io.micrometer.core.instrument.binder.logging.Log4j2Metrics.class })
+	@ConditionalOnMissingBean
 	public Log4j2Metrics log4j2Metrics() {
 		return new Log4j2Metrics();
 	}

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/LogbackMetricsAutoConfiguration.java

@@ -17,8 +17,8 @@
 package org.springframework.boot.actuate.autoconfigure.metrics;
 
 import ch.qos.logback.classic.LoggerContext;
-import io.micrometer.binder.logging.LogbackMetrics;
 import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.binder.logging.LogbackMetrics;
 import org.slf4j.ILoggerFactory;
 import org.slf4j.LoggerFactory;
 
@@ -46,12 +46,10 @@
 @ConditionalOnClass({ MeterRegistry.class, LoggerContext.class, LoggerFactory.class })
 @ConditionalOnBean(MeterRegistry.class)
 @Conditional(LogbackLoggingCondition.class)
-@SuppressWarnings("deprecation")
 public class LogbackMetricsAutoConfiguration {
 
 	@Bean
-	@ConditionalOnMissingBean({ LogbackMetrics.class,
-			io.micrometer.core.instrument.binder.logging.LogbackMetrics.class })
+	@ConditionalOnMissingBean
 	public LogbackMetrics logbackMetrics() {
 		return new LogbackMetrics();
 	}

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfiguration.java

@@ -19,11 +19,11 @@
 import java.io.File;
 import java.util.List;
 
-import io.micrometer.binder.system.FileDescriptorMetrics;
-import io.micrometer.binder.system.ProcessorMetrics;
-import io.micrometer.binder.system.UptimeMetrics;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tags;
+import io.micrometer.core.instrument.binder.system.FileDescriptorMetrics;
+import io.micrometer.core.instrument.binder.system.ProcessorMetrics;
+import io.micrometer.core.instrument.binder.system.UptimeMetrics;
 
 import org.springframework.boot.actuate.metrics.system.DiskSpaceMetricsBinder;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -45,25 +45,22 @@
 @ConditionalOnClass(MeterRegistry.class)
 @ConditionalOnBean(MeterRegistry.class)
 @EnableConfigurationProperties(MetricsProperties.class)
-@SuppressWarnings("deprecation")
 public class SystemMetricsAutoConfiguration {
 
 	@Bean
-	@ConditionalOnMissingBean({ UptimeMetrics.class, io.micrometer.core.instrument.binder.system.UptimeMetrics.class })
+	@ConditionalOnMissingBean
 	public UptimeMetrics uptimeMetrics() {
 		return new UptimeMetrics();
 	}
 
 	@Bean
-	@ConditionalOnMissingBean({ ProcessorMetrics.class,
-			io.micrometer.core.instrument.binder.system.ProcessorMetrics.class })
+	@ConditionalOnMissingBean
 	public ProcessorMetrics processorMetrics() {
 		return new ProcessorMetrics();
 	}
 
 	@Bean
-	@ConditionalOnMissingBean({ FileDescriptorMetrics.class,
-			io.micrometer.core.instrument.binder.system.FileDescriptorMetrics.class })
+	@ConditionalOnMissingBean
 	public FileDescriptorMetrics fileDescriptorMetrics() {
 		return new FileDescriptorMetrics();
 	}

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jersey/JerseyConfigurations.java

@@ -19,10 +19,11 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
 
-import io.micrometer.binder.jersey.server.AnnotationFinder;
-import io.micrometer.binder.jersey.server.JerseyTagsProvider;
-import io.micrometer.binder.jersey.server.MetricsApplicationEventListener;
 import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.binder.jersey.server.AnnotationFinder;
+import io.micrometer.core.instrument.binder.jersey.server.DefaultJerseyTagsProvider;
+import io.micrometer.core.instrument.binder.jersey.server.JerseyTagsProvider;
+import io.micrometer.core.instrument.binder.jersey.server.MetricsApplicationEventListener;
 import io.micrometer.core.instrument.config.MeterFilter;
 import org.glassfish.jersey.server.ResourceConfig;
 
@@ -31,16 +32,15 @@
 import org.springframework.boot.actuate.autoconfigure.metrics.MetricsProperties.Web.Server;
 import org.springframework.boot.actuate.autoconfigure.metrics.OnlyOnceLoggingDenyMeterFilter;
 import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
-import org.springframework.boot.actuate.autoconfigure.metrics.jersey.JerseyConfigurations.JerseyTagsProviderConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.jersey.ResourceConfigCustomizer;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Import;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.annotation.Order;
 
@@ -57,8 +57,6 @@
 @ConditionalOnClass({ ResourceConfig.class, MetricsApplicationEventListener.class })
 @ConditionalOnBean({ MeterRegistry.class, ResourceConfig.class })
 @EnableConfigurationProperties(MetricsProperties.class)
-@Import(JerseyTagsProviderConfiguration.class)
-@SuppressWarnings("deprecation")
 public class JerseyServerMetricsAutoConfiguration {
 
 	private final MetricsProperties properties;
@@ -68,7 +66,12 @@ public JerseyServerMetricsAutoConfiguration(MetricsProperties properties) {
 	}
 
 	@Bean
-	@ConditionalOnBean(JerseyTagsProvider.class)
+	@ConditionalOnMissingBean(JerseyTagsProvider.class)
+	public DefaultJerseyTagsProvider jerseyTagsProvider() {
+		return new DefaultJerseyTagsProvider();
+	}
+
+	@Bean
 	public ResourceConfigCustomizer jerseyServerMetricsResourceConfigCustomizer(MeterRegistry meterRegistry,
 			JerseyTagsProvider tagsProvider) {
 		Server server = this.properties.getWeb().getServer();
@@ -77,19 +80,6 @@ public ResourceConfigCustomizer jerseyServerMetricsResourceConfigCustomizer(Mete
 						server.getRequest().getAutotime().isEnabled(), new AnnotationUtilsAnnotationFinder()));
 	}
 
-	@Bean
-	@ConditionalOnBean(io.micrometer.core.instrument.binder.jersey.server.JerseyTagsProvider.class)
-	public ResourceConfigCustomizer jerseyServerMetricsResourceConfigCustomizerBackwardsCompatible(
-			MeterRegistry meterRegistry,
-			io.micrometer.core.instrument.binder.jersey.server.JerseyTagsProvider tagsProvider) {
-		Server server = this.properties.getWeb().getServer();
-		return (config) -> config.register(
-				new io.micrometer.core.instrument.binder.jersey.server.MetricsApplicationEventListener(meterRegistry,
-						tagsProvider, server.getRequest().getMetricName(),
-						server.getRequest().getAutotime().isEnabled(),
-						new AnnotationUtilsAnnotationFinderBackwardsCompatible()));
-	}
-
 	@Bean
 	@Order(0)
 	public MeterFilter jerseyMetricsUriTagFilter() {
@@ -112,18 +102,4 @@ public <A extends Annotation> A findAnnotation(AnnotatedElement annotatedElement
 
 	}
 
-	/**
-	 * An {@link AnnotationFinder} (for backwards compatability) that uses
-	 * {@link AnnotationUtils}.
-	 */
-	private static class AnnotationUtilsAnnotationFinderBackwardsCompatible
-			implements io.micrometer.core.instrument.binder.jersey.server.AnnotationFinder {
-
-		@Override
-		public <A extends Annotation> A findAnnotation(AnnotatedElement annotatedElement, Class<A> annotationType) {
-			return AnnotationUtils.findAnnotation(annotatedElement, annotationType);
-		}
-
-	}
-
 }