SpringCloud/spring-cloud-gateway
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updates default metrics prefix to spring.cloud.gateway.

Browse Source 
See gh-1981
This commit is contained in:
spencergibb
2020-10-09 15:58:20 -04:00
parent c3ac033ef0
commit 546083a6e4
3 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/GatewayProperties.java
View File

@@ -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.

10
spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/GatewayMetricsFilter.java
View File

@@ -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<GatewayTagsProvider> tagsProviders) {
this(meterRegistry, tagsProviders, GatewayProperties.Metrics.DEFAULT_PREFIX);
}
public GatewayMetricsFilter(MeterRegistry meterRegistry,
List<GatewayTagsProvider> tagsProviders, String metricsPrefix) {
public GatewayMetricsFilter(MeterRegistry meterRegistry, List<GatewayTagsProvider> tagsProviders,
String metricsPrefix) {
this.meterRegistry = meterRegistry;
this.compositeTagsProvider = tagsProviders.stream().reduce(exchange -> Tags.empty(), GatewayTagsProvider::and);
if (metricsPrefix.endsWith(".")) {

2
spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/GatewayMetricsAutoConfigurationTests.java
View File

@@ -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();
}