diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/metrics/MetricsClientHttpRequestInterceptor.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/metrics/MetricsClientHttpRequestInterceptor.java index 6afe6385..5c43c4eb 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/metrics/MetricsClientHttpRequestInterceptor.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/metrics/MetricsClientHttpRequestInterceptor.java @@ -24,7 +24,6 @@ import org.springframework.http.client.ClientHttpRequestExecution; import org.springframework.http.client.ClientHttpRequestInterceptor; import org.springframework.http.client.ClientHttpResponse; -import com.netflix.servo.MonitorRegistry; import com.netflix.servo.monitor.MonitorConfig; import com.netflix.servo.tag.SmallTagMap; import com.netflix.servo.tag.Tags; @@ -41,18 +40,15 @@ public class MetricsClientHttpRequestInterceptor implements ClientHttpRequestInt * Boot (Actuator) provides a more general purpose abstraction for dimensional metrics * systems, this can be moved there and rewritten against that abstraction. */ - private final MonitorRegistry registry; + private final ServoMonitorCache servoMonitorCache; private final Collection tagProviders; - private final ServoMonitorCache servoMonitorCache; - private final String metricName; - public MetricsClientHttpRequestInterceptor(MonitorRegistry registry, + public MetricsClientHttpRequestInterceptor( Collection tagProviders, ServoMonitorCache servoMonitorCache, String metricName) { - this.registry = registry; this.tagProviders = tagProviders; this.servoMonitorCache = servoMonitorCache; this.metricName = metricName; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/metrics/MetricsInterceptorConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/metrics/MetricsInterceptorConfiguration.java index d5cd7e30..a5364609 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/metrics/MetricsInterceptorConfiguration.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/metrics/MetricsInterceptorConfiguration.java @@ -15,7 +15,6 @@ package org.springframework.cloud.netflix.metrics; import java.util.ArrayList; -import com.netflix.servo.MonitorRegistry; import org.aspectj.lang.JoinPoint; import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Value; @@ -85,9 +84,9 @@ public class MetricsInterceptorConfiguration { @Bean MetricsClientHttpRequestInterceptor spectatorLoggingClientHttpRequestInterceptor( - MonitorRegistry registry, Collection tagProviders, + Collection tagProviders, ServoMonitorCache servoMonitorCache) { - return new MetricsClientHttpRequestInterceptor(registry, tagProviders, + return new MetricsClientHttpRequestInterceptor(tagProviders, servoMonitorCache, this.metricName); }