feat: optimize dynamic (#346)

Author: YongwuHe

arex-agent-core/src/main/java/io/arex/agent/instrumentation/InstrumentationInstaller.java

@@ -13,6 +13,8 @@
 import io.arex.inst.runtime.model.DynamicClassStatusEnum;
 import io.arex.agent.bootstrap.util.ServiceLoader;
 import java.util.stream.Collectors;
+
+import io.arex.inst.runtime.util.IgnoreUtils;
 import net.bytebuddy.ByteBuddy;
 import net.bytebuddy.agent.builder.AgentBuilder;
 import net.bytebuddy.agent.builder.ResettableClassFileTransformer;
@@ -61,7 +63,7 @@ private ResettableClassFileTransformer retransform() {
             LOGGER.info("[AREX] No Change in dynamic class config, no need to retransform.");
             return resettableClassFileTransformer;
         }
-
+        IgnoreUtils.clearInvalidOperation();
         instrumentation.removeTransformer(resettableClassFileTransformer);
         resettableClassFileTransformer = install(getAgentBuilder(), true);
         LOGGER.info("[AREX] Agent retransform successfully.");
@@ -73,7 +75,7 @@ private void resetClass() {
         if (CollectionUtil.isEmpty(resetClassSet)) {
             return;
         }
-
+        IgnoreUtils.clearInvalidOperation();
         instrumentation.removeTransformer(resettableClassFileTransformer);
         // TODO: optimize reset abstract class
         for (Class<?> clazz : this.instrumentation.getAllLoadedClasses()) {

arex-instrumentation-api/src/main/java/io/arex/inst/runtime/util/IgnoreUtils.java

@@ -125,4 +125,8 @@ public static void addInvalidOperation(String operationSignature) {
         INVALID_OPERATION_HASH_CACHE.add(operationSignature.hashCode());
     }
 
+    public static void clearInvalidOperation() {
+        INVALID_OPERATION_HASH_CACHE.clear();
+    }
+
 }

arex-instrumentation-api/src/test/java/io/arex/inst/runtime/util/IgnoreUtilsTest.java

@@ -110,5 +110,7 @@ void ignoreOperation_excludePathList() {
     void invalidOperation() {
         IgnoreUtils.addInvalidOperation("testClass.testMethod");
         assertTrue(IgnoreUtils.invalidOperation("testClass.testMethod"));
+        IgnoreUtils.clearInvalidOperation();
+        assertFalse(IgnoreUtils.invalidOperation("testClass.testMethod"));
     }
 }

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

@@ -31,7 +31,6 @@
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Future;
-import java.util.function.Consumer;
 import reactor.core.publisher.Mono;
 
 public class DynamicClassExtractor {
@@ -185,7 +184,7 @@ String buildMethodKey(Method method, Object[] args, String keyExpression) {
         }
 
         String key = ExpressionParseUtil.generateKey(method, args, keyExpression);
-        if (key != null) {
+        if (key != null || StringUtil.isNotEmpty(keyExpression)) {
             return key;
         }
 

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

@@ -350,12 +350,25 @@ void testBuildMethodKey() throws Throwable {
         ConfigBuilder.create("mock-service").dynamicClassList(list).build();
         actualResult = extractor.buildMethodKey(testWithArexMock, new Object[]{"mock-method-key"});
         assertEquals("mock-method-key", actualResult);
+
+        // express is null
+        Method testWithArexMockList = DynamicClassExtractorTest.class.getDeclaredMethod("testWithArexMock", List.class);
+        extractor = new DynamicClassExtractor(testWithArexMockList, new Object[]{new ArrayList<>()}, null, String.class);
+        list.clear();
+        list.add(new DynamicClassEntity("io.arex.inst.dynamic.common.DynamicClassExtractorTest", "testWithArexMock", "mock", "$1.get(0)"));
+        ConfigBuilder.create("mock-service").dynamicClassList(list).build();
+        actualResult = extractor.buildMethodKey(testWithArexMockList, new Object[]{new ArrayList<>()});
+        assertNull(actualResult);
     }
 
     public String testWithArexMock(String val) {
         return val + "testWithArexMock";
     }
 
+    public String testWithArexMock(List list) {
+       return "testWithArexMock";
+    }
+
     public ListenableFuture<String> testReturnListenableFuture(String val, Throwable t) {
         if (t != null) {
             return Futures.immediateFailedFuture(t);

pom.xml

@@ -54,7 +54,7 @@
 
     <properties>
         <!-- Maven CI Friendly Versions https://maven.apache.org/maven-ci-friendly.html -->
-        <revision>0.3.14</revision>
+        <revision>0.3.16</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>