增加基于随机权重的平滑灰度发布功能

discovery-common/pom.xml

@@ -29,5 +29,10 @@
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file

discovery-common/src/main/java/com/nepxion/discovery/common/entity/RouterEntity.java

@@ -25,6 +25,7 @@ public class RouterEntity implements Serializable {
     private String version;
     private String host;
     private int port;
+    private int weight = -1;
     private String contextPath;
 
     private List<RouterEntity> nexts = new ArrayList<RouterEntity>();
@@ -61,6 +62,14 @@ public class RouterEntity implements Serializable {
         this.port = port;
     }
 
+    public int getWeight() {
+        return weight;
+    }
+
+    public void setWeight(int weight) {
+        this.weight = weight;
+    }
+
     public String getContextPath() {
         return contextPath;
     }

discovery-console-desktop/src/main/java/com/nepxion/discovery/console/desktop/serializer/JacksonSerializer.java → discovery-common/src/main/java/com/nepxion/discovery/common/util/JsonUtil.java

-package com.nepxion.discovery.console.desktop.serializer;
+package com.nepxion.discovery.common.util;
 
 /**
  * <p>Title: Nepxion Discovery</p>
@@ -17,7 +17,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-public class JacksonSerializer {
+public class JsonUtil {
     private static ObjectMapper objectMapper;
 
     static {

discovery-console-desktop/pom.xml

@@ -50,11 +50,6 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>com.lmax</groupId>
             <artifactId>disruptor</artifactId>
             <version>${disruptor.version}</version>

discovery-console-desktop/src/main/java/com/nepxion/discovery/console/desktop/controller/ServiceController.java

@@ -21,10 +21,10 @@ import org.springframework.web.client.RestTemplate;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.nepxion.discovery.common.entity.ResultEntity;
 import com.nepxion.discovery.common.entity.RouterEntity;
+import com.nepxion.discovery.common.util.JsonUtil;
 import com.nepxion.discovery.common.util.UrlUtil;
 import com.nepxion.discovery.console.desktop.context.PropertiesContext;
 import com.nepxion.discovery.console.desktop.entity.Instance;
-import com.nepxion.discovery.console.desktop.serializer.JacksonSerializer;
 
 public class ServiceController {
     public static RestTemplate restTemplate;
@@ -224,7 +224,7 @@ public class ServiceController {
 
     private static <T> T convert(String result, TypeReference<T> typeReference) {
         try {
-            return JacksonSerializer.fromJson(result, typeReference);
+            return JsonUtil.fromJson(result, typeReference);
         } catch (Exception e) {
             ServiceErrorHandler errorHandler = (ServiceErrorHandler) restTemplate.getErrorHandler();
             result = errorHandler.getCause();

discovery-console-desktop/src/main/java/com/nepxion/discovery/console/desktop/workspace/RouterTopology.java

@@ -142,10 +142,12 @@ public class RouterTopology extends AbstractTopology {
                 typeComboBox.setSelectedIndex(2);
 
                 JPanel childPanel2 = (JPanel) layoutPanel.getComponent(1);
+                JSlider yOffsetSlider = (JSlider) childPanel2.getComponent(11);
+                yOffsetSlider.setValue(0);
                 JSlider xGapSlider = (JSlider) childPanel2.getComponent(13);
                 xGapSlider.setValue(200);
                 JSlider yGapSlider = (JSlider) childPanel2.getComponent(15);
-                yGapSlider.setValue(100);
+                yGapSlider.setValue(150);
 
                 JPanel childPanel3 = (JPanel) layoutPanel.getComponent(2);
                 JBasicButton runButton = (JBasicButton) childPanel3.getComponent(1);
@@ -184,7 +186,7 @@ public class RouterTopology extends AbstractTopology {
 
                     index++;
                 }
-                addLink(node, nextNode);
+                addLink(node, nextNode, next);
 
                 route(next, nextNode, index);
             }
@@ -215,9 +217,17 @@ public class RouterTopology extends AbstractTopology {
         return node;
     }
 
-    private void addLink(TNode fromNode, TNode toNode) {
+    private void addLink(TNode fromNode, TNode toNode, RouterEntity routerEntity) {
+        int weight = routerEntity.getWeight();
+
         TLink link = createLink(fromNode, toNode, true);
         link.putLinkToArrowColor(Color.yellow);
+        if (weight > -1) {
+            link.setName("weight=" + weight);
+            link.putLinkFlowing(true);
+            link.putLinkFlowingColor(new Color(255, 155, 85));
+            link.putLinkFlowingWidth(3);
+        }
 
         dataBox.addElement(link);
     }

discovery-plugin-admin-center/src/main/java/com/nepxion/discovery/plugin/admincenter/endpoint/RouterEndpoint.java

@@ -19,6 +19,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.actuate.endpoint.web.annotation.RestControllerEndpoint;
@@ -35,9 +36,15 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.nepxion.discovery.common.constant.DiscoveryConstant;
+import com.nepxion.discovery.common.entity.DiscoveryEntity;
 import com.nepxion.discovery.common.entity.RouterEntity;
+import com.nepxion.discovery.common.entity.RuleEntity;
+import com.nepxion.discovery.common.entity.WeightEntity;
+import com.nepxion.discovery.common.entity.WeightFilterEntity;
 import com.nepxion.discovery.common.exception.DiscoveryException;
+import com.nepxion.discovery.common.util.JsonUtil;
 import com.nepxion.discovery.common.util.UrlUtil;
 import com.nepxion.discovery.plugin.framework.adapter.PluginAdapter;
 
@@ -149,6 +156,7 @@ public class RouterEndpoint {
             String version = metadata.get(DiscoveryConstant.VERSION);
             String host = instance.getHost();
             int port = instance.getPort();
+            int weight = getWeight(routeServiceId, version);
             String contextPath = metadata.get(DiscoveryConstant.SPRING_APPLICATION_CONTEXT_PATH);
 
             RouterEntity routerEntity = new RouterEntity();
@@ -156,6 +164,7 @@ public class RouterEndpoint {
             routerEntity.setVersion(version);
             routerEntity.setHost(host);
             routerEntity.setPort(port);
+            routerEntity.setWeight(weight);
             routerEntity.setContextPath(contextPath);
 
             routerEntityList.add(routerEntity);
@@ -164,39 +173,22 @@ public class RouterEndpoint {
         return routerEntityList;
     }
 
-    @SuppressWarnings("unchecked")
     public List<RouterEntity> getRouterEntityList(String routeServiceId, String routeHost, int routePort, String routeContextPath) {
-        String url = "http://" + routeHost + ":" + routePort + UrlUtil.formatContextPath(routeContextPath) + "router/instances/" + routeServiceId;
+        String url = "http://" + routeHost + ":" + routePort + UrlUtil.formatContextPath(routeContextPath) + "router/route/" + routeServiceId;
 
-        List<Map<String, ?>> instanceList = null;
+        String result = null;
         try {
-            instanceList = routerRestTemplate.getForEntity(url, List.class).getBody();
+            result = routerRestTemplate.getForEntity(url, String.class).getBody();
         } catch (RestClientException e) {
             throw new DiscoveryException("Get instance list for route serviceId=" + routeServiceId + " with url=" + url + " failed", e);
         }
 
-        if (CollectionUtils.isEmpty(instanceList)) {
+        if (StringUtils.isEmpty(result)) {
             return null;
         }
 
-        List<RouterEntity> routerEntityList = new ArrayList<RouterEntity>();
-        for (Map<String, ?> instance : instanceList) {
-            Map<String, String> metadata = (Map<String, String>) instance.get(DiscoveryConstant.METADATA);
-            String serviceId = instance.get(DiscoveryConstant.SERVICE_ID).toString().toLowerCase();
-            String version = metadata.get(DiscoveryConstant.VERSION);
-            String host = instance.get(DiscoveryConstant.HOST).toString();
-            Integer port = (Integer) instance.get(DiscoveryConstant.PORT);
-            String contextPath = metadata.get(DiscoveryConstant.SPRING_APPLICATION_CONTEXT_PATH);
-
-            RouterEntity routerEntity = new RouterEntity();
-            routerEntity.setServiceId(serviceId);
-            routerEntity.setVersion(version);
-            routerEntity.setHost(host);
-            routerEntity.setPort(port);
-            routerEntity.setContextPath(contextPath);
-
-            routerEntityList.add(routerEntity);
-        }
+        List<RouterEntity> routerEntityList = JsonUtil.fromJson(result, new TypeReference<List<RouterEntity>>() {
+        });
 
         return routerEntityList;
     }
@@ -266,4 +258,46 @@ public class RouterEndpoint {
 
         return routerEntityList;
     }
+
+    private int getWeight(String providerServiceId, String providerVersion) {
+        RuleEntity ruleEntity = pluginAdapter.getRule();
+        if (ruleEntity == null) {
+            return -1;
+        }
+
+        DiscoveryEntity discoveryEntity = ruleEntity.getDiscoveryEntity();
+        if (discoveryEntity == null) {
+            return -1;
+        }
+
+        WeightFilterEntity weightFilterEntity = discoveryEntity.getWeightFilterEntity();
+        if (weightFilterEntity == null) {
+            return -1;
+        }
+
+        Map<String, List<WeightEntity>> weightEntityMap = weightFilterEntity.getWeightEntityMap();
+        if (MapUtils.isEmpty(weightEntityMap)) {
+            return -1;
+        }
+
+        String serviceId = pluginAdapter.getServiceId();
+
+        List<WeightEntity> weightEntityList = weightEntityMap.get(serviceId);
+        if (CollectionUtils.isEmpty(weightEntityList)) {
+            return -1;
+        }
+
+        for (WeightEntity weightEntity : weightEntityList) {
+            String providerServiceName = weightEntity.getProviderServiceName();
+            if (StringUtils.equalsIgnoreCase(providerServiceName, providerServiceId)) {
+                Map<String, Integer> weightMap = weightEntity.getWeightMap();
+                Integer weight = weightMap.get(providerVersion);
+                if (weight != null) {
+                    return weight;
+                }
+            }
+        }
+
+        return -1;
+    }
 }
\ No newline at end of file