feat: abstract class method obtains the name of the calling class

Author: YongwuHe

arex-instrumentation/dynamic/arex-dynamic-common/src/main/java/io/arex/inst/dynamic/common/DynamicClassExtractor.java

@@ -24,6 +24,7 @@
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Objects;
@@ -74,7 +75,7 @@ public DynamicClassExtractor(Method method, Object[] args, String keyExpression,
         this.requestType = buildRequestType(method);
     }
 
-    public DynamicClassExtractor(Method method, Object[] args) {
+    public DynamicClassExtractor(Method method, Object[] args, Object target) {
         int proceedingJoinPointIndex = proceedingJoinPointIndex(method.getParameterTypes());
         if (proceedingJoinPointIndex != -1) {
             ProceedingJoinPoint proceedingJoinPoint = (ProceedingJoinPoint) args[proceedingJoinPointIndex];
@@ -84,7 +85,7 @@ public DynamicClassExtractor(Method method, Object[] args) {
             this.args = proceedingJoinPoint.getArgs();
             this.requestType = ArrayUtils.toString(this.args, o -> o.getClass().getTypeName());
         } else {
-            this.clazzName = normalizeClassName(method.getDeclaringClass().getName());
+            this.clazzName = normalizeClassName(getCallerClassName(method.getDeclaringClass(), target));
             this.methodName = method.getName();
             this.args = args;
             this.requestType = ArrayUtils.toString(method.getParameterTypes(), obj -> ((Class<?>)obj).getTypeName());
@@ -402,6 +403,17 @@ private int buildNoArgMethodSignatureHash(boolean isNeedResult) {
         return StringUtil.encodeAndHash(String.format("%s_%s_%s", this.clazzName, this.methodName, null));
     }
 
+    private String getCallerClassName(Class<?> clazz, Object target) {
+        if (isAbstractOrInterface(clazz) && target != null) {
+            return target.getClass().getName();
+        }
+        return clazz.getName();
+    }
+
+    private boolean isAbstractOrInterface(Class<?> clazz) {
+        return clazz.isInterface() || Modifier.isAbstract(clazz.getModifiers());
+    }
+
     String normalizeClassName(String className) {
         // ex: com.xxx.xxx.client$$EnhancerBySpringCGLIB$$1e3f5g
         if (StringUtil.isNotEmpty(className) && className.contains("CGLIB$$")) {

arex-instrumentation/dynamic/arex-dynamic-common/src/test/java/io/arex/inst/dynamic/common/DynamicClassExtractorTest.java

@@ -96,7 +96,7 @@ void record(Runnable mocker, Object[] args, Object result, Predicate<Object> pre
                 return null;
             });
             Method testWithArexMock = getMethod(result);
-            DynamicClassExtractor extractor = new DynamicClassExtractor(testWithArexMock, args);
+            DynamicClassExtractor extractor = new DynamicClassExtractor(testWithArexMock, args, null);
             extractor.recordResponse(result);
 
             assertTrue(predicate.test(result));
@@ -125,7 +125,7 @@ void resetMonoResponse() {
             Method testWithArexMock = DynamicClassExtractorTest.class.getDeclaredMethod("testWithArexMock",
                 String.class);
             final Object[] args = {"errorSerialize"};
-            final DynamicClassExtractor extractor = new DynamicClassExtractor(testWithArexMock, args);
+            final DynamicClassExtractor extractor = new DynamicClassExtractor(testWithArexMock, args, null);
             final Predicate<Object> nonNull = Objects::nonNull;
 
             // exception
@@ -427,10 +427,10 @@ void invalidOperation() throws Throwable {
         final Object[] args = {"errorSerialize"};
         ConfigBuilder.create("invalid-operation").enableDebug(true).build();
         Mockito.when(Serializer.serializeWithException(any(), anyString())).thenThrow(new RuntimeException("errorSerialize"));
-        DynamicClassExtractor extractor = new DynamicClassExtractor(testWithArexMock, args);
+        DynamicClassExtractor extractor = new DynamicClassExtractor(testWithArexMock, args, null);
         extractor.recordResponse("errorSerialize");
         // invalid operation return empty
-        DynamicClassExtractor extractor2 = new DynamicClassExtractor(testWithArexMock, args);
+        DynamicClassExtractor extractor2 = new DynamicClassExtractor(testWithArexMock, args, null);
         final Field methodKey = DynamicClassExtractor.class.getDeclaredField("methodKey");
         methodKey.setAccessible(true);
         assertNull(methodKey.get(extractor2));
@@ -442,14 +442,14 @@ void invalidOperation() throws Throwable {
 
         // test getSerializedResult serialize
         Mockito.when(agentSizeOf.checkMemorySizeLimit(any(), any(long.class))).thenReturn(true);
-        extractor = new DynamicClassExtractor(testWithArexMock, args);
+        extractor = new DynamicClassExtractor(testWithArexMock, args, null);
         assertNull(extractor.getSerializedResult());
     }
 
     @Test
     void emptyMethodKeyAndExceedSize() throws NoSuchMethodException {
         Method testEmptyArgs = DynamicClassExtractorTest.class.getDeclaredMethod("invalidOperation");
-        DynamicClassExtractor extractor = new DynamicClassExtractor(testEmptyArgs, new Object[0]);
+        DynamicClassExtractor extractor = new DynamicClassExtractor(testEmptyArgs, new Object[0], null);
         assertDoesNotThrow(() -> extractor.recordResponse(new int[1001]));
     }
 
@@ -566,12 +566,31 @@ void testProceedingJointPoint() throws Throwable {
         Mockito.when(joinPoint.getSignature()).thenReturn(signature);
         String arg1 = "arg1";
         Mockito.when(joinPoint.getArgs()).thenReturn(new Object[]{arg1});
-        DynamicClassExtractor extractor = new DynamicClassExtractor(testProceedingJointPoint, new Object[]{joinPoint});
+        DynamicClassExtractor extractor = new DynamicClassExtractor(testProceedingJointPoint, new Object[]{joinPoint}, null);
         Field requestType = DynamicClassExtractor.class.getDeclaredField("requestType");
         requestType.setAccessible(true);
         assertEquals("[\"java.lang.String\"]", requestType.get(extractor));
     }
 
     public void testProceedingJointPoint(ProceedingJoinPoint joinPoint) {
     }
+
+    @Test
+    void testRecordWithAbstractClassMethod() throws Exception {
+        CacheClass cacheClass = new CacheClass();
+        Method abstractMethod = AbstractClass.class.getDeclaredMethod("abstractMethod", String.class);
+        Field clazzName = DynamicClassExtractor.class.getDeclaredField("clazzName");
+        clazzName.setAccessible(true);
+        DynamicClassExtractor extractor = new DynamicClassExtractor(abstractMethod, new Object[]{"arg"}, cacheClass);
+        assertEquals(CacheClass.class.getName(), clazzName.get(extractor));
+    }
+
+    static abstract class AbstractClass {
+        public String abstractMethod(String arg) {
+            return arg;
+        }
+    }
+
+    static class CacheClass extends AbstractClass {
+    }
 }

arex-instrumentation/dynamic/arex-dynamic/src/main/java/io/arex/inst/dynamic/DynamicClassInstrumentation.java

@@ -143,6 +143,7 @@ public static final class MethodAdvice {
 
         @Advice.OnMethodEnter(skipOn = Advice.OnNonDefaultValue.class, suppress = Throwable.class)
         public static boolean onEnter(@Advice.Origin Method method,
+            @Advice.This(optional = true) Object target,
             @Advice.AllArguments Object[] args,
             @Advice.Local("extractor") DynamicClassExtractor extractor,
             @Advice.Local("mockResult") MockResult mockResult) {
@@ -153,7 +154,7 @@ public static boolean onEnter(@Advice.Origin Method method,
                 if (void.class.isAssignableFrom(method.getReturnType())) {
                     return ContextManager.needReplay();
                 }
-                extractor = new DynamicClassExtractor(method, args);
+                extractor = new DynamicClassExtractor(method, args, target);
             }
             if (ContextManager.needReplay()) {
                 mockResult = extractor.replay();

arex-instrumentation/dynamic/arex-dynamic/src/test/java/io/arex/inst/dynamic/DynamicClassInstrumentationTest.java

@@ -179,13 +179,13 @@ void onEnter() throws NoSuchMethodException {
             Mockito.when(ContextManager.needRecordOrReplay()).thenReturn(true);
             Mockito.when(ContextManager.needRecord()).thenReturn(true);
             DynamicClassExtractor extractor = new DynamicClassExtractor(test1, new Object[]{"mock"}, "#val", null);
-            boolean actualResult = DynamicClassInstrumentation.MethodAdvice.onEnter(test1, new Object[]{ "name", 18 }, extractor, null);
+            boolean actualResult = DynamicClassInstrumentation.MethodAdvice.onEnter(test1, null, new Object[]{ "name", 18 }, extractor, null);
             assertFalse(actualResult);
 
             // replay
             Mockito.when(ContextManager.needRecord()).thenReturn(false);
             Mockito.when(ContextManager.needReplay()).thenReturn(true);
-            actualResult = DynamicClassInstrumentation.MethodAdvice.onEnter(test1, new Object[]{ "name", 18 }, extractor, null);
+            actualResult = DynamicClassInstrumentation.MethodAdvice.onEnter(test1, null, new Object[]{ "name", 18 }, extractor, null);
             assertTrue(actualResult);
         }
     }