添加灰度实例路由的开关

灰度开关控制GrayTrackFilter

Author: saleson

spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/RibbonServerChooser.java

@@ -11,9 +11,11 @@
 import cn.springcloud.gray.servernode.ServerListProcessor;
 import cn.springcloud.gray.servernode.ServerSpec;
 import com.netflix.loadbalancer.Server;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 public class RibbonServerChooser implements ServerChooser<Server> {
@@ -54,12 +56,11 @@ public boolean matchGrayDecisions(Server server) {
 
     @Override
     public ServerListResult<Server> distinguishServerList(List<Server> servers) {
-        GrayRequest grayRequest = requestLocalStorage.getGrayRequest();
-        if (grayRequest == null) {
+        String serviceId = getServiceId(servers);
+        if(StringUtils.isNotEmpty(serviceId)){
             return null;
         }
-
-        return distinguishServerList(grayRequest.getServiceId(), servers);
+        return distinguishServerList(serviceId, servers);
     }
 
 
@@ -78,6 +79,18 @@ public ServerListResult<Server> distinguishAndMatchGrayServerList(List<Server> s
         return serverListResult;
     }
 
+    private String getServiceId(List<Server> servers){
+        GrayRequest grayRequest = requestLocalStorage.getGrayRequest();
+        if (grayRequest != null && StringUtils.isNotEmpty(grayRequest.getServiceId())) {
+            return grayRequest.getServiceId();
+        }
+        Server server = servers.get(0);
+        if(Objects.isNull(server)){
+            return server.getMetaInfo().getServiceIdForDiscovery();
+        }
+        return null;
+    }
+
 
     private ServerListResult<Server> distinguishServerList(String serviceId, List<Server> servers) {
         if (!grayManager.hasGray(serviceId)) {

spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/ribbon/GrayLoadBalanceRule.java

@@ -74,16 +74,15 @@ public Server choose(Object key) {
                     normalServers.add(server);
                 }
             }
-            Optional<Server> server = grayCompositePredicate.chooseRoundRobinAfterFiltering(grayServers, key);
-            if (server.isPresent()) {
-                return expect(server.get());
-            } else {
-                return expect(choose(super.getPredicate(), normalServers, key));
+            if (GrayClientHolder.getGraySwitcher().isEanbleGrayRouting()) {
+                Optional<Server> server = grayCompositePredicate.chooseRoundRobinAfterFiltering(grayServers, key);
+                if (server.isPresent()) {
+                    return expect(server.get());
+                }
             }
-
-        } else {
-            return expect(super.choose(key));
+            return expect(choose(super.getPredicate(), normalServers, key));
         }
+        return expect(super.choose(key));
     }
 
     protected Server choose(AbstractServerPredicate serverPredicate, List<Server> servers, Object key) {

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/ServerChooser.java

@@ -6,40 +6,42 @@
 
 import java.util.List;
 
-public interface ServerChooser <Server> {
+public interface ServerChooser<Server> {
 
     boolean matchGrayDecisions(ServerSpec serverSpec);
 
     boolean matchGrayDecisions(Server server);
 
     /**
      * 区分灰度实例和正常实例
+     *
      * @param servers
      * @return 返回区分后的结果，如果关闭灰度开关，将会返回null
      */
     ServerListResult<Server> distinguishServerList(List<Server> servers);
 
 
-
     /**
      * 区分灰度实例和正常实例,并比对灰度实例的灰度决策
+     *
      * @param servers
      * @return 返回区分及比对后的结果，如果关闭灰度开关，将会返回null
      */
     ServerListResult<Server> distinguishAndMatchGrayServerList(List<Server> servers);
 
 
-
-    default Server chooseServer(List<Server> servers, ListChooser<Server> chooser){
+    default Server chooseServer(List<Server> servers, ListChooser<Server> chooser) {
         ServerListResult<Server> serverListResult = distinguishAndMatchGrayServerList(servers);
-        if(serverListResult==null){
+        if (serverListResult == null) {
             return chooser.choose(servers);
         }
 
-        if(CollectionUtils.isNotEmpty(serverListResult.getGrayServers())){
-            Server server = chooser.choose(serverListResult.getGrayServers());
-            if(server!=null){
-                return server;
+        if (GrayClientHolder.getGraySwitcher().isEanbleGrayRouting()) {
+            if (CollectionUtils.isNotEmpty(serverListResult.getGrayServers())) {
+                Server server = chooser.choose(serverListResult.getGrayServers());
+                if (server != null) {
+                    return server;
+                }
             }
         }
 

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/config/properties/GrayProperties.java

@@ -1,18 +1,15 @@
 package cn.springcloud.gray.client.config.properties;
 
+import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
+@Data
 @ConfigurationProperties("gray")
 public class GrayProperties {
 
     private boolean enabled;
 
+    private boolean grayRouting = false;
 
-    public boolean isEnabled() {
-        return enabled;
-    }
 
-    public void setEnabled(boolean enabled) {
-        this.enabled = enabled;
-    }
 }

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/switcher/EnvGraySwitcher.java

@@ -14,4 +14,9 @@ public EnvGraySwitcher(GrayProperties grayProperties) {
     public boolean state() {
         return grayProperties.isEnabled();
     }
+
+    @Override
+    public boolean isEanbleGrayRouting() {
+        return grayProperties.isGrayRouting();
+    }
 }

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/switcher/GraySwitcher.java

@@ -4,12 +4,19 @@ public interface GraySwitcher {
 
     boolean state();
 
+    boolean isEanbleGrayRouting();
+
 
     public static class DefaultGraySwitcher implements GraySwitcher {
 
         @Override
         public boolean state() {
             return true;
         }
+
+        @Override
+        public boolean isEanbleGrayRouting() {
+            return true;
+        }
     }
 }

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/request/track/GrayTrackHolder.java

@@ -1,5 +1,6 @@
 package cn.springcloud.gray.request.track;
 
+import cn.springcloud.gray.GrayClientHolder;
 import cn.springcloud.gray.model.GrayTrackDefinition;
 import cn.springcloud.gray.request.GrayInfoTracker;
 import cn.springcloud.gray.request.GrayTrackInfo;
@@ -27,6 +28,9 @@ public interface GrayTrackHolder {
 
 
     default <REQ> void recordGrayTrack(GrayTrackInfo info, REQ req) {
+        if(!GrayClientHolder.getGraySwitcher().state()){
+            return;
+        }
         getGrayInfoTrackers().forEach(tracker -> {
             GrayTrackDefinition definition = getGrayTrackDefinition(tracker.name());
             if (definition != null) {