feat: remove spring cache dynamic class configuration restrictions (#444)

Author: YongwuHe

arex-instrumentation/dynamic/arex-cache/src/main/java/io/arex/inst/cache/spring/SpringCacheAdviceHelper.java

@@ -5,6 +5,7 @@
 import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
 
 import io.arex.agent.bootstrap.model.MockResult;
+import io.arex.inst.cache.util.CacheLoaderUtil;
 import io.arex.inst.dynamic.common.DynamicClassExtractor;
 import io.arex.inst.extension.MethodInstrumentation;
 import io.arex.inst.extension.TypeInstrumentation;
@@ -46,7 +47,7 @@ public static boolean onEnter(@Advice.Argument(2) Method method,
                 return false;
             }
 
-            if (SpringCacheAdviceHelper.needRecordOrReplay(method)) {
+            if (CacheLoaderUtil.needRecordOrReplay(method)) {
                 Cacheable cacheable = method.getDeclaredAnnotation(Cacheable.class);
                 String keyExpression = cacheable != null ? cacheable.key() : null;
                 extractor = new DynamicClassExtractor(method, args, keyExpression, null);

arex-instrumentation/dynamic/arex-cache/src/main/java/io/arex/inst/cache/spring/SpringCacheInstrumentation.java

@@ -7,6 +7,7 @@
 import io.arex.inst.runtime.log.LogManager;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -116,12 +117,21 @@ public static boolean needRecordOrReplay(Object cacheLoader) {
         if (ArrayUtils.isEmpty(coveragePackages)){
             return false;
         }
-        String loaderClassName = MapUtils.getString(NO_REFERENCE_MAP, System.identityHashCode(cacheLoader), cacheLoader.getClass().getName());
+        String loaderClassName = getClassName(cacheLoader);
         for (String packageName : coveragePackages) {
             if (StringUtil.startWith(loaderClassName, packageName)) {
                 return true;
             }
         }
         return false;
     }
+
+    private static String getClassName(Object cacheLoader) {
+        // spring cache
+        if (cacheLoader instanceof Method) {
+            return ((Method) cacheLoader).getDeclaringClass().getName();
+        }
+        // caffeine/guava cache
+        return MapUtils.getString(NO_REFERENCE_MAP, System.identityHashCode(cacheLoader), cacheLoader.getClass().getName());
+    }
 }

arex-instrumentation/dynamic/arex-cache/src/main/java/io/arex/inst/cache/util/CacheLoaderUtil.java

@@ -5,6 +5,7 @@
 
 import io.arex.agent.bootstrap.model.MockResult;
 import io.arex.inst.cache.TestArexMock;
+import io.arex.inst.cache.util.CacheLoaderUtil;
 import io.arex.inst.dynamic.common.DynamicClassExtractor;
 import io.arex.inst.extension.MethodInstrumentation;
 import io.arex.inst.runtime.context.ContextManager;
@@ -31,7 +32,7 @@ static void setUp() {
         Mockito.mockStatic(ContextManager.class);
         Mockito.mockStatic(MockUtils.class);
         Mockito.mockStatic(RepeatedCollectManager.class);
-        Mockito.mockStatic(SpringCacheAdviceHelper.class);
+        Mockito.mockStatic(CacheLoaderUtil.class);
     }
 
     @AfterAll
@@ -63,12 +64,12 @@ void onEnter() throws NoSuchMethodException {
             assertFalse(actualResult);
 
             // not record
-            Mockito.when(SpringCacheAdviceHelper.needRecordOrReplay(any())).thenReturn(false);
+            Mockito.when(CacheLoaderUtil.needRecordOrReplay(any())).thenReturn(false);
             actualResult = SpringCacheInstrumentation.SpringCacheAdvice.onEnter(test1, new Object[]{ "name", 18 }, null, null);
             assertFalse(actualResult);
 
             // record
-            Mockito.when(SpringCacheAdviceHelper.needRecordOrReplay(any())).thenReturn(true);
+            Mockito.when(CacheLoaderUtil.needRecordOrReplay(any())).thenReturn(true);
             Mockito.when(ContextManager.needRecord()).thenReturn(true);
             DynamicClassExtractor extractor = new DynamicClassExtractor(test1, new Object[]{"mock"}, "#val", null);
             actualResult = SpringCacheInstrumentation.SpringCacheAdvice.onEnter(test1, new Object[]{ "name", 18 }, extractor, null);
@@ -106,4 +107,4 @@ void onExit() throws NoSuchMethodException {
             Mockito.verify(extractor, Mockito.times(1)).recordResponse(throwable);
         }
     }
-}
+}

arex-instrumentation/dynamic/arex-cache/src/test/java/io/arex/inst/cache/spring/SpringCacheAdviceHelperTest.java

@@ -68,11 +68,14 @@ void getLocatedClass() throws Exception {
     }
 
     @Test
-    void needRecordOrReplay() {
+    void needRecordOrReplay() throws NoSuchMethodException {
         try (MockedStatic<Config> configMockedStatic = Mockito.mockStatic(Config.class)) {
             Config config = Mockito.mock(Config.class);
             Mockito.when(Config.get()).thenReturn(config);
             Mockito.when(config.getCoveragePackages()).thenReturn(new String[]{"io.arex.inst"});
+            // method in coverage packages
+            assertTrue(CacheLoaderUtil.needRecordOrReplay(CacheLoaderUtilTest.class.getDeclaredMethod("getLocatedClass")));
+
             // loader is null
             assertFalse(CacheLoaderUtil.needRecordOrReplay(null));
             // loader is in coverage packages