加入spring cloud stream实现gray-server改动后主动推送到gray-client.

Author: saleson

spring-cloud-gray-client/pom.xml

@@ -65,6 +65,11 @@
             <optional>true</optional>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-stream</artifactId>
+        </dependency>
+
     </dependencies>
 
 

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

@@ -0,0 +1,43 @@
+package cn.springcloud.gray;
+
+import cn.springcloud.gray.communication.HttpInformationClient;
+import cn.springcloud.gray.communication.InformationClient;
+import cn.springcloud.gray.communication.RetryableInformationClient;
+import cn.springcloud.gray.decision.GrayDecisionFactoryKeeper;
+
+import java.util.List;
+
+public abstract class AbstractCommunicableGrayManager extends SimpleGrayManager implements CommunicableGrayManager {
+
+    private GrayClientConfig grayClientConfig;
+    private InformationClient informationClient;
+
+    public AbstractCommunicableGrayManager(GrayClientConfig grayClientConfig, GrayDecisionFactoryKeeper grayDecisionFactoryKeeper, List<RequestInterceptor> requestInterceptors) {
+        super(grayDecisionFactoryKeeper, requestInterceptors);
+        this.grayClientConfig = grayClientConfig;
+        createInformationClient();
+    }
+
+    public GrayClientConfig getGrayClientConfig() {
+        return grayClientConfig;
+    }
+
+    @Override
+    public InformationClient getGrayInformationClient() {
+        return informationClient;
+    }
+
+    protected void createInformationClient() {
+
+        GrayClientConfig clientConfig = getGrayClientConfig();
+        InformationClient httpClient = new HttpInformationClient(clientConfig.getServerUrl());
+        if (clientConfig.isRetryable()) {
+            informationClient = new RetryableInformationClient(Math.max(3, clientConfig.getRetryNumberOfRetries()), httpClient);
+        } else {
+            informationClient = httpClient;
+        }
+
+    }
+
+
+}

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

@@ -1,43 +1,9 @@
 package cn.springcloud.gray;
 
-import cn.springcloud.gray.communication.HttpInformationClient;
 import cn.springcloud.gray.communication.InformationClient;
-import cn.springcloud.gray.communication.RetryableInformationClient;
-import cn.springcloud.gray.decision.GrayDecisionFactoryKeeper;
-import cn.springcloud.gray.decision.factory.GrayDecisionFactory;
 
