From 70c1f8e7dfca3f272d44a18b5b1272230861a30a Mon Sep 17 00:00:00 2001 From: Yanming Zhou Date: Thu, 26 Sep 2024 09:30:57 +0800 Subject: [PATCH] Configure sensible order for metrics aspects See https://github.com/spring-projects/spring-framework/issues/33595 --- .../metrics/MetricsAspectsAutoConfiguration.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAspectsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAspectsAutoConfiguration.java index 959789adfd50..b99a8a69e747 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAspectsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAspectsAutoConfiguration.java @@ -33,12 +33,15 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Conditional; +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; /** * {@link EnableAutoConfiguration Auto-configuration} for Micrometer-based metrics * aspects. * * @author Jonatan Ivanov + * @author Yanming Zhou * @since 3.2.0 */ @AutoConfiguration(after = { MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class }) @@ -47,12 +50,14 @@ @ConditionalOnBean(MeterRegistry.class) public class MetricsAspectsAutoConfiguration { + @Order(Ordered.HIGHEST_PRECEDENCE + 10) @Bean @ConditionalOnMissingBean CountedAspect countedAspect(MeterRegistry registry) { return new CountedAspect(registry); } + @Order(Ordered.HIGHEST_PRECEDENCE + 10) @Bean @ConditionalOnMissingBean TimedAspect timedAspect(MeterRegistry registry,