From a32c530c3655bfede6ca206cf8ee76e611471ccf Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 28 Apr 2015 10:34:55 +0100 Subject: [PATCH] Add @Primary to default InMemoryMetricRepository if there is one --- .../autoconfigure/MetricRepositoryAutoConfiguration.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java index 212e11cddb..bb7188c626 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java @@ -47,6 +47,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; import org.springframework.messaging.MessageChannel; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; @@ -158,6 +159,7 @@ public class MetricRepositoryAutoConfiguration { static class LegacyMetricRepositoryConfiguration { @Bean + @Primary public InMemoryMetricRepository actuatorMetricRepository() { return new InMemoryMetricRepository(); }