Merge branch '2.5.x'

Closes gh-27302
2021-07-13 12:18:26 +01:00 · 2021-07-13 12:18:26 +01:00 · d7fd675f58
parent fb8c8afc85 d9e525c326
commit d7fd675f58
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
@ -951,6 +951,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.