Tweak conditions on metric export to make it easier to override

Eviradnus · May 29, 2015 · a49901f · a49901f
1 parent 88c640e
commit a49901f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...in/java/org/springframework/boot/actuate/autoconfigure/MetricExportAutoConfiguration.java b/...in/java/org/springframework/boot/actuate/autoconfigure/MetricExportAutoConfiguration.java
@@ -64,7 +64,7 @@ public class MetricExportAutoConfiguration {
 	private MetricsEndpointMetricReader endpointReader;
 
 	@Bean
-	@ConditionalOnMissingBean
+	@ConditionalOnMissingBean(name = "metricWritersMetricExporter")
 	public SchedulingConfigurer metricWritersMetricExporter() {
 
 		Map<String, MetricWriter> writers = new HashMap<String, MetricWriter>();

diff --git a/...ava/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java b/...ava/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java
@@ -90,7 +90,7 @@ public class MetricRepositoryAutoConfiguration {
 	static class LegacyMetricServicesConfiguration {
 
 		@Autowired
-		@ActuatorMetricReader
+		@ActuatorMetricWriter
 		private MetricWriter writer;
 
 		@Bean
@@ -147,11 +147,12 @@ public GaugeService gaugeService(GaugeBuffers writer) {
 
 	@Configuration
 	@ConditionalOnJava(value = JavaVersion.EIGHT, range = Range.OLDER_THAN)
-	@ConditionalOnMissingBean(MetricRepository.class)
+	@ConditionalOnMissingBean(name = "actuatorMetricRepository")
 	static class LegacyMetricRepositoryConfiguration {
 
 		@Bean
 		@ActuatorMetricReader
+		@ActuatorMetricWriter
 		public InMemoryMetricRepository actuatorMetricRepository() {
 			return new InMemoryMetricRepository();
 		}