feat: support set nacos instance weight

Author: fishtailfu

polaris-plugins/polaris-plugins-connector/connector-common/src/main/java/com/tencent/polaris/plugins/connector/common/constant/NacosConstant.java

@@ -27,5 +27,7 @@ interface MetadataMapKey {
         String NACOS_EPHEMERAL_KEY = "nacos.ephemeral";
 
         String NACOS_SERVICE_KEY = "nacos.service";
+
+        String NACOS_WEIGHT_KEY = "nacos.weight";
     }
 }

polaris-plugins/polaris-plugins-connector/connector-nacos/src/main/java/com/tencent/polaris/plugins/connector/nacos/NacosConnector.java

@@ -158,6 +158,9 @@ private void initActually(InitContext ctx, ServerConnectorConfig connectorConfig
         if (metadata.containsKey(NACOS_EPHEMERAL_KEY)) {
             nacosContext.setEphemeral(Boolean.parseBoolean(metadata.get(NACOS_EPHEMERAL_KEY)));
         }
+        if(metadata.containsKey(NACOS_WEIGHT_KEY)){
+            nacosContext.setNacosWeight(Double.parseDouble(metadata.get(NACOS_WEIGHT_KEY)));
+        }
         if (metadata.containsKey(PropertyKeyConst.NAMESPACE) && StringUtils.isNotEmpty(
                 metadata.get(PropertyKeyConst.NAMESPACE))) {
             nacosContext.setNamespace(metadata.get(PropertyKeyConst.NAMESPACE));
@@ -408,9 +411,7 @@ private Instance buildRegisterNacosInstance(CommonProviderRequest req) {
         instance.setPort(req.getPort());
         instance.setIp(req.getHost());
         instance.setHealthy(true);
-        if (Objects.nonNull(req.getWeight())) {
-            instance.setWeight(req.getWeight());
-        }
+        instance.setWeight(nacosContext.getNacosWeight());
         Map<String, String> metadata = new HashMap<>(Optional.ofNullable(req.getMetadata())
                 .orElse(Collections.emptyMap()));
 
@@ -455,20 +456,4 @@ private Instance buildDeregisterNacosInstance(CommonProviderRequest req, String
         instance.setClusterName(nacosContext.getClusterName());
         return instance;
     }
-
-    protected static String analyzeNacosService(String service) {
-        String[] detail = service.split("__");
-        if (detail.length == 1) {
-            return service;
-        }
-        return service.replaceFirst(detail[0] + "__", "");
-    }
-
-    protected static String analyzeNacosGroup(String service) {
-        String[] detail = service.split("__");
-        if (detail.length == 1 || Objects.equals(detail[0], "")) {
-            return DEFAULT_GROUP;
-        }
-        return detail[0];
-    }
 }

polaris-plugins/polaris-plugins-connector/connector-nacos/src/main/java/com/tencent/polaris/plugins/connector/nacos/NacosContext.java

@@ -43,12 +43,16 @@ public class NacosContext {
 
     private Long nacosErrorSleep;
 
+    private double nacosWeight;
+
+
     public NacosContext(){
         groupName = DEFAULT_GROUP;
         clusterName = DEFAULT_CLUSTER_NAME;
         namespace = DEFAULT_NAMESPACE_ID;
         nacosErrorSleep = 1000L;
         ephemeral = false;
+        nacosWeight = 1;
     }
 
 
@@ -100,15 +104,24 @@ public void setNacosErrorSleep(Long nacosErrorSleep) {
         this.nacosErrorSleep = nacosErrorSleep;
     }
 
+    public double getNacosWeight() {
+        return nacosWeight;
+    }
+
+    public void setNacosWeight(double nacosWeight) {
+        this.nacosWeight = nacosWeight;
+    }
+
     @Override
     public String toString() {
         return "NacosContext{" +
-                ", groupName='" + groupName + '\'' +
+                "groupName='" + groupName + '\'' +
                 ", clusterName='" + clusterName + '\'' +
                 ", namespace='" + namespace + '\'' +
                 ", ephemeral=" + ephemeral +
                 ", serviceName='" + serviceName + '\'' +
                 ", nacosErrorSleep=" + nacosErrorSleep +
+                ", nacosWeight=" + nacosWeight +
                 '}';
     }
 }

polaris-plugins/polaris-plugins-connector/connector-nacos/src/main/java/com/tencent/polaris/plugins/connector/nacos/NacosService.java

@@ -114,6 +114,7 @@ public void asyncGetInstances(ServiceUpdateTask serviceUpdateTask) {
                                 .setPort(UInt32Value.of(nacosInstance.getPort()))
                                 .setHealthy(BoolValue.of(nacosInstance.isHealthy()))
                                 .setIsolate(BoolValue.of(!nacosInstance.isEnabled()))
+                                //nacos默认权重为1，polaris默认权重为100，因此需要乘100
                                 .setWeight(UInt32Value.of(100 * (int) nacosInstance.getWeight()));
                         if (StringUtils.isNotBlank(nacosInstance.getInstanceId())) {
                             instanceBuilder.setId(StringValue.of(nacosInstance.getInstanceId()));
@@ -128,11 +129,12 @@ public void asyncGetInstances(ServiceUpdateTask serviceUpdateTask) {
                         // set metadata
                         Map<String, String> metadata = nacosInstance.getMetadata();
                         if (CollectionUtils.isNotEmpty(metadata)) {
-                            instanceBuilder.putAllMetadata(metadata)
-                                    .putMetadata("nacos.cluster", nacosInstance.getClusterName())
-                                    .putMetadata("nacos.group", nacosContext.getGroupName())
-                                    .putMetadata("nacos.ephemeral", String.valueOf(nacosInstance.isEphemeral()));
+                            instanceBuilder.putAllMetadata(metadata);
                         }
+                        instanceBuilder.putMetadata("nacos.cluster", nacosInstance.getClusterName())
+                                .putMetadata("nacos.group", nacosContext.getGroupName())
+                                .putMetadata("nacos.ephemeral", String.valueOf(nacosInstance.isEphemeral()));
+
                         String protocol = metadata.getOrDefault("protocol", "");
                         String version = metadata.getOrDefault("version", "");
                         if (StringUtils.isNotEmpty(protocol)) {

polaris-plugins/polaris-plugins-connector/connector-nacos/src/test/java/com/tencent/polaris/plugins/connector/nacos/NacosConnectorTests.java

@@ -22,29 +22,5 @@
 
 public class NacosConnectorTests {
 
-	@Test
-	public void testNacosAnalyze() {
-		String serviceName;
-
-		serviceName = "GROUP__svc";
-		Assert.assertEquals("svc", NacosConnector.analyzeNacosService(serviceName));
-		Assert.assertEquals("GROUP", NacosConnector.analyzeNacosGroup(serviceName));
-
-		serviceName = "GROUP__svc_svc";
-		Assert.assertEquals("svc_svc", NacosConnector.analyzeNacosService(serviceName));
-		Assert.assertEquals("GROUP", NacosConnector.analyzeNacosGroup(serviceName));
-
-		serviceName = "GROUP_123__svc_svc";
-		Assert.assertEquals("svc_svc", NacosConnector.analyzeNacosService(serviceName));
-		Assert.assertEquals("GROUP_123", NacosConnector.analyzeNacosGroup(serviceName));
-
-		serviceName = "GROUP_123__svc__svc";
-		Assert.assertEquals("svc__svc", NacosConnector.analyzeNacosService(serviceName));
-		Assert.assertEquals("GROUP_123", NacosConnector.analyzeNacosGroup(serviceName));
-
-		serviceName = "__GROUP_123__svc__svc";
-		Assert.assertEquals("GROUP_123__svc__svc", NacosConnector.analyzeNacosService(serviceName));
-		Assert.assertEquals("DEFAULT_GROUP", NacosConnector.analyzeNacosGroup(serviceName));
-	}
 
 }