Merge branch '1.9.x' into 1.12.x

Author: jonatan-ivanov

micrometer-core/src/main/java/io/micrometer/core/aop/TimedAspect.java

@@ -216,19 +216,19 @@ private Object processWithTimer(ProceedingJoinPoint pjp, Timed timed, String met
                 return ((CompletionStage<?>) pjp.proceed()).whenComplete(
                         (result, throwable) -> record(pjp, timed, metricName, sample, getExceptionTag(throwable)));
             }
-            catch (Exception ex) {
-                record(pjp, timed, metricName, sample, ex.getClass().getSimpleName());
-                throw ex;
+            catch (Throwable e) {
+                record(pjp, timed, metricName, sample, e.getClass().getSimpleName());
+                throw e;
             }
         }
 
         String exceptionClass = DEFAULT_EXCEPTION_TAG_VALUE;
         try {
             return pjp.proceed();
         }
-        catch (Exception ex) {
-            exceptionClass = ex.getClass().getSimpleName();
-            throw ex;
+        catch (Throwable e) {
+            exceptionClass = e.getClass().getSimpleName();
+            throw e;
         }
         finally {
             record(pjp, timed, metricName, sample, exceptionClass);
@@ -283,9 +283,9 @@ private Object processWithLongTaskTimer(ProceedingJoinPoint pjp, Timed timed, St
                 return ((CompletionStage<?>) pjp.proceed())
                     .whenComplete((result, throwable) -> sample.ifPresent(this::stopTimer));
             }
-            catch (Exception ex) {
+            catch (Throwable e) {
                 sample.ifPresent(this::stopTimer);
-                throw ex;
+                throw e;
             }
         }
 

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

@@ -25,9 +25,9 @@
 import io.micrometer.core.instrument.Timer;
 import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
 import io.micrometer.core.instrument.distribution.pause.PauseDetector;
-import io.micrometer.core.instrument.search.MeterNotFoundException;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
 import org.aspectj.lang.ProceedingJoinPoint;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
@@ -73,7 +73,7 @@ void timeMethodWithSkipPredicate() {
 
         service.call();
 
-        assertThat(registry.find("call").timer()).isNull();
+        assertThat(registry.getMeters()).isEmpty();
     }
 
     @Test
@@ -91,8 +91,7 @@ void timeMethodWithLongTaskTimer() {
             .tag("class", getClass().getName() + "$TimedService")
             .tag("method", "longCall")
             .tag("extra", "tag")
-            .longTaskTimers()
-            .size()).isEqualTo(1);
+            .longTaskTimers()).hasSize(1);
     }
 
     @Test
@@ -106,13 +105,7 @@ void timeMethodFailure() {
 
         service.call();
 
-        assertThatExceptionOfType(MeterNotFoundException.class).isThrownBy(() -> {
-            failingRegistry.get("call")
-                .tag("class", getClass().getName() + "$TimedService")
-                .tag("method", "call")
-                .tag("extra", "tag")
-                .timer();
-        });
+        assertThat(failingRegistry.getMeters()).isEmpty();
     }
 
     @Test
@@ -126,13 +119,50 @@ void timeMethodFailureWithLongTaskTimer() {
 
         service.longCall();
 
-        assertThatExceptionOfType(MeterNotFoundException.class).isThrownBy(() -> {
-            failingRegistry.get("longCall")
-                .tag("class", getClass().getName() + "$TimedService")
-                .tag("method", "longCall")
-                .tag("extra", "tag")
-                .longTaskTimer();
-        });
+        assertThat(failingRegistry.getMeters()).isEmpty();
+    }
+
+    @Test
+    void timeMethodWithError() {
+        MeterRegistry registry = new SimpleMeterRegistry();
+
+        AspectJProxyFactory pf = new AspectJProxyFactory(new TimedService());
+        pf.addAspect(new TimedAspect(registry));
+
+        TimedService service = pf.getProxy();
+
+        assertThat(registry.getMeters()).isEmpty();
+
+        assertThatThrownBy(service::callRaisingError).isInstanceOf(TestError.class);
+
+        assertThat(registry.get("callRaisingError")
+            .tag("class", getClass().getName() + "$TimedService")
+            .tag("method", "callRaisingError")
+            .tag("extra", "tag")
+            .tag("exception", "TestError")
+            .timer()
+            .count()).isEqualTo(1);
+    }
+
+    @Test
+    void timeMethodWithErrorAndLongTaskTimer() {
+        MeterRegistry registry = new SimpleMeterRegistry();
+
+        AspectJProxyFactory pf = new AspectJProxyFactory(new TimedService());
+        pf.addAspect(new TimedAspect(registry));
+
+        TimedService service = pf.getProxy();
+
+        assertThat(registry.getMeters()).isEmpty();
+
+        assertThatThrownBy(service::longCallRaisingError).isInstanceOf(TestError.class);
+
+        assertThat(registry.get("longCallRaisingError")
+            .tag("class", getClass().getName() + "$TimedService")
+            .tag("method", "longCallRaisingError")
+            .tag("extra", "tag")
+            .longTaskTimer()
+            .activeTasks()).isEqualTo(0);
     }
 
     @Test
