Merge branch '1.13.x' into 1.14.x

Author: shakuzen

micrometer-jetty12/src/main/java/io/micrometer/jetty12/server/TimedHandler.java

@@ -135,6 +135,8 @@ private void stopRequestTiming(Request request) {
         request.removeAttribute(SAMPLE_REQUEST_LONG_TASK_TIMER_ATTRIBUTE);
 
         requestSample.stop();
+
+        shutdown.check();
     }
 
     private void beginHandlerTiming(Request request) {

micrometer-jetty12/src/test/java/io/micrometer/jetty12/server/TimedHandlerTest.java

@@ -25,7 +25,6 @@
 import org.eclipse.jetty.server.*;
 import org.eclipse.jetty.util.BufferUtil;
 import org.eclipse.jetty.util.Callback;
-import org.eclipse.jetty.util.component.Graceful;
 import org.eclipse.jetty.util.component.LifeCycle;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -166,13 +165,11 @@ public boolean handle(Request request, Response response, Callback callback) {
 
             // initiate a shutdown
             Future<Void> shutdownFuture = timedHandler.shutdown();
-            Graceful.Shutdown shutdown = timedHandler.getShutdown();
             assertThat(shutdownFuture.isDone()).isFalse();
 
             // delay half what the handler is sleeping
             Thread.sleep(delay / 2);
             // response is still active, so don't shutdown.
-            shutdown.check();
             assertThat(shutdownFuture.isDone()).isFalse();
 
             // Read response to ensure it is done
@@ -181,7 +178,6 @@ public boolean handle(Request request, Response response, Callback callback) {
             assertThat(response1.getContent()).isEmpty();
 
             Thread.sleep(delay);
-            shutdown.check();
             assertThat(shutdownFuture.isDone()).isTrue();
         }
     }