From ed7b333138b028ee99c27bcce24ac6368d855312 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CJakub?= Date: Thu, 23 Jun 2022 15:15:13 +0200 Subject: [PATCH] Add missing descriptions for HTTP Server and Data repositories metrics See gh-31516 --- .../data/MetricsRepositoryMethodInvocationListener.java | 5 +++-- .../metrics/web/reactive/server/MetricsWebFilter.java | 3 ++- .../actuate/metrics/web/servlet/WebMvcMetricsFilter.java | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/data/MetricsRepositoryMethodInvocationListener.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/data/MetricsRepositoryMethodInvocationListener.java index add03dc691..5ebeaf1104 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/data/MetricsRepositoryMethodInvocationListener.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/data/MetricsRepositoryMethodInvocationListener.java @@ -83,8 +83,9 @@ public class MetricsRepositoryMethodInvocationListener implements RepositoryMeth Set annotations = TimedAnnotations.get(invocation.getMethod(), invocation.getRepositoryInterface()); Iterable tags = this.tagsProvider.repositoryTags(invocation); long duration = invocation.getDuration(TimeUnit.NANOSECONDS); - AutoTimer.apply(this.autoTimer, this.metricName, annotations, (builder) -> builder.tags(tags) - .register(this.registrySupplier.get()).record(duration, TimeUnit.NANOSECONDS)); + AutoTimer.apply(this.autoTimer, this.metricName, annotations, + (builder) -> builder.description("Duration of repository invocations").tags(tags) + .register(this.registrySupplier.get()).record(duration, TimeUnit.NANOSECONDS)); } } 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 357ca2f760..0f41b50fd7 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 @@ -109,7 +109,8 @@ public class MetricsWebFilter implements WebFilter { Iterable tags = this.tagsProvider.httpRequestTags(exchange, cause); long duration = System.nanoTime() - start; AutoTimer.apply(this.autoTimer, this.metricName, annotations, - (builder) -> builder.tags(tags).register(this.registry).record(duration, TimeUnit.NANOSECONDS)); + (builder) -> builder.description("Duration of HTTP server request handling").tags(tags) + .register(this.registry).record(duration, TimeUnit.NANOSECONDS)); } catch (Exception ex) { logger.warn("Failed to record timer metrics", ex); diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilter.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilter.java index 8838253d0d..2f2a0c8497 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilter.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilter.java @@ -158,7 +158,8 @@ public class WebMvcMetricsFilter extends OncePerRequestFilter { private Timer getTimer(Builder builder, Object handler, HttpServletRequest request, HttpServletResponse response, Throwable exception) { - return builder.tags(this.tagsProvider.getTags(request, response, handler, exception)).register(this.registry); + return builder.description("Duration of HTTP server request handling") + .tags(this.tagsProvider.getTags(request, response, handler, exception)).register(this.registry); } /**