From 3d7e5e3abd5f09a1baf1dd060d5ed3bb6dc99490 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 9 Apr 2021 17:39:11 -0700 Subject: [PATCH] Polish --- .../boot/actuate/metrics/http/package-info.java | 2 +- .../web/reactive/server/DefaultWebFluxTagsProvider.java | 9 ++++++--- .../metrics/web/reactive/server/MetricsWebFilter.java | 3 ++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/http/package-info.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/http/package-info.java index 3675c4bbe7..09dad027ed 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/http/package-info.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/http/package-info.java @@ -15,6 +15,6 @@ */ /** - * Support classes HTTP-related metrics. + * Support classes for HTTP-related metrics. */ package org.springframework.boot.actuate.metrics.http; diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/server/DefaultWebFluxTagsProvider.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/server/DefaultWebFluxTagsProvider.java index d87285a646..c3407a3da7 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/server/DefaultWebFluxTagsProvider.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/server/DefaultWebFluxTagsProvider.java @@ -70,9 +70,12 @@ public class DefaultWebFluxTagsProvider implements WebFluxTagsProvider { @Override public Iterable httpRequestTags(ServerWebExchange exchange, Throwable exception) { - Tags tags = Tags.of(WebFluxTags.method(exchange), WebFluxTags.uri(exchange, this.ignoreTrailingSlash), - WebFluxTags.exception(exception), WebFluxTags.status(exchange), - WebFluxTags.outcome(exchange, exception)); + Tags tags = Tags.empty(); + tags = tags.and(WebFluxTags.method(exchange)); + tags = tags.and(WebFluxTags.uri(exchange, this.ignoreTrailingSlash)); + tags = tags.and(WebFluxTags.exception(exception)); + tags = tags.and(WebFluxTags.status(exchange)); + tags = tags.and(WebFluxTags.outcome(exchange, exception)); for (WebFluxTagsContributor contributor : this.contributors) { tags = tags.and(contributor.httpRequestTags(exchange, exception)); } diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/server/MetricsWebFilter.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/server/MetricsWebFilter.java index 47f21a4db0..c34f0f4979 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/server/MetricsWebFilter.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/server/MetricsWebFilter.java @@ -41,7 +41,8 @@ import org.springframework.web.server.WebFilter; import org.springframework.web.server.WebFilterChain; /** - * Intercepts incoming HTTP requests handled by Spring WebFlux handlers. + * Intercepts incoming HTTP requests handled by Spring WebFlux handlers and records + * metrics about execution time and results. * * @author Jon Schneider * @author Brian Clozel