Don't wrap exceptions thrown inside measured method

- closes gh-7

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.2.2
+- Don't wrap exceptions thrown inside measured code (closes gh-7)
+
 ## 0.2.1
 - Fix autoconfig
 - Fix finding implementation method by including parameter types

README.md

@@ -15,13 +15,13 @@ Maven
 <dependency>
     <groupId>eu.hinsch</groupId>
     <artifactId>spring-boot-execution-metric</artifactId>
-    <version>0.2.1</version>
+    <version>0.2.2</version>
 </dependency>
 ```
 
 Gradle
 ```groovy
-compile 'eu.hinsch:spring-boot-execution-metric:0.2.1'
+compile 'eu.hinsch:spring-boot-execution-metric:0.2.2'
 ```
 
 ### Use with AOP / Annotations

build.gradle

@@ -16,7 +16,7 @@ apply plugin: 'idea'
 apply plugin: 'jacoco'
 apply plugin: 'com.github.kt3k.coveralls'
 
-version = '0.2.1'
+version = '0.2.2'
 group = 'eu.hinsch'
 
 jar {

src/main/java/eu/hinsch/spring/boot/actuator/metric/ExecutionMetricAspect.java

@@ -41,14 +41,19 @@ public Object measure(ProceedingJoinPoint joinPoint) throws Throwable {
         SupplierMetric<Object> supplierMetric = store.computeIfAbsent(metricName,
                 (name) -> factory.supplierMetric(name, targetLogger, executionMetric.loglevel()));
 
-        return supplierMetric.measure(() -> {
-            try {
-                return joinPoint.proceed();
-            } catch (Throwable throwable) {
-                throw new RuntimeException("error invoking method", throwable);
-            }
-        });
-
+        // TODO clean up exception handling
+        try {
+            return supplierMetric.measure(() -> {
+                try {
+                    return joinPoint.proceed();
+                } catch (Throwable throwable) {
+                    throw new WrapperException(throwable);
+                }
+            });
+        }
+        catch (WrapperException e) {
+            throw e.getCause();
+        }
     }
 
     private Class getClassForLogger(ProceedingJoinPoint joinPoint) throws Exception {
@@ -72,4 +77,10 @@ private ExecutionMetric getExecutionMetric(ProceedingJoinPoint joinPoint) throws
         }
         return executionMetric;
     }
+
+    private static class WrapperException extends RuntimeException {
+        public WrapperException(Throwable t) {
+            super(t);
+        }
+    }
 }