fix:修复metadata-report多上报时multi_address参数无法全部识别

polarismesh · Apr 7, 2024 · 994d2b2 · 994d2b2
1 parent 95e1d9f
commit 994d2b2
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 7 deletions.
diff --git a/...port-polaris/src/main/java/com/tencent/polaris/dubbo/metadata/report/MultiReportUtil.java b/...port-polaris/src/main/java/com/tencent/polaris/dubbo/metadata/report/MultiReportUtil.java
@@ -40,23 +40,43 @@ public static Optional<WrapAbstractMetadataReport> buildAnother(ApplicationModel
         Map<String, MetadataReportFactory> factoryMap = loader.getSupportedExtensionInstances().stream()
                 .collect(HashMap::new, (m, v) -> m.put(loader.getExtensionName(v), v), HashMap::putAll);
 
-        String multiAddress = url.getParameter("multi_address", String.class);
-        if (StringUtils.isBlank(multiAddress)) {
+
+        Optional<URL> ret = generate(url);
+        if (!ret.isPresent()) {
             return Optional.empty();
         }
-        logger.info(String.format("another metadata-report connect url : %s", multiAddress));
-        URL copyUrl = URL.valueOf(multiAddress);
+        URL copyUrl = ret.get();
 
         if (!factoryMap.containsKey(copyUrl.getProtocol())) {
             return Optional.empty();
         }
         MetadataReportFactory factory = factoryMap.get(copyUrl.getProtocol());
 
+        Map<String, String> parameters = url.getParameters();
+        parameters.remove("namespace");
+        copyUrl.addParameters(parameters);
+
         MetadataReport report = factory.getMetadataReport(copyUrl);
         if (report instanceof AbstractMetadataReport) {
             return Optional.ofNullable(new WrapAbstractMetadataReport((AbstractMetadataReport) report));
         }
         return Optional.empty();
     }
 
+    public static Optional<URL> generate(URL url) {
+        String multiAddress = url.getParameter("multi_address", String.class);
+        if (StringUtils.isBlank(multiAddress)) {
+            return Optional.empty();
+        }
+        URL copyUrl = URL.valueOf(multiAddress);
+
+        Map<String, String> parameters = url.getParameters();
+        parameters.remove("namespace");
+        parameters.remove("multi_address");
+        copyUrl = copyUrl.addParameters(parameters);
+
+        logger.info(String.format("another metadata-report connect url : %s", copyUrl.toString()));
+        return Optional.of(copyUrl);
+    }
+
 }
diff --git a/...-polaris/src/test/java/com/tencent/polaris/dubbo/metadata/report/MultiReportUtilTest.java b/...-polaris/src/test/java/com/tencent/polaris/dubbo/metadata/report/MultiReportUtilTest.java
@@ -20,13 +20,18 @@
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.util.Optional;
+
 public class MultiReportUtilTest {
 
     @Test
     public void testMultiAddress() {
-        String testUrl = "polaris://127.0.0.1:8091?namespace=dubbo-multi&multi_address=nacos://127.0.0.1:8848?namespace=xxxxx";
+        String testUrl = "polaris://127.0.0.1:8091?namespace=dubbo-multi&multi_address=nacos://127.0.0.1:8848?namespace=xxxxx&username=xxx";
         URL dubboUrl = URL.valueOf(testUrl);
-        Assert.assertEquals("nacos://127.0.0.1:8848?namespace=xxxxx", dubboUrl.getParameter("multi_address"));
+
+        Optional<URL> ret = MultiReportUtil.generate(dubboUrl);
+        Assert.assertTrue(ret.isPresent());
+        Assert.assertEquals("nacos://127.0.0.1:8848?namespace=xxxxx&username=xxx", ret.get().toString());
     }
 
 }
diff --git a/pom.xml b/pom.xml
@@ -37,7 +37,7 @@
 
     <properties>
         <!-- Project revision -->
-        <revision>0.3.0-3.2.7</revision>
+        <revision>0.3.1-3.2.7</revision>
         <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>