Merge branch '2.4.x' into 2.5.x

Closes gh-27301
2021-07-13 12:18:07 +01:00 · 2021-07-13 12:18:07 +01:00 · d9e525c326
parent 72f5995208 2354dd5ccb
commit d9e525c326
1 changed files with 6 additions and 0 deletions
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/metrics.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/metrics.adoc
@ -943,6 +943,12 @@ To disable the auto-configured connection pool metrics, set the following proper



+[[actuator.metrics.supported.jetty]]
+==== Jetty Metrics
+Auto-configuration will bind metrics for Jetty's `ThreadPool` using Micrometer's `JettyServerThreadPoolMetrics`.
+
+
+
 [[actuator.metrics.supported.timed-annotation]]
 ==== @Timed Annotation Support
 The `@Timed` annotation from the `io.micrometer.core.annotation` package can be used with several of the supported technologies listed above.