Merge branch '1.9.x' into 1.12.x

Author: jonatan-ivanov

micrometer-core/src/test/java/io/micrometer/core/aop/TimedAspectTest.java

@@ -206,7 +206,7 @@ void timeMethodWhenCompletedExceptionally() {
         assertThat(registry.getMeters()).isEmpty();
 
         guardedResult.complete(new IllegalStateException("simulated"));
-        catchThrowableOfType(completableFuture::join, CompletionException.class);
+        assertThatThrownBy(completableFuture::join).isInstanceOf(CompletionException.class);
 
         assertThat(registry.get("call")
             .tag("class", getClass().getName() + "$AsyncTimedService")
@@ -266,8 +266,8 @@ void timeMethodWithLongTaskTimerWhenCompletedExceptionally() {
             .longTaskTimer()
             .activeTasks()).isEqualTo(1);
 
-        guardedResult.complete(new NullPointerException());
-        catchThrowableOfType(completableFuture::join, CompletionException.class);
+        guardedResult.complete(new IllegalStateException("simulated"));
+        assertThatThrownBy(completableFuture::join).isInstanceOf(CompletionException.class);
 
         assertThat(registry.get("longCall")
             .tag("class", getClass().getName() + "$AsyncTimedService")
@@ -341,7 +341,7 @@ void timeClassWithSkipPredicate() {
 
         service.call();
 
-        assertThat(registry.find("call").timer()).isNull();
+        assertThat(registry.getMeters()).isEmpty();
     }
 
     @Test