From 546083a6e49ded35c2fb041c4e5f38d4b765039f Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 9 Oct 2020 15:58:20 -0400 Subject: [PATCH] Updates default metrics prefix to spring.cloud.gateway. See gh-1981 --- .../cloud/gateway/config/GatewayProperties.java | 2 +- .../cloud/gateway/filter/GatewayMetricsFilter.java | 10 ++-------- .../config/GatewayMetricsAutoConfigurationTests.java | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/GatewayProperties.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/GatewayProperties.java index 2afbb649..99464654 100644 --- a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/GatewayProperties.java +++ b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/GatewayProperties.java @@ -127,7 +127,7 @@ public class GatewayProperties { /** * Default metrics prefix. */ - public static final String DEFAULT_PREFIX = "gateway"; + public static final String DEFAULT_PREFIX = "spring.cloud.gateway"; /** * Enables the collection of metrics data. diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/GatewayMetricsFilter.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/GatewayMetricsFilter.java index cd2a0193..298547b7 100644 --- a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/GatewayMetricsFilter.java +++ b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/GatewayMetricsFilter.java @@ -26,7 +26,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import reactor.core.publisher.Mono; -import org.springframework.cloud.gateway.config.GatewayProperties; import org.springframework.cloud.gateway.support.tagsprovider.GatewayTagsProvider; import org.springframework.core.Ordered; import org.springframework.http.server.reactive.ServerHttpResponse; @@ -46,13 +45,8 @@ public class GatewayMetricsFilter implements GlobalFilter, Ordered { private final String metricsPrefix; - @Deprecated - public GatewayMetricsFilter(MeterRegistry meterRegistry, List tagsProviders) { - this(meterRegistry, tagsProviders, GatewayProperties.Metrics.DEFAULT_PREFIX); - } - - public GatewayMetricsFilter(MeterRegistry meterRegistry, - List tagsProviders, String metricsPrefix) { + public GatewayMetricsFilter(MeterRegistry meterRegistry, List tagsProviders, + String metricsPrefix) { this.meterRegistry = meterRegistry; this.compositeTagsProvider = tagsProviders.stream().reduce(exchange -> Tags.empty(), GatewayTagsProvider::and); if (metricsPrefix.endsWith(".")) { diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/GatewayMetricsAutoConfigurationTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/GatewayMetricsAutoConfigurationTests.java index 23224a5a..95d6cd83 100644 --- a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/GatewayMetricsAutoConfigurationTests.java +++ b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/GatewayMetricsAutoConfigurationTests.java @@ -54,7 +54,7 @@ public class GatewayMetricsAutoConfigurationTests { @Test public void gatewayMetricsBeansExists() { assertThat(filter).isNotNull(); - assertThat(filter.getMetricsPrefix()).isEqualTo("gateway"); + assertThat(filter.getMetricsPrefix()).isEqualTo("spring.cloud.gateway"); assertThat(tagsProviders).isNotEmpty(); }