Skip to content

Commit 6580f6c

Browse files
committed
Align with latest changes in Micrometer 1.9 snapshots
See gh-30605
1 parent 48f8021 commit 6580f6c

File tree

54 files changed

+138
-802
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+138
-802
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ dependencies {
4848
optional("io.dropwizard.metrics:metrics-jmx")
4949
optional("io.lettuce:lettuce-core")
5050
optional("io.micrometer:micrometer-core")
51-
optional("io.micrometer:micrometer-binders")
5251
optional("io.micrometer:micrometer-registry-appoptics")
5352
optional("io.micrometer:micrometer-registry-atlas") {
5453
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

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.metrics;
1818

19-
import io.micrometer.binder.jvm.ClassLoaderMetrics;
20-
import io.micrometer.binder.jvm.JvmGcMetrics;
21-
import io.micrometer.binder.jvm.JvmHeapPressureMetrics;
22-
import io.micrometer.binder.jvm.JvmMemoryMetrics;
23-
import io.micrometer.binder.jvm.JvmThreadMetrics;
2419
import io.micrometer.core.instrument.MeterRegistry;
20+
import io.micrometer.core.instrument.binder.jvm.ClassLoaderMetrics;
21+
import io.micrometer.core.instrument.binder.jvm.JvmGcMetrics;
22+
import io.micrometer.core.instrument.binder.jvm.JvmHeapPressureMetrics;
23+
import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
24+
import io.micrometer.core.instrument.binder.jvm.JvmThreadMetrics;
2525

2626
import org.springframework.boot.autoconfigure.AutoConfiguration;
2727
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -39,39 +39,34 @@
3939
@AutoConfiguration(after = { MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class })
4040
@ConditionalOnClass(MeterRegistry.class)
4141
@ConditionalOnBean(MeterRegistry.class)
42-
@SuppressWarnings("deprecation")
4342
public class JvmMetricsAutoConfiguration {
4443

4544
@Bean
46-
@ConditionalOnMissingBean({ JvmGcMetrics.class, io.micrometer.core.instrument.binder.jvm.JvmGcMetrics.class })
45+
@ConditionalOnMissingBean
4746
public JvmGcMetrics jvmGcMetrics() {
4847
return new JvmGcMetrics();
4948
}
5049

5150
@Bean
52-
@ConditionalOnMissingBean({ JvmHeapPressureMetrics.class,
53-
io.micrometer.core.instrument.binder.jvm.JvmHeapPressureMetrics.class })
51+
@ConditionalOnMissingBean
5452
public JvmHeapPressureMetrics jvmHeapPressureMetrics() {
5553
return new JvmHeapPressureMetrics();
5654
}
5755

5856
@Bean
59-
@ConditionalOnMissingBean({ JvmMemoryMetrics.class,
60-
io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics.class })
57+
@ConditionalOnMissingBean
6158
public JvmMemoryMetrics jvmMemoryMetrics() {
6259
return new JvmMemoryMetrics();
6360
}
6461

6562
@Bean
66-
@ConditionalOnMissingBean({ JvmThreadMetrics.class,
67-
io.micrometer.core.instrument.binder.jvm.JvmThreadMetrics.class })
63+
@ConditionalOnMissingBean
6864
public JvmThreadMetrics jvmThreadMetrics() {
6965
return new JvmThreadMetrics();
7066
}
7167

7268
@Bean
73-
@ConditionalOnMissingBean({ ClassLoaderMetrics.class,
74-
io.micrometer.core.instrument.binder.jvm.ClassLoaderMetrics.class })
69+
@ConditionalOnMissingBean
7570
public ClassLoaderMetrics classLoaderMetrics() {
7671
return new ClassLoaderMetrics();
7772
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.metrics;
1818

19-
import io.micrometer.binder.kafka.KafkaClientMetrics;
20-
import io.micrometer.binder.kafka.KafkaStreamsMetrics;
2119
import io.micrometer.core.instrument.MeterRegistry;
20+
import io.micrometer.core.instrument.binder.kafka.KafkaClientMetrics;
21+
import io.micrometer.core.instrument.binder.kafka.KafkaStreamsMetrics;
2222

2323
import org.springframework.boot.autoconfigure.AutoConfiguration;
2424
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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.metrics;
1818

19-
import io.micrometer.binder.logging.Log4j2Metrics;
2019
import io.micrometer.core.instrument.MeterRegistry;
20+
import io.micrometer.core.instrument.binder.logging.Log4j2Metrics;
2121
import org.apache.logging.log4j.LogManager;
2222
import org.apache.logging.log4j.spi.LoggerContext;
2323

@@ -44,11 +44,10 @@
4444
name = "org.apache.logging.log4j.core.LoggerContext")
4545
@ConditionalOnBean(MeterRegistry.class)
4646
@Conditional(Log4JCoreLoggerContextCondition.class)
47-
@SuppressWarnings("deprecation")
4847
public class Log4J2MetricsAutoConfiguration {
4948

5049
@Bean
51-
@ConditionalOnMissingBean({ Log4j2Metrics.class, io.micrometer.core.instrument.binder.logging.Log4j2Metrics.class })
50+
@ConditionalOnMissingBean
5251
public Log4j2Metrics log4j2Metrics() {
5352
return new Log4j2Metrics();
5453
}

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package org.springframework.boot.actuate.autoconfigure.metrics;
1818

1919
import ch.qos.logback.classic.LoggerContext;
20-
import io.micrometer.binder.logging.LogbackMetrics;
2120
import io.micrometer.core.instrument.MeterRegistry;
21+
import io.micrometer.core.instrument.binder.logging.LogbackMetrics;
2222
import org.slf4j.ILoggerFactory;
2323
import org.slf4j.LoggerFactory;
2424

@@ -46,12 +46,10 @@
4646
@ConditionalOnClass({ MeterRegistry.class, LoggerContext.class, LoggerFactory.class })
4747
@ConditionalOnBean(MeterRegistry.class)
4848
@Conditional(LogbackLoggingCondition.class)
49-
@SuppressWarnings("deprecation")
5049
public class LogbackMetricsAutoConfiguration {
5150

5251
@Bean
53-
@ConditionalOnMissingBean({ LogbackMetrics.class,
54-
io.micrometer.core.instrument.binder.logging.LogbackMetrics.class })
52+
@ConditionalOnMissingBean
5553
public LogbackMetrics logbackMetrics() {
5654
return new LogbackMetrics();
5755
}

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
import java.io.File;
2020
import java.util.List;
2121

22-
import io.micrometer.binder.system.FileDescriptorMetrics;
23-
import io.micrometer.binder.system.ProcessorMetrics;
24-
import io.micrometer.binder.system.UptimeMetrics;
2522
import io.micrometer.core.instrument.MeterRegistry;
2623
import io.micrometer.core.instrument.Tags;
24+
import io.micrometer.core.instrument.binder.system.FileDescriptorMetrics;
25+
import io.micrometer.core.instrument.binder.system.ProcessorMetrics;
26+
import io.micrometer.core.instrument.binder.system.UptimeMetrics;
2727

2828
import org.springframework.boot.actuate.metrics.system.DiskSpaceMetricsBinder;
2929
import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -45,25 +45,22 @@
4545
@ConditionalOnClass(MeterRegistry.class)
4646
@ConditionalOnBean(MeterRegistry.class)
4747
@EnableConfigurationProperties(MetricsProperties.class)
48-
@SuppressWarnings("deprecation")
4948
public class SystemMetricsAutoConfiguration {
5049

5150
@Bean
52-
@ConditionalOnMissingBean({ UptimeMetrics.class, io.micrometer.core.instrument.binder.system.UptimeMetrics.class })
51+
@ConditionalOnMissingBean
5352
public UptimeMetrics uptimeMetrics() {
5453
return new UptimeMetrics();
5554
}
5655

5756
@Bean
58-
@ConditionalOnMissingBean({ ProcessorMetrics.class,
59-
io.micrometer.core.instrument.binder.system.ProcessorMetrics.class })
57+
@ConditionalOnMissingBean
6058
public ProcessorMetrics processorMetrics() {
6159
return new ProcessorMetrics();
6260
}
6361

6462
@Bean
65-
@ConditionalOnMissingBean({ FileDescriptorMetrics.class,
66-
io.micrometer.core.instrument.binder.system.FileDescriptorMetrics.class })
63+
@ConditionalOnMissingBean
6764
public FileDescriptorMetrics fileDescriptorMetrics() {
6865
return new FileDescriptorMetrics();
6966
}

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

Lines changed: 0 additions & 44 deletions
This file was deleted.

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

Lines changed: 11 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@
1919
import java.lang.annotation.Annotation;
2020
import java.lang.reflect.AnnotatedElement;
2121

22-
import io.micrometer.binder.jersey.server.AnnotationFinder;
23-
import io.micrometer.binder.jersey.server.JerseyTagsProvider;
24-
import io.micrometer.binder.jersey.server.MetricsApplicationEventListener;
2522
import io.micrometer.core.instrument.MeterRegistry;
23+
import io.micrometer.core.instrument.binder.jersey.server.AnnotationFinder;
24+
import io.micrometer.core.instrument.binder.jersey.server.DefaultJerseyTagsProvider;
25+
import io.micrometer.core.instrument.binder.jersey.server.JerseyTagsProvider;
26+
import io.micrometer.core.instrument.binder.jersey.server.MetricsApplicationEventListener;
2627
import io.micrometer.core.instrument.config.MeterFilter;
2728
import org.glassfish.jersey.server.ResourceConfig;
2829

@@ -31,16 +32,15 @@
3132
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsProperties.Web.Server;
3233
import org.springframework.boot.actuate.autoconfigure.metrics.OnlyOnceLoggingDenyMeterFilter;
3334
import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
34-
import org.springframework.boot.actuate.autoconfigure.metrics.jersey.JerseyConfigurations.JerseyTagsProviderConfiguration;
3535
import org.springframework.boot.autoconfigure.AutoConfiguration;
3636
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
3737
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
3838
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
39+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3940
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
4041
import org.springframework.boot.autoconfigure.jersey.ResourceConfigCustomizer;
4142
import org.springframework.boot.context.properties.EnableConfigurationProperties;
4243
import org.springframework.context.annotation.Bean;
43-
import org.springframework.context.annotation.Import;
4444
import org.springframework.core.annotation.AnnotationUtils;
4545
import org.springframework.core.annotation.Order;
4646

@@ -57,8 +57,6 @@
5757
@ConditionalOnClass({ ResourceConfig.class, MetricsApplicationEventListener.class })
5858
@ConditionalOnBean({ MeterRegistry.class, ResourceConfig.class })
5959
@EnableConfigurationProperties(MetricsProperties.class)
60-
@Import(JerseyTagsProviderConfiguration.class)
61-
@SuppressWarnings("deprecation")
6260
public class JerseyServerMetricsAutoConfiguration {
6361

6462
private final MetricsProperties properties;
@@ -68,7 +66,12 @@ public JerseyServerMetricsAutoConfiguration(MetricsProperties properties) {
6866
}
6967

7068
@Bean
71-
@ConditionalOnBean(JerseyTagsProvider.class)
69+
@ConditionalOnMissingBean(JerseyTagsProvider.class)
70+
public DefaultJerseyTagsProvider jerseyTagsProvider() {
71+
return new DefaultJerseyTagsProvider();
72+
}
73+
74+
@Bean
7275
public ResourceConfigCustomizer jerseyServerMetricsResourceConfigCustomizer(MeterRegistry meterRegistry,
7376
JerseyTagsProvider tagsProvider) {
7477
Server server = this.properties.getWeb().getServer();
@@ -77,19 +80,6 @@ public ResourceConfigCustomizer jerseyServerMetricsResourceConfigCustomizer(Mete
7780
server.getRequest().getAutotime().isEnabled(), new AnnotationUtilsAnnotationFinder()));
7881
}
7982

80-
@Bean
81-
@ConditionalOnBean(io.micrometer.core.instrument.binder.jersey.server.JerseyTagsProvider.class)
82-
public ResourceConfigCustomizer jerseyServerMetricsResourceConfigCustomizerBackwardsCompatible(
83-
MeterRegistry meterRegistry,
84-
io.micrometer.core.instrument.binder.jersey.server.JerseyTagsProvider tagsProvider) {
85-
Server server = this.properties.getWeb().getServer();
86-
return (config) -> config.register(
87-
new io.micrometer.core.instrument.binder.jersey.server.MetricsApplicationEventListener(meterRegistry,
88-
tagsProvider, server.getRequest().getMetricName(),
89-
server.getRequest().getAutotime().isEnabled(),
90-
new AnnotationUtilsAnnotationFinderBackwardsCompatible()));
91-
}
92-
9383
@Bean
9484
@Order(0)
9585
public MeterFilter jerseyMetricsUriTagFilter() {
@@ -112,18 +102,4 @@ public <A extends Annotation> A findAnnotation(AnnotatedElement annotatedElement
112102

113103
}
114104

115-
/**
116-
* An {@link AnnotationFinder} (for backwards compatability) that uses
117-
* {@link AnnotationUtils}.
118-
*/
119-
private static class AnnotationUtilsAnnotationFinderBackwardsCompatible
120-
implements io.micrometer.core.instrument.binder.jersey.server.AnnotationFinder {
121-
122-
@Override
123-
public <A extends Annotation> A findAnnotation(AnnotatedElement annotatedElement, Class<A> annotationType) {
124-
return AnnotationUtils.findAnnotation(annotatedElement, annotationType);
125-
}
126-
127-
}
128-
129105
}

0 commit comments

Comments
 (0)