feat: arex.enable.debug config (#138)

Co-authored-by: wildeslam <[email protected]>
arextest · Dec 26, 2023 · b3235b5 · b3235b5
1 parent 771a9cc
commit b3235b5
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 4 deletions.
diff --git a/arex-storage-config/pom.xml b/arex-storage-config/pom.xml
@@ -45,7 +45,7 @@
   <parent>
     <artifactId>arex-storage-service</artifactId>
     <groupId>com.arextest</groupId>
-    <version>1.0.55</version>
+    <version>1.0.56</version>
   </parent>
 
   <properties>

diff --git a/...torage-config/src/main/java/com/arextest/config/model/dao/config/InstancesCollection.java b/...torage-config/src/main/java/com/arextest/config/model/dao/config/InstancesCollection.java
@@ -24,4 +24,5 @@ public class InstancesCollection extends BaseEntity {
   private Map<String, String> tags;
   private Map<String, String> systemEnv;
   private Map<String, String> systemProperties;
+  private Map<String, String> extendField;
 }
diff --git a/...onfig/src/main/java/com/arextest/config/model/dto/application/InstancesConfiguration.java b/...onfig/src/main/java/com/arextest/config/model/dto/application/InstancesConfiguration.java
@@ -20,4 +20,5 @@ public class InstancesConfiguration extends AbstractConfiguration {
   private Map<String, String> tags;
   private Map<String, String> systemEnv;
   private Map<String, String> systemProperties;
+  private Map<String, String> extendField;
 }
diff --git a/arex-storage-model/pom.xml b/arex-storage-model/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>arex-storage-service</artifactId>
     <groupId>com.arextest</groupId>
-    <version>1.0.55</version>
+    <version>1.0.56</version>
   </parent>
 
   <profiles>

diff --git a/arex-storage-web-api/pom.xml b/arex-storage-web-api/pom.xml
@@ -123,7 +123,7 @@
   <parent>
     <artifactId>arex-storage-service</artifactId>
     <groupId>com.arextest</groupId>
-    <version>1.0.55</version>
+    <version>1.0.56</version>
   </parent>
 
   <profiles>

diff --git a/...n/java/com/arextest/storage/web/controller/config/AgentRemoteConfigurationController.java b/...n/java/com/arextest/storage/web/controller/config/AgentRemoteConfigurationController.java
@@ -24,6 +24,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.TimeZone;
 import java.util.concurrent.CompletableFuture;
@@ -61,6 +62,7 @@ public final class AgentRemoteConfigurationController {
   private static final String EMPTY_TIME = "0";
   private static final String LAST_MODIFY_TIME = "If-Modified-Since";
   private static final String INCLUDE_SERVICE_OPERATIONS = "includeServiceOperations";
+
   @Resource
   private ConfigurableHandler<DynamicClassConfiguration> dynamicClassHandler;
   @Resource
@@ -112,6 +114,12 @@ public Response load(@RequestBody AgentRemoteConfigurationRequest request) {
           serviceCollectConfiguration.getRecordMachineCountLimit());
       Set<String> recordingHosts =
           instances.stream().map(InstancesConfiguration::getHost).collect(Collectors.toSet());
+      InstancesConfiguration sourceInstance = instances.stream()
+          .filter(instance -> Objects.equals(instance.getHost(), (request.getHost())))
+          .findFirst().orElse(null);
+      if (sourceInstance != null && sourceInstance.getExtendField() != null) {
+        body.getExtendField().putAll(sourceInstance.getExtendField());
+      }
       if (recordingHosts.contains(request.getHost())) {
         body.setTargetAddress(request.getHost());
       } else {

diff --git a/pom.xml b/pom.xml
@@ -408,5 +408,5 @@
   <url>https://github.com/arextest/arex-storage</url>
 
 
-  <version>1.0.55</version>
+  <version>1.0.56</version>
 </project>