Skip to content

Commit 7e10fa7

Browse files
committed
fixup! Move Jetty metrics auto-configuration into spring-boot-jetty
1 parent 650941f commit 7e10fa7

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/metrics/autoconfigure/JettyMetricsAutoConfiguration.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.springframework.boot.jetty.actuate.metrics.JettyConnectionMetricsBinder;
3333
import org.springframework.boot.jetty.actuate.metrics.JettyServerThreadPoolMetricsBinder;
3434
import org.springframework.boot.jetty.actuate.metrics.JettySslHandshakeMetricsBinder;
35-
import org.springframework.boot.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration;
3635
import org.springframework.context.annotation.Bean;
3736

3837
/**
@@ -42,9 +41,9 @@
4241
* @author Chris Bono
4342
* @since 4.0.0
4443
*/
45-
@AutoConfiguration(after = CompositeMeterRegistryAutoConfiguration.class)
44+
@AutoConfiguration(afterName = "org.springframework.boot.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration")
4645
@ConditionalOnWebApplication
47-
@ConditionalOnClass({ JettyServerThreadPoolMetrics.class, Server.class })
46+
@ConditionalOnClass({ JettyServerThreadPoolMetrics.class, Server.class, MeterRegistry.class })
4847
@ConditionalOnBean(MeterRegistry.class)
4948
public class JettyMetricsAutoConfiguration {
5049

0 commit comments

Comments
 (0)