fix spring_web aop no such method found exception (#376)

Signed-off-by: candyleer <[email protected]>

Author: lican

simpleclient_spring_web/src/main/java/io/prometheus/client/spring/web/MethodTimer.java

@@ -8,8 +8,10 @@
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.context.annotation.Scope;
 import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.util.ReflectionUtils;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 
+import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReadWriteLock;
@@ -46,8 +48,8 @@ private PrometheusTimeMethod getAnnotation(ProceedingJoinPoint pjp) throws NoSuc
         // When target is an AOP interface proxy but annotation is on class method (rather than Interface method).
         final String name = signature.getName();
         final Class[] parameterTypes = signature.getParameterTypes();
-
-        return AnnotationUtils.findAnnotation(pjp.getTarget().getClass().getDeclaredMethod(name, parameterTypes), PrometheusTimeMethod.class);
+        Method method = ReflectionUtils.findMethod(pjp.getTarget().getClass(), name, parameterTypes);
+        return AnnotationUtils.findAnnotation(method, PrometheusTimeMethod.class);
     }
 
     private Summary ensureSummary(ProceedingJoinPoint pjp, String key) throws IllegalStateException {

simpleclient_spring_web/src/test/java/io/prometheus/client/spring/web/MethodTimerTest.java

@@ -24,11 +24,40 @@ public void timeMe() throws Exception {
 
     }
 
+    private class TestCglibClassParent implements Timeable{
+        @PrometheusTimeMethod(name = "test_sub_class", help = "help one sub")
+        public void timeMe() throws Exception {
+            Thread.sleep(20);
+        }
+    }
+
+    /**
+     *  mock cglib proxy by subclass and in this class don't contain timMe() method
+     */
+    private final class MockCglibProxyTestClass extends TestCglibClassParent {
+
+    }
+
     private interface Time2 {
         void timeMe() throws Exception;
         void aSecondMethod() throws Exception;
     }
 
+    @Test
+    public void timeMethodInSubClassModel() throws Exception {
+        Timeable cprime = new MockCglibProxyTestClass();
+        AspectJProxyFactory factory = new AspectJProxyFactory(cprime);
+        factory.addAspect(MethodTimer.class);
+        Timeable proxy = factory.getProxy();
+
+        proxy.timeMe();
+
+        final Double tot = CollectorRegistry.defaultRegistry.getSampleValue("test_sub_class_sum");
+        Assert.assertNotNull(tot);
+        assertEquals(0.02, tot, 0.01);
+    }
+
+
     @Test
     public void timeMethod() throws Exception {
         Timeable cprime = new TestClass();
@@ -187,7 +216,7 @@ private interface SameMethodNameTest {
     @Test
     public void testOverloadedMethodName() throws Exception {
         final int sleep1 = 100, sleep2 = 200;
-        
+
         SameMethodNameTest r = getProxy(new SameMethodNameTest() {
             @Override
             @PrometheusTimeMethod(name="dosomething_one_test_seconds", help = "halp")
@@ -201,7 +230,7 @@ public void doSomething(String s) throws Exception {
                 Thread.sleep(sleep2);
             }
         });
-        
+
         r.doSomething();
         r.doSomething("foobar");