Merge branch '2.6.x' into 2.7.x

Closes gh-31706

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/data/MetricsRepositoryMethodInvocationListener.java

@@ -68,8 +68,9 @@ public class MetricsRepositoryMethodInvocationListener implements RepositoryMeth
 		Set<Timed> annotations = TimedAnnotations.get(invocation.getMethod(), invocation.getRepositoryInterface());
 		Iterable<Tag> 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));
 	}
 
 }

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/server/MetricsWebFilter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -109,7 +109,8 @@ public class MetricsWebFilter implements WebFilter {
 			Iterable<Tag> 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);

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -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);
 	}
 
 	/**