Suppress deprecation warnings caused by micrometer backwards compatability
This commit is contained in:
parent
97c47123d5
commit
0072cc807c
|
|
@ -39,6 +39,7 @@ import org.springframework.context.annotation.Bean;
|
||||||
@AutoConfiguration(after = { MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class })
|
@AutoConfiguration(after = { MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class })
|
||||||
@ConditionalOnClass(MeterRegistry.class)
|
@ConditionalOnClass(MeterRegistry.class)
|
||||||
@ConditionalOnBean(MeterRegistry.class)
|
@ConditionalOnBean(MeterRegistry.class)
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
public class JvmMetricsAutoConfiguration {
|
public class JvmMetricsAutoConfiguration {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
|
|
||||||
|
|
@ -44,6 +44,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata;
|
||||||
name = "org.apache.logging.log4j.core.LoggerContext")
|
name = "org.apache.logging.log4j.core.LoggerContext")
|
||||||
@ConditionalOnBean(MeterRegistry.class)
|
@ConditionalOnBean(MeterRegistry.class)
|
||||||
@Conditional(Log4JCoreLoggerContextCondition.class)
|
@Conditional(Log4JCoreLoggerContextCondition.class)
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
public class Log4J2MetricsAutoConfiguration {
|
public class Log4J2MetricsAutoConfiguration {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
|
|
||||||
|
|
@ -46,6 +46,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata;
|
||||||
@ConditionalOnClass({ MeterRegistry.class, LoggerContext.class, LoggerFactory.class })
|
@ConditionalOnClass({ MeterRegistry.class, LoggerContext.class, LoggerFactory.class })
|
||||||
@ConditionalOnBean(MeterRegistry.class)
|
@ConditionalOnBean(MeterRegistry.class)
|
||||||
@Conditional(LogbackLoggingCondition.class)
|
@Conditional(LogbackLoggingCondition.class)
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
public class LogbackMetricsAutoConfiguration {
|
public class LogbackMetricsAutoConfiguration {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
|
|
||||||
|
|
@ -45,6 +45,7 @@ import org.springframework.context.annotation.Bean;
|
||||||
@ConditionalOnClass(MeterRegistry.class)
|
@ConditionalOnClass(MeterRegistry.class)
|
||||||
@ConditionalOnBean(MeterRegistry.class)
|
@ConditionalOnBean(MeterRegistry.class)
|
||||||
@EnableConfigurationProperties(MetricsProperties.class)
|
@EnableConfigurationProperties(MetricsProperties.class)
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
public class SystemMetricsAutoConfiguration {
|
public class SystemMetricsAutoConfiguration {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,7 @@ import org.springframework.context.annotation.Bean;
|
||||||
*
|
*
|
||||||
* @author Moritz Halbritter
|
* @author Moritz Halbritter
|
||||||
*/
|
*/
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
abstract class JerseyConfigurations {
|
abstract class JerseyConfigurations {
|
||||||
|
|
||||||
static class JerseyTagsProviderConfiguration {
|
static class JerseyTagsProviderConfiguration {
|
||||||
|
|
|
||||||
|
|
@ -58,6 +58,7 @@ import org.springframework.core.annotation.Order;
|
||||||
@ConditionalOnBean({ MeterRegistry.class, ResourceConfig.class })
|
@ConditionalOnBean({ MeterRegistry.class, ResourceConfig.class })
|
||||||
@EnableConfigurationProperties(MetricsProperties.class)
|
@EnableConfigurationProperties(MetricsProperties.class)
|
||||||
@Import(JerseyTagsProviderConfiguration.class)
|
@Import(JerseyTagsProviderConfiguration.class)
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
public class JerseyServerMetricsAutoConfiguration {
|
public class JerseyServerMetricsAutoConfiguration {
|
||||||
|
|
||||||
private final MetricsProperties properties;
|
private final MetricsProperties properties;
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,7 @@ import org.springframework.context.annotation.Import;
|
||||||
*
|
*
|
||||||
* @author Moritz Halbritter
|
* @author Moritz Halbritter
|
||||||
*/
|
*/
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
abstract class MongoConfigurations {
|
abstract class MongoConfigurations {
|
||||||
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
@Configuration(proxyBeanMethods = false)
|
||||||
|
|
|
||||||
|
|
@ -48,6 +48,7 @@ import org.springframework.context.annotation.Import;
|
||||||
after = { MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class })
|
after = { MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class })
|
||||||
@ConditionalOnClass(MongoClientSettings.class)
|
@ConditionalOnClass(MongoClientSettings.class)
|
||||||
@ConditionalOnBean(MeterRegistry.class)
|
@ConditionalOnBean(MeterRegistry.class)
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
public class MongoMetricsAutoConfiguration {
|
public class MongoMetricsAutoConfiguration {
|
||||||
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
@Configuration(proxyBeanMethods = false)
|
||||||
|
|
|
||||||
|
|
@ -46,6 +46,7 @@ import org.springframework.context.annotation.Bean;
|
||||||
@ConditionalOnWebApplication
|
@ConditionalOnWebApplication
|
||||||
@ConditionalOnClass({ JettyServerThreadPoolMetrics.class, Server.class })
|
@ConditionalOnClass({ JettyServerThreadPoolMetrics.class, Server.class })
|
||||||
@ConditionalOnBean(MeterRegistry.class)
|
@ConditionalOnBean(MeterRegistry.class)
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
public class JettyMetricsAutoConfiguration {
|
public class JettyMetricsAutoConfiguration {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,7 @@ import org.springframework.context.annotation.Bean;
|
||||||
@AutoConfiguration(after = CompositeMeterRegistryAutoConfiguration.class)
|
@AutoConfiguration(after = CompositeMeterRegistryAutoConfiguration.class)
|
||||||
@ConditionalOnWebApplication
|
@ConditionalOnWebApplication
|
||||||
@ConditionalOnClass({ TomcatMetrics.class, Manager.class })
|
@ConditionalOnClass({ TomcatMetrics.class, Manager.class })
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
public class TomcatMetricsAutoConfiguration {
|
public class TomcatMetricsAutoConfiguration {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
|
|
||||||
|
|
@ -164,6 +164,7 @@ class JvmMetricsAutoConfigurationTests {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
@Configuration(proxyBeanMethods = false)
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
static class CustomJvmGcMetricsBackwardsCompatibleConfiguration {
|
static class CustomJvmGcMetricsBackwardsCompatibleConfiguration {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
|
@ -184,6 +185,7 @@ class JvmMetricsAutoConfigurationTests {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
@Configuration(proxyBeanMethods = false)
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
static class CustomJvmHeapPressureMetricsBackwardsCompatibleConfiguration {
|
static class CustomJvmHeapPressureMetricsBackwardsCompatibleConfiguration {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
|
@ -204,6 +206,7 @@ class JvmMetricsAutoConfigurationTests {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
@Configuration(proxyBeanMethods = false)
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
static class CustomJvmMemoryMetricsBackwardsCompatibleConfiguration {
|
static class CustomJvmMemoryMetricsBackwardsCompatibleConfiguration {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
|
@ -224,6 +227,7 @@ class JvmMetricsAutoConfigurationTests {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
@Configuration(proxyBeanMethods = false)
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
static class CustomJvmThreadMetricsBackwardsCompatibleConfiguration {
|
static class CustomJvmThreadMetricsBackwardsCompatibleConfiguration {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
|
@ -244,6 +248,7 @@ class JvmMetricsAutoConfigurationTests {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
@Configuration(proxyBeanMethods = false)
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
static class CustomClassLoaderMetricsBackwardsCompatibleConfiguration {
|
static class CustomClassLoaderMetricsBackwardsCompatibleConfiguration {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
|
|
||||||
|
|
@ -77,6 +77,7 @@ class Log4J2MetricsWithLog4jLoggerContextAutoConfigurationTests {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
@Configuration(proxyBeanMethods = false)
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
static class CustomLog4J2MetricsConfigurationBackwardsCompatible {
|
static class CustomLog4J2MetricsConfigurationBackwardsCompatible {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
|
|
||||||
|
|
@ -69,6 +69,7 @@ class LogbackMetricsAutoConfigurationTests {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
@Configuration(proxyBeanMethods = false)
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
static class CustomLogbackMetricsConfigurationBackwardsCompatible {
|
static class CustomLogbackMetricsConfigurationBackwardsCompatible {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
|
|
||||||
|
|
@ -153,6 +153,7 @@ class SystemMetricsAutoConfigurationTests {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
@Configuration(proxyBeanMethods = false)
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
static class CustomUptimeMetricsConfigurationBackwardsCompatible {
|
static class CustomUptimeMetricsConfigurationBackwardsCompatible {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
|
@ -173,6 +174,7 @@ class SystemMetricsAutoConfigurationTests {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
@Configuration(proxyBeanMethods = false)
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
static class CustomProcessorMetricsConfigurationBackwardsCompatible {
|
static class CustomProcessorMetricsConfigurationBackwardsCompatible {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
|
@ -193,6 +195,7 @@ class SystemMetricsAutoConfigurationTests {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
@Configuration(proxyBeanMethods = false)
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
static class CustomFileDescriptorMetricsConfigurationBackwardsCompatible {
|
static class CustomFileDescriptorMetricsConfigurationBackwardsCompatible {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
|
|
||||||
|
|
@ -156,6 +156,7 @@ class JerseyServerMetricsAutoConfigurationTests {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
@Configuration(proxyBeanMethods = false)
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
static class CustomJerseyTagsProviderBackwardsCompatibleConfiguration {
|
static class CustomJerseyTagsProviderBackwardsCompatibleConfiguration {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
|
@ -179,6 +180,7 @@ class JerseyServerMetricsAutoConfigurationTests {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
static class CustomJerseyTagsProviderBackwardsCompatible
|
static class CustomJerseyTagsProviderBackwardsCompatible
|
||||||
implements io.micrometer.core.instrument.binder.jersey.server.JerseyTagsProvider {
|
implements io.micrometer.core.instrument.binder.jersey.server.JerseyTagsProvider {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -334,6 +334,7 @@ class JettyMetricsAutoConfigurationTests {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
@Configuration(proxyBeanMethods = false)
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
static class CustomJettyServerThreadPoolMetricsBackwardsCompatible {
|
static class CustomJettyServerThreadPoolMetricsBackwardsCompatible {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
|
@ -365,6 +366,7 @@ class JettyMetricsAutoConfigurationTests {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
@Configuration(proxyBeanMethods = false)
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
static class CustomJettyConnectionMetricsBackwardsCompatible {
|
static class CustomJettyConnectionMetricsBackwardsCompatible {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
|
@ -396,6 +398,7 @@ class JettyMetricsAutoConfigurationTests {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
@Configuration(proxyBeanMethods = false)
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
static class CustomJettySslHandshakeMetricsBackwardsCompatible {
|
static class CustomJettySslHandshakeMetricsBackwardsCompatible {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
|
|
||||||
|
|
@ -175,6 +175,7 @@ class TomcatMetricsAutoConfigurationTests {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
@Configuration(proxyBeanMethods = false)
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
static class CustomTomcatMetricsBackwardsCompatible {
|
static class CustomTomcatMetricsBackwardsCompatible {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue