From af5c2360ea88a6447c3714491117e71a50072b14 Mon Sep 17 00:00:00 2001 From: Jon Schneider Date: Mon, 28 Dec 2015 14:31:10 -0600 Subject: [PATCH] Servo and Spectator metrics defer to other Counter/GaugeService implementations --- .../netflix/metrics/servo/ServoMetricsAutoConfiguration.java | 3 +++ .../metrics/spectator/SpectatorMetricsAutoConfiguration.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/metrics/servo/ServoMetricsAutoConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/metrics/servo/ServoMetricsAutoConfiguration.java index 04a0d7b3..091c9738 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/metrics/servo/ServoMetricsAutoConfiguration.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/metrics/servo/ServoMetricsAutoConfiguration.java @@ -15,6 +15,8 @@ package org.springframework.cloud.netflix.metrics.servo; import org.springframework.boot.actuate.autoconfigure.MetricRepositoryAutoConfiguration; import org.springframework.boot.actuate.endpoint.MetricReaderPublicMetrics; +import org.springframework.boot.actuate.metrics.CounterService; +import org.springframework.boot.actuate.metrics.GaugeService; import org.springframework.boot.actuate.metrics.reader.MetricReader; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; @@ -76,6 +78,7 @@ public class ServoMetricsAutoConfiguration { } @Bean + @ConditionalOnMissingBean({ CounterService.class, GaugeService.class }) public ServoMetricServices servoMetricServices(MonitorRegistry monitorRegistry) { return new ServoMetricServices(monitorRegistry); } diff --git a/spring-cloud-netflix-spectator/src/main/java/org/springframework/cloud/netflix/metrics/spectator/SpectatorMetricsAutoConfiguration.java b/spring-cloud-netflix-spectator/src/main/java/org/springframework/cloud/netflix/metrics/spectator/SpectatorMetricsAutoConfiguration.java index 607ba273..bb3b9d12 100644 --- a/spring-cloud-netflix-spectator/src/main/java/org/springframework/cloud/netflix/metrics/spectator/SpectatorMetricsAutoConfiguration.java +++ b/spring-cloud-netflix-spectator/src/main/java/org/springframework/cloud/netflix/metrics/spectator/SpectatorMetricsAutoConfiguration.java @@ -16,6 +16,8 @@ package org.springframework.cloud.netflix.metrics.spectator; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.actuate.autoconfigure.MetricRepositoryAutoConfiguration; import org.springframework.boot.actuate.endpoint.MetricReaderPublicMetrics; +import org.springframework.boot.actuate.metrics.CounterService; +import org.springframework.boot.actuate.metrics.GaugeService; import org.springframework.boot.actuate.metrics.reader.MetricReader; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; @@ -71,6 +73,7 @@ public class SpectatorMetricsAutoConfiguration { } @Bean + @ConditionalOnMissingBean({ CounterService.class, GaugeService.class }) public SpectatorMetricServices spectatorMetricServices(Registry metricRegistry) { return new SpectatorMetricServices(metricRegistry); }