feat: support disbale record by config (#236)

Author: mr3

…x/foundation/config/ConfigConstants.java …bootstrap/constants/ConfigConstants.javaarex-instrumentation-foundation/src/main/java/io/arex/foundation/config/ConfigConstants.java renamed to arex-agent-bootstrap/src/main/java/io/arex/agent/bootstrap/constants/ConfigConstants.java arex-instrumentation-foundation/src/main/java/io/arex/foundation/config/ConfigConstants.java renamed to arex-agent-bootstrap/src/main/java/io/arex/agent/bootstrap/constants/ConfigConstants.java

@@ -1,4 +1,4 @@
-package io.arex.foundation.config;
+package io.arex.agent.bootstrap.constants;
 
 public class ConfigConstants {
 
@@ -21,6 +21,7 @@ public class ConfigConstants {
     public static final String EXCLUDE_SERVICE_OPERATION = "arex.exclude.service.operation";
     public static final String DUBBO_STREAM_REPLAY_THRESHOLD = "arex.dubbo.replay.threshold";
     public static final String DISABLE_REPLAY = "arex.disable.replay";
+    public static final String DISABLE_RECORD = "arex.disable.record";
     public static final String DURING_WORK = "arex.during.work";
     public static final String AGENT_VERSION = "arex.agent.version";
     public static final String IP_VALIDATE = "arex.ip.validate";

arex-instrumentation-api/src/main/java/io/arex/inst/runtime/config/Config.java

@@ -1,5 +1,6 @@
 package io.arex.inst.runtime.config;
 
+import io.arex.agent.bootstrap.constants.ConfigConstants;
 import io.arex.agent.bootstrap.util.ConcurrentHashSet;
 import io.arex.agent.bootstrap.util.StringUtil;
 import io.arex.inst.runtime.context.RecordLimiter;
@@ -179,17 +180,21 @@ public Set<String> getIncludeServiceOperations() {
      * 2. not in working time <br/>
      * 3. exceed rate limit <br/>
      * 4. local IP match target IP <br/>
+     * 5. record disabled by config
      *
      * @return true: invalid, false: valid
      */
     public boolean invalidRecord(String path) {
         if (getRecordRate() <= 0) {
             return true;
         }
-        if (!getBoolean("arex.during.work", false)) {
+        if (!getBoolean(ConfigConstants.DURING_WORK, false)) {
             return true;
         }
-        if (!getBoolean("arex.ip.validate", false)) {
+        if (!getBoolean(ConfigConstants.IP_VALIDATE, false)) {
+            return true;
+        }
+        if (getBoolean(ConfigConstants.DISABLE_RECORD, false)) {
             return true;
         }
 

arex-instrumentation-api/src/test/java/io/arex/inst/runtime/config/ConfigTest.java

@@ -1,5 +1,6 @@
 package io.arex.inst.runtime.config;
 
+import io.arex.agent.bootstrap.constants.ConfigConstants;
 import io.arex.agent.bootstrap.util.ConcurrentHashSet;
 import io.arex.inst.runtime.context.RecordLimiter;
 import io.arex.inst.runtime.model.ArexConstants;
@@ -37,20 +38,25 @@ static Stream<Arguments> invalidCase() {
             config.recordRate(1).build();
         };
         Runnable mocker4 = () -> {
-            config.addProperty("arex.during.work", "true").build();;
+            config.addProperty(ConfigConstants.DURING_WORK, "true").build();;
         };
         Runnable mocker5 = () -> {
-            config.addProperty("arex.ip.validate", "true").build();;
+            config.addProperty(ConfigConstants.IP_VALIDATE, "true").build();
+            RecordLimiter.init(mock -> true);
+        };
+        Runnable disableRecord = () -> {
+            config.addProperty(ConfigConstants.DISABLE_RECORD, "true").build();;
             RecordLimiter.init(mock -> true);
         };
 
-        Predicate<Boolean> predicate1 = result -> !result;
-        Predicate<Boolean> predicate2 = result -> result;
+        Predicate<Boolean> assertFalse = result -> !result;
+        Predicate<Boolean> assertTrue = result -> result;
         return Stream.of(
-                arguments(mocker2, predicate2),
-                arguments(mocker3, predicate2),
-                arguments(mocker4, predicate2),
-                arguments(mocker5, predicate1)
+            arguments(mocker2, assertTrue),
+            arguments(mocker3, assertTrue),
+            arguments(mocker4, assertTrue),
+            arguments(mocker5, assertFalse),
+            arguments(disableRecord, assertTrue)
         );
     }
 

arex-instrumentation-foundation/src/main/java/io/arex/foundation/config/ConfigManager.java

@@ -1,6 +1,7 @@
 package io.arex.foundation.config;
 
 import com.google.common.annotations.VisibleForTesting;
+import io.arex.agent.bootstrap.util.MapUtils;
 import io.arex.agent.bootstrap.util.StringUtil;
 import io.arex.foundation.model.ConfigQueryResponse.DynamicClassConfiguration;
 import io.arex.foundation.model.ConfigQueryResponse.ResponseBody;
@@ -29,7 +30,7 @@
 import java.util.*;
 import java.util.stream.Stream;
 
-import static io.arex.foundation.config.ConfigConstants.*;
+import static io.arex.agent.bootstrap.constants.ConfigConstants.*;
 
 public class ConfigManager {
 
@@ -60,7 +61,6 @@ public class ConfigManager {
     private Set<String> excludeServiceOperations;
     private String targetAddress;
     private int dubboStreamReplayThreshold;
-    private boolean disableReplay;
     private List<ConfigListener> listeners = new ArrayList<>();
     private Map<String, String> extendField;
 
@@ -231,7 +231,6 @@ void init() {
         setRetransformModules(System.getProperty(RETRANSFORM_MODULE));
         setExcludeServiceOperations(System.getProperty(EXCLUDE_SERVICE_OPERATION));
         setDubboStreamReplayThreshold(System.getProperty(DUBBO_STREAM_REPLAY_THRESHOLD, "100"));
-        setDisableReplay(System.getProperty(DISABLE_REPLAY));
     }
 
     @VisibleForTesting
@@ -255,7 +254,8 @@ void readConfigFromFile(String configPath) {
         setDisabledModules(configMap.get(DISABLE_MODULE));
         setRetransformModules(configMap.get(RETRANSFORM_MODULE));
         setExcludeServiceOperations(configMap.get(EXCLUDE_SERVICE_OPERATION));
-        setDisableReplay(configMap.get(DISABLE_REPLAY));
+        System.setProperty(DISABLE_REPLAY, StringUtil.defaultString(configMap.get(DISABLE_REPLAY)));
+        System.setProperty(DISABLE_RECORD, StringUtil.defaultString(configMap.get(DISABLE_RECORD)));
     }
 
     private static Map<String, String> parseConfigFile(String configPath) {
@@ -305,12 +305,13 @@ private void updateRuntimeConfig() {
         Map<String, String> configMap = new HashMap<>();
         configMap.put(DYNAMIC_RESULT_SIZE_LIMIT, String.valueOf(getDynamicResultSizeLimit()));
         configMap.put(TIME_MACHINE, String.valueOf(startTimeMachine()));
-        configMap.put(DISABLE_REPLAY, String.valueOf(disableReplay()));
+        configMap.put(DISABLE_REPLAY, System.getProperty(DISABLE_REPLAY));
+        configMap.put(DISABLE_RECORD, System.getProperty(DISABLE_RECORD));
         configMap.put(DURING_WORK, Boolean.toString(nextWorkTime() <= 0));
         configMap.put(AGENT_VERSION, agentVersion);
         configMap.put(IP_VALIDATE, Boolean.toString(checkTargetAddress()));
         Map<String, String> extendFieldMap = getExtendField();
-        if (extendFieldMap != null && !extendFieldMap.isEmpty()) {
+        if (MapUtils.isNotEmpty(extendFieldMap)) {
             configMap.putAll(extendFieldMap);
         }
 
@@ -523,19 +524,6 @@ public int getDubboStreamReplayThreshold() {
         return dubboStreamReplayThreshold;
     }
 
-    public void setDisableReplay(String disableReplay) {
-        if (StringUtil.isEmpty(disableReplay)) {
-            return;
-        }
-
-        this.disableReplay = Boolean.parseBoolean(disableReplay);
-        System.setProperty(DISABLE_REPLAY, disableReplay);
-    }
-
-    public boolean disableReplay() {
-        return disableReplay;
-    }
-
     public Map<String, String> getExtendField() {
         return extendField;
     }

arex-instrumentation-foundation/src/test/java/io/arex/foundation/config/ConfigManagerTest.java

@@ -1,5 +1,6 @@
 package io.arex.foundation.config;
 
+import io.arex.agent.bootstrap.constants.ConfigConstants;
 import io.arex.foundation.model.ConfigQueryResponse;
 import io.arex.foundation.model.ConfigQueryResponse.DynamicClassConfiguration;
 import io.arex.foundation.util.NetUtils;
@@ -28,7 +29,7 @@
 import java.util.stream.Stream;
 import org.mockito.MockedStatic;
 
-import static io.arex.foundation.config.ConfigConstants.ENABLE_REPORT_STATUS;
+import static io.arex.agent.bootstrap.constants.ConfigConstants.ENABLE_REPORT_STATUS;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 import static org.mockito.Mockito.mockStatic;
@@ -50,13 +51,11 @@ static void tearDown() {
     void initFromSystemPropertyTest() {
         System.setProperty("arex.service.name", "test-your-service");
         System.setProperty("arex.storage.service.host", "test-storage-service.host ");
-        System.setProperty("arex.disable.replay", "true");
-        System.setProperty(ENABLE_REPORT_STATUS, "true");
+        System.setProperty(ConfigConstants.DISABLE_REPLAY, "true");
         configManager.init();
 
         assertEquals("test-your-service", configManager.getServiceName());
         assertEquals("test-storage-service.host", configManager.getStorageServiceHost());
-        assertTrue(configManager.disableReplay());
         assertTrue(configManager.isEnableReportStatus());
     }