fix: map properties error

YongwuHe · YongwuHe · commit bbcdb85bfdc7 · 2024-10-25T17:25:48.000+08:00
diff --git a/arex-agent-bootstrap/src/main/java/io/arex/agent/bootstrap/model/ArexMocker.java b/arex-agent-bootstrap/src/main/java/io/arex/agent/bootstrap/model/ArexMocker.java
@@ -35,11 +35,11 @@ public class ArexMocker implements Mocker {
     public ArexMocker() {
     }
 
-    public ArexMocker(MockCategoryType categoryType) {
+    public ArexMocker(MockCategoryType categoryType, Map<String, String> arexMockerTags) {
         this.categoryType = categoryType;
         this.appId = System.getProperty(ConfigConstants.SERVICE_NAME);
         this.recordVersion = System.getProperty(ConfigConstants.AGENT_VERSION);
-        this.tags = (Map<String, String>) System.getProperties().getOrDefault(ConfigConstants.MOCKER_TAGS, Collections.emptyMap());
+        this.tags = arexMockerTags == null ? Collections.emptyMap() : arexMockerTags;
     }
 
     /**
diff --git a/arex-agent-bootstrap/src/main/java/io/arex/agent/bootstrap/util/StringUtil.java b/arex-agent-bootstrap/src/main/java/io/arex/agent/bootstrap/util/StringUtil.java
@@ -106,6 +106,17 @@ private static void indent(StringBuilder sb, int indent) {
         }
     }
 
+    public static String mapToString(Map<String, String> map) {
+        StringBuilder stringBuilder = new StringBuilder();
+        for (Map.Entry<String, String> entry : map.entrySet()) {
+            stringBuilder.append(entry.getKey())
+                    .append("=")
+                    .append(entry.getValue())
+                    .append(";");
+        }
+        return stringBuilder.toString();
+    }
+
     public static Map<String, String> asMap(String content) {
         if (isEmpty(content)) {
             return Collections.emptyMap();
diff --git a/arex-agent-bootstrap/src/test/java/io/arex/agent/bootstrap/util/StringUtilTest.java b/arex-agent-bootstrap/src/test/java/io/arex/agent/bootstrap/util/StringUtilTest.java
@@ -425,4 +425,12 @@ void splitByLastSeparator() {
         actualResult = StringUtil.splitByLastSeparator(val, ',');
         assertArrayEquals(new String[] {"x,,y", "z"}, actualResult);
     }
+
+    @Test
+    void mapToString() {
+        Map<String, String> map = new HashMap<>();
+        map.put("a", "b");
+        map.put("c", "d");
+        assertEquals("a=b;c=d;", StringUtil.mapToString(map));
+    }
 }
diff --git a/arex-instrumentation-api/src/main/java/io/arex/inst/runtime/config/Config.java b/arex-instrumentation-api/src/main/java/io/arex/inst/runtime/config/Config.java
@@ -47,6 +47,7 @@ public static Config get() {
     private final String recordVersion;
     private final Set<String> includeServiceOperations;
     private final Set<String> coveragePackages = new ConcurrentHashSet<>();
+    private final Map<String, String> arexMockerTags;
 
     Config(boolean enableDebug, String serviceName, List<DynamicClassEntity> dynamicClassList,
         Map<String, String> properties,
@@ -60,6 +61,7 @@ public static Config get() {
         this.recordRate = recordRate;
         this.recordVersion = properties.get("arex.agent.version");
         this.includeServiceOperations = StringUtil.splitToSet(properties.get("includeServiceOperations"), SEPARATOR);
+        this.arexMockerTags = StringUtil.asMap(System.getProperty(ConfigConstants.MOCKER_TAGS));
         buildCoveragePackages(properties);
         buildDynamicClassInfo();
     }
@@ -107,6 +109,10 @@ private void buildDynamicClassInfo() {
         this.dynamicAbstractClassList = list.toArray(StringUtil.EMPTY_STRING_ARRAY);
     }
 
+    public Map<String, String> getArexMockerTags() {
+        return arexMockerTags;
+    }
+
     public Set<String> getCoveragePackages() {
         return coveragePackages;
     }
diff --git a/arex-instrumentation-api/src/main/java/io/arex/inst/runtime/util/MockUtils.java b/arex-instrumentation-api/src/main/java/io/arex/inst/runtime/util/MockUtils.java
@@ -77,7 +77,7 @@ public static ArexMocker createNettyProvider(String pattern) {
     }
 
     public static ArexMocker create(MockCategoryType categoryType, String operationName) {
-        ArexMocker mocker = new ArexMocker(categoryType);
+        ArexMocker mocker = new ArexMocker(categoryType, Config.get().getArexMockerTags());
         long createTime = System.currentTimeMillis();
         ArexContext context = ContextManager.currentContext();
         if (context != null) {
diff --git a/arex-instrumentation-api/src/test/java/io/arex/inst/runtime/config/ConfigTest.java b/arex-instrumentation-api/src/test/java/io/arex/inst/runtime/config/ConfigTest.java
@@ -1,12 +1,16 @@
 package io.arex.inst.runtime.config;
 
 import io.arex.agent.bootstrap.constants.ConfigConstants;
+import io.arex.agent.bootstrap.util.CollectionUtil;
 import io.arex.agent.bootstrap.util.ConcurrentHashSet;
+import io.arex.agent.bootstrap.util.MapUtils;
+import io.arex.agent.bootstrap.util.StringUtil;
 import io.arex.inst.runtime.context.RecordLimiter;
 import io.arex.inst.runtime.listener.EventProcessor;
 import io.arex.inst.runtime.model.ArexConstants;
 import io.arex.inst.runtime.model.DynamicClassEntity;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 
@@ -20,6 +24,7 @@
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 
+import java.util.Map;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
@@ -147,4 +152,18 @@ void buildCoveragePackages() {
         System.clearProperty(ArexConstants.SPRING_SCAN_PACKAGES);
 
     }
+
+    @Test
+    void arexMockerTags() {
+        ConfigBuilder configBuilder = ConfigBuilder.create("mock");
+        configBuilder.build();
+        assertTrue(MapUtils.isEmpty(Config.get().getArexMockerTags()));
+        Map<String, String> tags = new HashMap<>();
+        tags.put("key1", "value1");
+        tags.put("key2", "value2");
+        System.setProperty(ConfigConstants.MOCKER_TAGS, StringUtil.mapToString(tags));
+        configBuilder.build();
+        assertEquals("value1", Config.get().getArexMockerTags().get("key1"));
+        assertEquals("value2", Config.get().getArexMockerTags().get("key2"));
+    }
 }
diff --git a/arex-instrumentation-api/src/test/java/io/arex/inst/runtime/match/ReplayMatcherTest.java b/arex-instrumentation-api/src/test/java/io/arex/inst/runtime/match/ReplayMatcherTest.java
@@ -36,7 +36,7 @@ static void tearDown() {
 
     @Test
     void match() {
-        ArexMocker requestMocker = new ArexMocker(MockCategoryType.DYNAMIC_CLASS);
+        ArexMocker requestMocker = new ArexMocker(MockCategoryType.DYNAMIC_CLASS, Collections.emptyMap());
         requestMocker.setOperationName("mock");
         requestMocker.setTargetRequest(new Mocker.Target());
         requestMocker.setTargetResponse(new Mocker.Target());
@@ -57,4 +57,4 @@ void match() {
         Mockito.when(MockUtils.methodRequestTypeHash(requestMocker)).thenReturn(2);
         assertNull(ReplayMatcher.match(requestMocker, MockStrategyEnum.FIND_LAST));
     }
-}
+}
diff --git a/arex-instrumentation-api/src/test/java/io/arex/inst/runtime/util/MergeRecordUtilTest.java b/arex-instrumentation-api/src/test/java/io/arex/inst/runtime/util/MergeRecordUtilTest.java
@@ -49,7 +49,7 @@ static void setUp() {
         Mockito.mockStatic(ContextManager.class);
         Mockito.mockStatic(Config.class);
         Mockito.when(Config.get()).thenReturn(Mockito.mock(Config.class));
-        requestMocker = new ArexMocker(MockCategoryType.DYNAMIC_CLASS);
+        requestMocker = new ArexMocker(MockCategoryType.DYNAMIC_CLASS, Collections.emptyMap());
         requestMocker.setOperationName("mock");
         requestMocker.setTargetRequest(new Mocker.Target());
         requestMocker.setTargetResponse(new Mocker.Target());
@@ -141,4 +141,4 @@ static Stream<Arguments> recordRemainCase() {
                 arguments(contextSupplier2.get(), asserts2)
         );
     }
-}
+}
diff --git a/arex-instrumentation-api/src/test/java/io/arex/inst/runtime/util/MockUtilsTest.java b/arex-instrumentation-api/src/test/java/io/arex/inst/runtime/util/MockUtilsTest.java
@@ -199,7 +199,7 @@ void methodSignatureHash() {
 
     @Test
     void methodRequestTypeHash() {
-        ArexMocker mocker = new ArexMocker(MockCategoryType.DYNAMIC_CLASS);
+        ArexMocker mocker = new ArexMocker(MockCategoryType.DYNAMIC_CLASS, Collections.emptyMap());
         mocker.setTargetRequest(new Mocker.Target());
         mocker.getTargetRequest().setBody("mock");
         assertTrue(MockUtils.methodRequestTypeHash(mocker) > 0);
diff --git a/arex-instrumentation-api/src/test/java/io/arex/inst/runtime/util/ReplayUtilTest.java b/arex-instrumentation-api/src/test/java/io/arex/inst/runtime/util/ReplayUtilTest.java
@@ -34,7 +34,7 @@ static void setUp() {
         Mockito.mockStatic(ContextManager.class);
         Mockito.mockStatic(Config.class);
         Mockito.when(Config.get()).thenReturn(Mockito.mock(Config.class));
-        requestMocker = new ArexMocker(MockCategoryType.DYNAMIC_CLASS);
+        requestMocker = new ArexMocker(MockCategoryType.DYNAMIC_CLASS, Collections.emptyMap());
         requestMocker.setOperationName("mock");
         requestMocker.setTargetRequest(new Mocker.Target());
         requestMocker.setTargetResponse(new Mocker.Target());
@@ -56,15 +56,15 @@ void replayAllMocker(Runnable mocker) {
     }
 
     static Stream<Arguments> replayAllMockerCase() {
-        ArexMocker recordMocker1 = new ArexMocker(MockCategoryType.DYNAMIC_CLASS);
+        ArexMocker recordMocker1 = new ArexMocker(MockCategoryType.DYNAMIC_CLASS, Collections.emptyMap());
         recordMocker1.setOperationName(ArexConstants.MERGE_RECORD_NAME);
         recordMocker1.setRecordId("mock");
         recordMocker1.setReplayId("mock");
         recordMocker1.setTargetRequest(new Mocker.Target());
         recordMocker1.setTargetResponse(new Mocker.Target());
         recordMocker1.getTargetResponse().setBody("mock");
         recordMocker1.setCreationTime(System.currentTimeMillis());
-        ArexMocker recordMocker2 = new ArexMocker(MockCategoryType.DYNAMIC_CLASS);
+        ArexMocker recordMocker2 = new ArexMocker(MockCategoryType.DYNAMIC_CLASS, Collections.emptyMap());
         recordMocker2.setOperationName(ArexConstants.MERGE_RECORD_NAME);
         recordMocker2.setRecordId("mock");
         recordMocker2.setReplayId("mock");
@@ -99,4 +99,4 @@ static Stream<Arguments> replayAllMockerCase() {
                 arguments(mocker2)
         );
     }
-}
+}
diff --git a/arex-instrumentation-foundation/src/main/java/io/arex/foundation/services/ConfigService.java b/arex-instrumentation-foundation/src/main/java/io/arex/foundation/services/ConfigService.java
@@ -11,7 +11,6 @@
 import io.arex.foundation.util.NetUtils;
 import io.arex.agent.bootstrap.util.StringUtil;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -136,7 +135,7 @@ public Map<String, String> getSystemProperties() {
             map.put(key, value);
             buildTags(mockerTags, key, value);
         }
-        properties.put(ConfigConstants.MOCKER_TAGS, Collections.unmodifiableMap(mockerTags));
+        System.setProperty(ConfigConstants.MOCKER_TAGS, StringUtil.mapToString(mockerTags));
         return map;
     }
 
diff --git a/arex-instrumentation/httpclient/arex-httpclient-feign/src/test/java/io/arex/inst/httpclient/feign/FeignClientInstrumentationTest.java b/arex-instrumentation/httpclient/arex-httpclient-feign/src/test/java/io/arex/inst/httpclient/feign/FeignClientInstrumentationTest.java
@@ -6,6 +6,7 @@
 import feign.Response;
 import io.arex.agent.bootstrap.model.MockResult;
 import io.arex.inst.httpclient.common.HttpClientExtractor;
+import io.arex.inst.runtime.config.ConfigBuilder;
 import io.arex.inst.runtime.context.ContextManager;
 import io.arex.inst.runtime.context.RepeatedCollectManager;
 import io.arex.inst.runtime.util.IgnoreUtils;
@@ -24,6 +25,7 @@ static void setUp() {
         Mockito.mockStatic(IgnoreUtils.class);
         Mockito.mockStatic(ContextManager.class);
         Mockito.mockStatic(RepeatedCollectManager.class);
+        ConfigBuilder.create("test").build();
     }
 
     @AfterAll

Original file line number	Diff line number	Diff line change
`@@ -35,11 +35,11 @@ public class ArexMocker implements Mocker {`
`35`	`35`	`public ArexMocker() {`
`36`	`36`	`}`
`37`	`37`
`38`		`- public ArexMocker(MockCategoryType categoryType) {`
	`38`	`+ public ArexMocker(MockCategoryType categoryType, Map<String, String> arexMockerTags) {`
`39`	`39`	`this.categoryType = categoryType;`
`40`	`40`	`this.appId = System.getProperty(ConfigConstants.SERVICE_NAME);`
`41`	`41`	`this.recordVersion = System.getProperty(ConfigConstants.AGENT_VERSION);`
`42`		`- this.tags = (Map<String, String>) System.getProperties().getOrDefault(ConfigConstants.MOCKER_TAGS, Collections.emptyMap());`
	`42`	`+ this.tags = arexMockerTags == null ? Collections.emptyMap() : arexMockerTags;`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -425,4 +425,12 @@ void splitByLastSeparator() {`
`425`	`425`	`actualResult = StringUtil.splitByLastSeparator(val, ',');`
`426`	`426`	`assertArrayEquals(new String[] {"x,,y", "z"}, actualResult);`
`427`	`427`	`}`
	`428`	`+`
	`429`	`+ @Test`
	`430`	`+ void mapToString() {`
	`431`	`+ Map<String, String> map = new HashMap<>();`
	`432`	`+ map.put("a", "b");`
	`433`	`+ map.put("c", "d");`
	`434`	`+ assertEquals("a=b;c=d;", StringUtil.mapToString(map));`
	`435`	`+ }`
`428`	`436`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public static ArexMocker createNettyProvider(String pattern) {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`public static ArexMocker create(MockCategoryType categoryType, String operationName) {`
`80`		`- ArexMocker mocker = new ArexMocker(categoryType);`
	`80`	`+ ArexMocker mocker = new ArexMocker(categoryType, Config.get().getArexMockerTags());`
`81`	`81`	`long createTime = System.currentTimeMillis();`
`82`	`82`	`ArexContext context = ContextManager.currentContext();`
`83`	`83`	`if (context != null) {`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`	`import io.arex.foundation.util.NetUtils;`
`12`	`12`	`import io.arex.agent.bootstrap.util.StringUtil;`
`13`	`13`
`14`		`-import java.util.Collections;`
`15`	`14`	`import java.util.HashMap;`
`16`	`15`	`import java.util.Map;`
`17`	`16`	`import java.util.Objects;`
`@@ -136,7 +135,7 @@ public Map<String, String> getSystemProperties() {`
`136`	`135`	`map.put(key, value);`
`137`	`136`	`buildTags(mockerTags, key, value);`
`138`	`137`	`}`
`139`		`- properties.put(ConfigConstants.MOCKER_TAGS, Collections.unmodifiableMap(mockerTags));`
	`138`	`+ System.setProperty(ConfigConstants.MOCKER_TAGS, StringUtil.mapToString(mockerTags));`
`140`	`139`	`return map;`
`141`	`140`	`}`
`142`	`141`