@@ -147,12 +177,7 @@ void timeMethodWhenCompleted() {
         GuardedResult guardedResult = new GuardedResult();
         CompletableFuture<?> completableFuture = service.call(guardedResult);
 
-        assertThat(registry.find("call")
-            .tag("class", getClass().getName() + "$AsyncTimedService")
-            .tag("method", "call")
-            .tag("extra", "tag")
-            .tag("exception", "none")
-            .timer()).isNull();
+        assertThat(registry.getMeters()).isEmpty();
 
         guardedResult.complete();
         completableFuture.join();
@@ -178,21 +203,16 @@ void timeMethodWhenCompletedExceptionally() {
         GuardedResult guardedResult = new GuardedResult();
         CompletableFuture<?> completableFuture = service.call(guardedResult);
 
-        assertThat(registry.find("call")
-            .tag("class", getClass().getName() + "$AsyncTimedService")
-            .tag("method", "call")
-            .tag("extra", "tag")
-            .tag("exception", "NullPointerException")
-            .timer()).isNull();
+        assertThat(registry.getMeters()).isEmpty();
 
-        guardedResult.complete(new NullPointerException());
+        guardedResult.complete(new IllegalStateException("simulated"));
         catchThrowableOfType(completableFuture::join, CompletionException.class);
 
         assertThat(registry.get("call")
             .tag("class", getClass().getName() + "$AsyncTimedService")
             .tag("method", "call")
             .tag("extra", "tag")
-            .tag("exception", "NullPointerException")
+            .tag("exception", "IllegalStateException")
             .timer()
             .count()).isEqualTo(1);
     }
@@ -271,12 +291,7 @@ void timeMethodFailureWhenCompletedExceptionally() {
         guardedResult.complete();
         completableFuture.join();
 
-        assertThatExceptionOfType(MeterNotFoundException.class).isThrownBy(() -> failingRegistry.get("call")
-            .tag("class", getClass().getName() + "$AsyncTimedService")
-            .tag("method", "call")
-            .tag("extra", "tag")
-            .tag("exception", "none")
-            .timer());
+        assertThat(failingRegistry.getMeters()).isEmpty();
     }
 
     @Test
@@ -293,13 +308,7 @@ void timeMethodFailureWithLongTaskTimerWhenCompleted() {
         guardedResult.complete();
         completableFuture.join();
 
-        assertThatExceptionOfType(MeterNotFoundException.class).isThrownBy(() -> {
-            failingRegistry.get("longCall")
-                .tag("class", getClass().getName() + "$AsyncTimedService")
-                .tag("method", "longCall")
-                .tag("extra", "tag")
-                .longTaskTimer();
-        });
+        assertThat(failingRegistry.getMeters()).isEmpty();
     }
 
     @Test
@@ -365,16 +374,11 @@ void timeClassFailure() {
 
         service.call();
 
-        assertThatExceptionOfType(MeterNotFoundException.class).isThrownBy(() -> {
-            failingRegistry.get("call")
-                .tag("class", "io.micrometer.core.aop.TimedAspectTest$TimedClass")
-                .tag("method", "call")
-                .tag("extra", "tag")
-                .timer();
-        });
+        assertThat(failingRegistry.getMeters()).isEmpty();
     }
 
-    static class MeterTagsTests {
+    @Nested
+    class MeterTagsTests {
 
         ValueResolver valueResolver = parameter -> "Value from myCustomTagValueResolver [" + parameter + "]";
 
@@ -569,7 +573,7 @@ public void subMethod(@MeterTag("subTag") String foo) {
 
     }
 
-    private final class FailingMeterRegistry extends SimpleMeterRegistry {
+    private static final class FailingMeterRegistry extends SimpleMeterRegistry {
 
         private FailingMeterRegistry() {
             super();
@@ -579,14 +583,14 @@ private FailingMeterRegistry() {
         @Override
         protected Timer newTimer(@NonNull Id id, @NonNull DistributionStatisticConfig distributionStatisticConfig,
                 @NonNull PauseDetector pauseDetector) {
-            throw new RuntimeException();
+            throw new RuntimeException("FailingMeterRegistry");
         }
 
         @NonNull
         @Override
         protected LongTaskTimer newLongTaskTimer(@Nonnull Id id,
                 @Nonnull DistributionStatisticConfig distributionStatisticConfig) {
-            throw new RuntimeException();
+            throw new RuntimeException("FailingMeterRegistry");
         }
 
     }
@@ -601,6 +605,16 @@ void call() {
         void longCall() {
         }
 
+        @Timed(value = "callRaisingError", extraTags = { "extra", "tag" })
+        void callRaisingError() {
+            throw new TestError();
+        }
+
+        @Timed(value = "longCallRaisingError", extraTags = { "extra", "tag" }, longTask = true)
+        void longCallRaisingError() {
+            throw new TestError();
+        }
+
     }
 
     static class AsyncTimedService {
@@ -675,4 +689,8 @@ public void call() {
 
     }
 
+    static class TestError extends Error {
+
+    }
+
 }