From 0072cc807c91506d6e7c803a808c7ef24eab9fc3 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Tue, 1 Mar 2022 13:32:15 +0100 Subject: [PATCH] Suppress deprecation warnings caused by micrometer backwards compatability --- .../autoconfigure/metrics/JvmMetricsAutoConfiguration.java | 1 + .../metrics/Log4J2MetricsAutoConfiguration.java | 1 + .../metrics/LogbackMetricsAutoConfiguration.java | 1 + .../metrics/SystemMetricsAutoConfiguration.java | 1 + .../autoconfigure/metrics/jersey/JerseyConfigurations.java | 1 + .../metrics/jersey/JerseyServerMetricsAutoConfiguration.java | 1 + .../autoconfigure/metrics/mongo/MongoConfigurations.java | 1 + .../metrics/mongo/MongoMetricsAutoConfiguration.java | 1 + .../metrics/web/jetty/JettyMetricsAutoConfiguration.java | 1 + .../metrics/web/tomcat/TomcatMetricsAutoConfiguration.java | 1 + .../metrics/JvmMetricsAutoConfigurationTests.java | 5 +++++ ...2MetricsWithLog4jLoggerContextAutoConfigurationTests.java | 1 + .../metrics/LogbackMetricsAutoConfigurationTests.java | 1 + .../metrics/SystemMetricsAutoConfigurationTests.java | 3 +++ .../jersey/JerseyServerMetricsAutoConfigurationTests.java | 2 ++ .../web/jetty/JettyMetricsAutoConfigurationTests.java | 3 +++ .../web/tomcat/TomcatMetricsAutoConfigurationTests.java | 1 + 17 files changed, 26 insertions(+) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/JvmMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/JvmMetricsAutoConfiguration.java index 6ad1a24ab69..6f500ebb285 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/JvmMetricsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/JvmMetricsAutoConfiguration.java @@ -39,6 +39,7 @@ import org.springframework.context.annotation.Bean; @AutoConfiguration(after = { MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class }) @ConditionalOnClass(MeterRegistry.class) @ConditionalOnBean(MeterRegistry.class) +@SuppressWarnings("deprecation") public class JvmMetricsAutoConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsAutoConfiguration.java index 2dfbf4da59e..44da20d0c02 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsAutoConfiguration.java @@ -44,6 +44,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; name = "org.apache.logging.log4j.core.LoggerContext") @ConditionalOnBean(MeterRegistry.class) @Conditional(Log4JCoreLoggerContextCondition.class) +@SuppressWarnings("deprecation") public class Log4J2MetricsAutoConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/LogbackMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/LogbackMetricsAutoConfiguration.java index c77421d30c1..a3169f36adc 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/LogbackMetricsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/LogbackMetricsAutoConfiguration.java @@ -46,6 +46,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @ConditionalOnClass({ MeterRegistry.class, LoggerContext.class, LoggerFactory.class }) @ConditionalOnBean(MeterRegistry.class) @Conditional(LogbackLoggingCondition.class) +@SuppressWarnings("deprecation") public class LogbackMetricsAutoConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfiguration.java index eb968bbe6b0..d186e20f29c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfiguration.java @@ -45,6 +45,7 @@ import org.springframework.context.annotation.Bean; @ConditionalOnClass(MeterRegistry.class) @ConditionalOnBean(MeterRegistry.class) @EnableConfigurationProperties(MetricsProperties.class) +@SuppressWarnings("deprecation") public class SystemMetricsAutoConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jersey/JerseyConfigurations.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jersey/JerseyConfigurations.java index c6495912e06..6b962d14403 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jersey/JerseyConfigurations.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jersey/JerseyConfigurations.java @@ -27,6 +27,7 @@ import org.springframework.context.annotation.Bean; * * @author Moritz Halbritter */ +@SuppressWarnings("deprecation") abstract class JerseyConfigurations { static class JerseyTagsProviderConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jersey/JerseyServerMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jersey/JerseyServerMetricsAutoConfiguration.java index 9c9c88704b2..cd60871d0d0 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jersey/JerseyServerMetricsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jersey/JerseyServerMetricsAutoConfiguration.java @@ -58,6 +58,7 @@ import org.springframework.core.annotation.Order; @ConditionalOnBean({ MeterRegistry.class, ResourceConfig.class }) @EnableConfigurationProperties(MetricsProperties.class) @Import(JerseyTagsProviderConfiguration.class) +@SuppressWarnings("deprecation") public class JerseyServerMetricsAutoConfiguration { private final MetricsProperties properties; diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/mongo/MongoConfigurations.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/mongo/MongoConfigurations.java index 0f83c1c3763..19be26227e9 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/mongo/MongoConfigurations.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/mongo/MongoConfigurations.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Import; * * @author Moritz Halbritter */ +@SuppressWarnings("deprecation") abstract class MongoConfigurations { @Configuration(proxyBeanMethods = false) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/mongo/MongoMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/mongo/MongoMetricsAutoConfiguration.java index c859f77cdf8..250775a9e1a 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/mongo/MongoMetricsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/mongo/MongoMetricsAutoConfiguration.java @@ -48,6 +48,7 @@ import org.springframework.context.annotation.Import; after = { MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class }) @ConditionalOnClass(MongoClientSettings.class) @ConditionalOnBean(MeterRegistry.class) +@SuppressWarnings("deprecation") public class MongoMetricsAutoConfiguration { @Configuration(proxyBeanMethods = false) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfiguration.java index 8e1a5262714..3a9d0871e8d 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfiguration.java @@ -46,6 +46,7 @@ import org.springframework.context.annotation.Bean; @ConditionalOnWebApplication @ConditionalOnClass({ JettyServerThreadPoolMetrics.class, Server.class }) @ConditionalOnBean(MeterRegistry.class) +@SuppressWarnings("deprecation") public class JettyMetricsAutoConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfiguration.java index 18c213236f5..81c2d6c767b 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfiguration.java @@ -39,6 +39,7 @@ import org.springframework.context.annotation.Bean; @AutoConfiguration(after = CompositeMeterRegistryAutoConfiguration.class) @ConditionalOnWebApplication @ConditionalOnClass({ TomcatMetrics.class, Manager.class }) +@SuppressWarnings("deprecation") public class TomcatMetricsAutoConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/JvmMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/JvmMetricsAutoConfigurationTests.java index 245b5b3c9fc..ffc419fa4ac 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/JvmMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/JvmMetricsAutoConfigurationTests.java @@ -164,6 +164,7 @@ class JvmMetricsAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) + @SuppressWarnings("deprecation") static class CustomJvmGcMetricsBackwardsCompatibleConfiguration { @Bean @@ -184,6 +185,7 @@ class JvmMetricsAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) + @SuppressWarnings("deprecation") static class CustomJvmHeapPressureMetricsBackwardsCompatibleConfiguration { @Bean @@ -204,6 +206,7 @@ class JvmMetricsAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) + @SuppressWarnings("deprecation") static class CustomJvmMemoryMetricsBackwardsCompatibleConfiguration { @Bean @@ -224,6 +227,7 @@ class JvmMetricsAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) + @SuppressWarnings("deprecation") static class CustomJvmThreadMetricsBackwardsCompatibleConfiguration { @Bean @@ -244,6 +248,7 @@ class JvmMetricsAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) + @SuppressWarnings("deprecation") static class CustomClassLoaderMetricsBackwardsCompatibleConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsWithLog4jLoggerContextAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsWithLog4jLoggerContextAutoConfigurationTests.java index df82ff13f9f..5934be9a0e5 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsWithLog4jLoggerContextAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsWithLog4jLoggerContextAutoConfigurationTests.java @@ -77,6 +77,7 @@ class Log4J2MetricsWithLog4jLoggerContextAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) + @SuppressWarnings("deprecation") static class CustomLog4J2MetricsConfigurationBackwardsCompatible { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/LogbackMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/LogbackMetricsAutoConfigurationTests.java index 004613c209a..b0e38d4d8ae 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/LogbackMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/LogbackMetricsAutoConfigurationTests.java @@ -69,6 +69,7 @@ class LogbackMetricsAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) + @SuppressWarnings("deprecation") static class CustomLogbackMetricsConfigurationBackwardsCompatible { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfigurationTests.java index 0fae3a1e8a0..df6c955cfa1 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfigurationTests.java @@ -153,6 +153,7 @@ class SystemMetricsAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) + @SuppressWarnings("deprecation") static class CustomUptimeMetricsConfigurationBackwardsCompatible { @Bean @@ -173,6 +174,7 @@ class SystemMetricsAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) + @SuppressWarnings("deprecation") static class CustomProcessorMetricsConfigurationBackwardsCompatible { @Bean @@ -193,6 +195,7 @@ class SystemMetricsAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) + @SuppressWarnings("deprecation") static class CustomFileDescriptorMetricsConfigurationBackwardsCompatible { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/jersey/JerseyServerMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/jersey/JerseyServerMetricsAutoConfigurationTests.java index 91e1d96fd9c..663abba27b7 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/jersey/JerseyServerMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/jersey/JerseyServerMetricsAutoConfigurationTests.java @@ -156,6 +156,7 @@ class JerseyServerMetricsAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) + @SuppressWarnings("deprecation") static class CustomJerseyTagsProviderBackwardsCompatibleConfiguration { @Bean @@ -179,6 +180,7 @@ class JerseyServerMetricsAutoConfigurationTests { } + @SuppressWarnings("deprecation") static class CustomJerseyTagsProviderBackwardsCompatible implements io.micrometer.core.instrument.binder.jersey.server.JerseyTagsProvider { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfigurationTests.java index ee1a81cd5e5..c249ffd8078 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfigurationTests.java @@ -334,6 +334,7 @@ class JettyMetricsAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) + @SuppressWarnings("deprecation") static class CustomJettyServerThreadPoolMetricsBackwardsCompatible { @Bean @@ -365,6 +366,7 @@ class JettyMetricsAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) + @SuppressWarnings("deprecation") static class CustomJettyConnectionMetricsBackwardsCompatible { @Bean @@ -396,6 +398,7 @@ class JettyMetricsAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) + @SuppressWarnings("deprecation") static class CustomJettySslHandshakeMetricsBackwardsCompatible { @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfigurationTests.java index 30780452382..27d64a71613 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfigurationTests.java @@ -175,6 +175,7 @@ class TomcatMetricsAutoConfigurationTests { } @Configuration(proxyBeanMethods = false) + @SuppressWarnings("deprecation") static class CustomTomcatMetricsBackwardsCompatible { @Bean