-import java.util.List;
-
-public abstract class CommunicableGrayManager extends SimpleGrayManager {
-
-    private GrayClientConfig grayClientConfig;
-    private InformationClient informationClient;
-
-    public CommunicableGrayManager(GrayClientConfig grayClientConfig, GrayDecisionFactoryKeeper grayDecisionFactoryKeeper, List<RequestInterceptor> requestInterceptors) {
-        super(grayDecisionFactoryKeeper, requestInterceptors);
-        this.grayClientConfig = grayClientConfig;
-        createInformationClient();
-    }
-
-    public GrayClientConfig getGrayClientConfig() {
-        return grayClientConfig;
-    }
-
-    public InformationClient getGrayInformationClient() {
-        return informationClient;
-    }
-
-    protected void createInformationClient() {
-
-        GrayClientConfig clientConfig = getGrayClientConfig();
-        InformationClient httpClient = new HttpInformationClient(clientConfig.getServerUrl());
-        if (clientConfig.isRetryable()) {
-            informationClient = new RetryableInformationClient(Math.max(3, clientConfig.getRetryNumberOfRetries()), httpClient);
-        } else {
-            informationClient = httpClient;
-        }
-
-    }
+public interface CommunicableGrayManager extends GrayManager {
 
+    InformationClient getGrayInformationClient();
 
 }

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

@@ -2,7 +2,6 @@
 
 
 import cn.springcloud.gray.decision.GrayDecisionFactoryKeeper;
-import cn.springcloud.gray.decision.factory.GrayDecisionFactory;
 import cn.springcloud.gray.model.GrayInstance;
 import cn.springcloud.gray.model.GrayService;
 import lombok.extern.slf4j.Slf4j;
@@ -14,7 +13,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 @Slf4j
-public class DefaultGrayManager extends CommunicableGrayManager {
+public class DefaultGrayManager extends AbstractCommunicableGrayManager {
 
     private Timer updateTimer = new Timer("Gray-Update-Timer", true);
 

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

@@ -1,9 +1,8 @@
 package cn.springcloud.gray;
 
-import cn.springcloud.gray.communication.InformationClient;
 import cn.springcloud.gray.decision.GrayDecision;
-import cn.springcloud.gray.model.GrayService;
 import cn.springcloud.gray.model.GrayInstance;
+import cn.springcloud.gray.model.GrayService;
 
 import java.util.Collection;
 import java.util.List;
@@ -39,6 +38,8 @@ public interface GrayManager {
 
     void closeGray(GrayInstance instance);
 
+    void closeGray(String serviceId, String instanceId);
+
     List<RequestInterceptor> getRequeestInterceptors(String interceptroType);
 
 

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

@@ -1,8 +1,6 @@
 package cn.springcloud.gray;
 
-import cn.springcloud.gray.communication.InformationClient;
 import cn.springcloud.gray.decision.GrayDecisionFactoryKeeper;
-import cn.springcloud.gray.decision.factory.GrayDecisionFactory;
 import cn.springcloud.gray.model.GrayInstance;
 import cn.springcloud.gray.model.GrayService;
 import lombok.extern.slf4j.Slf4j;
@@ -65,6 +63,8 @@ protected void updateGrayInstance(Map<String, GrayService> grayServices, GrayIns
                     grayServices.put(service.getServiceId(), service);
                 }
             }
+        } else if (grayServices != this.grayServices) {
+            grayServices.put(service.getServiceId(), service);
         }
         log.debug("添加灰度实例, serviceId:{}, instanceId:{}", instance.getServiceId(), instance.getInstanceId());
         service.setGrayInstance(instance);
@@ -81,6 +81,17 @@ public void closeGray(GrayInstance instance) {
         service.removeGrayInstance(instance.getInstanceId());
     }
 
+    @Override
+    public void closeGray(String serviceId, String instanceId) {
+        GrayService service = getGrayService(serviceId);
+        if (service == null) {
+            log.debug("没有找到灰度服务:{}, 所以无需删除实例:{} 的灰度状态", serviceId, instanceId);
+            return;
+        }
+        log.debug("关闭实例的在灰度状态, serviceId:{}, instanceId:{}", serviceId, instanceId);
+        service.removeGrayInstance(instanceId);
+    }
+
 
     @Override
     public void shutdown() {

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

@@ -14,15 +14,17 @@ public class GrayClientInitializingDestroyBean implements InitializingBean {
 
     private CommunicableGrayManager grayManager;
     private InstanceLocalInfo instanceLocalInfo;
+    private GrayClientConfig clientConfig;
 
-    public GrayClientInitializingDestroyBean(CommunicableGrayManager grayManager, InstanceLocalInfo instanceLocalInfo) {
+    public GrayClientInitializingDestroyBean(
+            CommunicableGrayManager grayManager, GrayClientConfig clientConfig, InstanceLocalInfo instanceLocalInfo) {
         this.grayManager = grayManager;
+        this.clientConfig = clientConfig;
         this.instanceLocalInfo = instanceLocalInfo;
     }
 
     @Override
     public void afterPropertiesSet() throws Exception {
-        GrayClientConfig clientConfig = grayManager.getGrayClientConfig();
         if (clientConfig.isGrayEnroll()) {
             if (clientConfig.grayEnrollDealyTimeInMs() > 0) {
                 Thread t = new Thread(() -> {

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

@@ -5,7 +5,6 @@
 import cn.springcloud.gray.client.config.properties.GrayClientProperties;
 import cn.springcloud.gray.client.config.properties.GrayRequestProperties;
 import cn.springcloud.gray.decision.GrayDecisionFactoryKeeper;
-import cn.springcloud.gray.decision.factory.GrayDecisionFactory;
 import cn.springcloud.gray.request.RequestLocalStorage;
 import cn.springcloud.gray.request.ThreadLocalRequestStorage;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,7 +40,7 @@ public GrayManager grayManager(GrayDecisionFactoryKeeper grayDecisionFactoryKeep
     @ConditionalOnBean({CommunicableGrayManager.class, InstanceLocalInfo.class})
     public GrayClientInitializingDestroyBean grayClientInitializingDestroyBean(
             CommunicableGrayManager grayManager, InstanceLocalInfo instanceLocalInfo) {
-        return new GrayClientInitializingDestroyBean(grayManager, instanceLocalInfo);
+        return new GrayClientInitializingDestroyBean(grayManager, grayClientProperties, instanceLocalInfo);
     }
 
 

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

@@ -3,10 +3,12 @@
 import cn.springcloud.gray.decision.DefaultGrayDecisionFactoryKeeper;
 import cn.springcloud.gray.decision.GrayDecisionFactoryKeeper;
 import cn.springcloud.gray.decision.factory.*;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.convert.ConversionService;
+import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.validation.Validator;
 
 import java.util.List;
@@ -42,8 +44,12 @@ public TraceIpGrayDecisionFactory traceIpGrayDecisionFactory() {
     @Bean
     @ConditionalOnMissingBean
     public GrayDecisionFactoryKeeper grayDecisionFactoryKeeper(
-            ConversionService conversionService, Validator validator, List<GrayDecisionFactory> decisionFactories) {
-        return new DefaultGrayDecisionFactoryKeeper(conversionService, validator, decisionFactories);
+            List<ConversionService> conversionServices, Validator validator, List<GrayDecisionFactory> decisionFactories) {
+        if (CollectionUtils.isNotEmpty(conversionServices)) {
+            return new DefaultGrayDecisionFactoryKeeper(conversionServices.get(0), validator, decisionFactories);
+        }
+        return new DefaultGrayDecisionFactoryKeeper(DefaultConversionService.getSharedInstance(), validator, decisionFactories);
+
     }
 
 

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

@@ -0,0 +1,39 @@
+package cn.springcloud.gray.client.config;
+
+import cn.springcloud.gray.CommunicableGrayManager;
+import cn.springcloud.gray.event.DefaultGrayEventListener;
+import cn.springcloud.gray.event.GrayEventListener;
+import cn.springcloud.gray.event.stream.StreamInput;
+import cn.springcloud.gray.event.stream.StreamMessageListener;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.cloud.stream.annotation.EnableBinding;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class GrayEventAutoConfiguration {
+
+
+    @Bean
+    @ConditionalOnMissingBean
+    public GrayEventListener grayEventListener(CommunicableGrayManager grayManager) {
+        return new DefaultGrayEventListener(grayManager);
+    }
+
+
+    @Configuration
+    @ConditionalOnClass(EnableBinding.class)
+    @EnableBinding({StreamInput.class})
+    @ConditionalOnProperty(value = "spring.cloud.stream.bindings.GrayEventInput.destination")
+    public static class StreamEventConfiguration {
+
+        @Bean
+        public StreamMessageListener streamMessageListener(GrayEventListener grayEventListener) {
+            return new StreamMessageListener(grayEventListener);
+        }
+
+    }
+
+}