Backport test improvements from 2.0.x to 1.7.x

fixes gh-2943
micrometer-metrics · Jan 5, 2022 · ccd3f38 · ccd3f38
1 parent 988b5bd
commit ccd3f38
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/...meter-core/src/test/java/io/micrometer/core/instrument/binder/jetty/TimedHandlerTest.java b/...meter-core/src/test/java/io/micrometer/core/instrument/binder/jetty/TimedHandlerTest.java
@@ -230,7 +230,7 @@ void testSuspendExpire() throws Exception {
             public void handle(String path, Request request, HttpServletRequest httpRequest, HttpServletResponse httpResponse) throws ServletException {
                 request.setHandled(true);
                 try {
-                    barrier[0].await();
+                    barrier[0].await(5, TimeUnit.SECONDS);
 
                     Thread.sleep(dispatchTime);
 
@@ -243,7 +243,7 @@ public void handle(String path, Request request, HttpServletRequest httpRequest,
                     throw new ServletException(x);
                 } finally {
                     try {
-                        barrier[1].await();
+                        barrier[1].await(5, TimeUnit.SECONDS);
                     } catch (Exception ignored) {
                     }
                 }
@@ -256,7 +256,7 @@ public void handle(String path, Request request, HttpServletRequest httpRequest,
                 "\r\n";
         connector.executeRequest(request);
 
-        barrier[0].await();
+        barrier[0].await(5, TimeUnit.SECONDS);
 
         assertThat(registry.get("jetty.server.dispatches.open").longTaskTimer().activeTasks()).isEqualTo(1);
 
@@ -281,13 +281,13 @@ public void onError(AsyncEvent event) {
             @Override
             public void onComplete(AsyncEvent event) {
                 try {
-                    barrier[2].await();
+                    barrier[2].await(5, TimeUnit.SECONDS);
                 } catch (Exception ignored) {
                 }
             }
         });
 
-        barrier[2].await();
+        barrier[2].await(5, TimeUnit.SECONDS);
 
         assertThat(registry.get("jetty.server.async.expires").counter().count()).isEqualTo(1);
         assertThat(registry.get("jetty.server.dispatches.open").longTaskTimer().activeTasks()).isEqualTo(0);
@@ -308,7 +308,7 @@ void testSuspendComplete() throws Exception {
             public void handle(String path, Request request, HttpServletRequest httpRequest, HttpServletResponse httpResponse) throws ServletException {
                 request.setHandled(true);
                 try {
-                    barrier[0].await();
+                    barrier[0].await(5, TimeUnit.SECONDS);
 
                     Thread.sleep(dispatchTime);
 
@@ -320,7 +320,7 @@ public void handle(String path, Request request, HttpServletRequest httpRequest,
                     throw new ServletException(x);
                 } finally {
                     try {
-                        barrier[1].await();
+                        barrier[1].await(5, TimeUnit.SECONDS);
                     } catch (Exception ignored) {
                     }
                 }
@@ -333,7 +333,7 @@ public void handle(String path, Request request, HttpServletRequest httpRequest,
                 "\r\n";
         connector.executeRequest(request);
 
-        barrier[0].await();
+        barrier[0].await(5, TimeUnit.SECONDS);
         assertThat(registry.get("jetty.server.dispatches.open").longTaskTimer().activeTasks()).isEqualTo(1);
 
         barrier[1].await(5, TimeUnit.SECONDS);
@@ -364,7 +364,7 @@ public void onComplete(AsyncEvent event) {
         long requestTime = 20;
         Thread.sleep(requestTime);
         asyncHolder.get().complete();
-        latch.await();
+        latch.await(5, TimeUnit.SECONDS);
 
         assertThat(registry.get("jetty.server.requests")
                 .tag("outcome", Outcome.SUCCESS.name())

diff --git a/...sey2/src/test/java/io/micrometer/jersey2/server/MetricsRequestEventListenerTimedTest.java b/...sey2/src/test/java/io/micrometer/jersey2/server/MetricsRequestEventListenerTimedTest.java
@@ -31,6 +31,8 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -103,7 +105,7 @@ public void resourcesWithAnnotationAreTimed() {
     }
 
     @Test
-    public void longTaskTimerSupported() throws InterruptedException, ExecutionException {
+    public void longTaskTimerSupported() throws InterruptedException, ExecutionException, TimeoutException {
         final Future<Response> future = target("long-timed").request().async().get();
 
         /*
@@ -112,7 +114,7 @@ public void longTaskTimerSupported() throws InterruptedException, ExecutionExcep
          * assertions below to fail. Thread.sleep() is not an option, so resort
          * to CountDownLatch.)
          */
-        longTaskRequestStartedLatch.await();
+        longTaskRequestStartedLatch.await(5, TimeUnit.SECONDS);
 
         // the request is not timed, yet
         assertThat(registry.find(METRIC_NAME).tags(tagsFrom("/timed", 200)).timer())
@@ -126,7 +128,7 @@ public void longTaskTimerSupported() throws InterruptedException, ExecutionExcep
 
         // finish the long running request
         longTaskRequestReleaseLatch.countDown();
-        future.get();
+        future.get(5, TimeUnit.SECONDS);
 
         // the request is timed after the long running request completed
         assertThat(registry.get(METRIC_NAME)
@@ -137,7 +139,7 @@ public void longTaskTimerSupported() throws InterruptedException, ExecutionExcep
 
     // See gh-2861
     @Test
-    public void longTaskTimerOnlyOneMeter() throws InterruptedException, ExecutionException {
+    public void longTaskTimerOnlyOneMeter() throws InterruptedException, ExecutionException, TimeoutException {
         final Future<Response> future = target("just-long-timed").request().async().get();
 
         /*
@@ -146,7 +148,7 @@ public void longTaskTimerOnlyOneMeter() throws InterruptedException, ExecutionEx
          * assertions below to fail. Thread.sleep() is not an option, so resort
          * to CountDownLatch.)
          */
-        longTaskRequestStartedLatch.await();
+        longTaskRequestStartedLatch.await(5, TimeUnit.SECONDS);
 
         // the long running task is timed
         assertThat(registry.get("long.task.in.request")
@@ -156,7 +158,7 @@ public void longTaskTimerOnlyOneMeter() throws InterruptedException, ExecutionEx
 
         // finish the long running request
         longTaskRequestReleaseLatch.countDown();
-        future.get();
+        future.get(5, TimeUnit.SECONDS);
 
         // no meters registered except the one checked above
         assertThat(registry.getMeters().size()).isOne();