Merge pull request #12 from SpringCloud/2.0

2.0

Author: saleson

pom.xml

@@ -12,7 +12,7 @@
     <groupId>cn.springcloud.gray</groupId>
     <artifactId>spring-cloud-gray</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
     <url>https://github.com/SpringCloud/spring-cloud-gray</url>
     <organization>
         <name>Spring Cloud中国社区</name>

spring-cloud-gray-client-netflix/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gray</artifactId>
         <groupId>cn.springcloud.gray</groupId>
-        <version>2.0.0</version>
+        <version>2.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -2,9 +2,8 @@
 
 import cn.springcloud.gray.GrayManager;
 import cn.springcloud.gray.client.netflix.hystrix.HystrixRequestLocalStorage;
-import cn.springcloud.gray.request.GrayHttpTrackInfo;
-import cn.springcloud.gray.request.GrayInfoTracker;
 import cn.springcloud.gray.request.RequestLocalStorage;
+import cn.springcloud.gray.request.track.GrayTrackHolder;
 import cn.springcloud.gray.web.GrayTrackFilter;
 import com.netflix.hystrix.HystrixCommand;
 import com.netflix.hystrix.strategy.concurrency.HystrixRequestContext;
@@ -18,9 +17,7 @@
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
-import java.util.List;
 
 @Configuration
 @ConditionalOnClass({HystrixCommand.class, HystrixFeign.class})
@@ -39,9 +36,9 @@ public RequestLocalStorage requestLocalStorage() {
 
     @Bean
     public GrayTrackFilter grayTrackFilter(
-            RequestLocalStorage requestLocalStorage,
-            List<GrayInfoTracker<GrayHttpTrackInfo, HttpServletRequest>> trackors) {
-        return new GrayTrackFilter(requestLocalStorage, trackors) {
+            GrayTrackHolder grayTrackHolder,
+            RequestLocalStorage requestLocalStorage) {
+        return new GrayTrackFilter(grayTrackHolder, requestLocalStorage) {
             @Override
             public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
                 if (!HystrixRequestContext.isCurrentThreadInitialized()) {

spring-cloud-gray-client/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-gray</artifactId>
         <groupId>cn.springcloud.gray</groupId>
-        <version>2.0.0</version>
+        <version>2.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>cn.springcloud.gray</groupId>
             <artifactId>spring-cloud-gray-utils</artifactId>
-            <version>2.0.0</version>
+            <version>2.1.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

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

@@ -1,8 +1,6 @@
 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;
@@ -12,9 +10,12 @@ public abstract class AbstractCommunicableGrayManager extends SimpleGrayManager
     private GrayClientConfig grayClientConfig;
     private InformationClient informationClient;
 
-    public AbstractCommunicableGrayManager(GrayClientConfig grayClientConfig, GrayDecisionFactoryKeeper grayDecisionFactoryKeeper, List<RequestInterceptor> requestInterceptors) {
+    public AbstractCommunicableGrayManager(
+            GrayClientConfig grayClientConfig, GrayDecisionFactoryKeeper grayDecisionFactoryKeeper,
+            List<RequestInterceptor> requestInterceptors, InformationClient informationClient) {
         super(grayDecisionFactoryKeeper, requestInterceptors);
         this.grayClientConfig = grayClientConfig;
+        this.informationClient = informationClient;
         createInformationClient();
     }
 
@@ -29,13 +30,6 @@ public InformationClient getGrayInformationClient() {
 
     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,9 +1,7 @@
 package cn.springcloud.gray;
 
-import cn.springcloud.gray.communication.InformationClient;
 
-public interface CommunicableGrayManager extends GrayManager {
+public interface CommunicableGrayManager extends GrayManager, GrayServerCommunicable {
 
-    InformationClient getGrayInformationClient();
 
 }

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

@@ -1,6 +1,7 @@
 package cn.springcloud.gray;
 
-
+import cn.springcloud.gray.client.config.properties.GrayLoadProperties;
+import cn.springcloud.gray.communication.InformationClient;
 import cn.springcloud.gray.decision.GrayDecisionFactoryKeeper;
 import cn.springcloud.gray.model.GrayInstance;
 import cn.springcloud.gray.model.GrayService;
@@ -16,46 +17,80 @@
 public class DefaultGrayManager extends AbstractCommunicableGrayManager {
 
     private Timer updateTimer = new Timer("Gray-Update-Timer", true);
-
-    public DefaultGrayManager(GrayClientConfig grayClientConfig, GrayDecisionFactoryKeeper grayDecisionFactoryKeeper,
-                              List<RequestInterceptor> requestInterceptors) {
-        super(grayClientConfig, grayDecisionFactoryKeeper, requestInterceptors);
+    private GrayLoadProperties grayLoadProperties;
+
+    public DefaultGrayManager(
+            GrayClientConfig grayClientConfig,
+            GrayLoadProperties grayLoadProperties,
+            GrayDecisionFactoryKeeper grayDecisionFactoryKeeper,
+            List<RequestInterceptor> requestInterceptors,
+            InformationClient informationClient) {
+        super(grayClientConfig, grayDecisionFactoryKeeper, requestInterceptors, informationClient);
+        this.grayLoadProperties = grayLoadProperties;
         openForWork();
     }
 
-
     public void openForWork() {
         log.info("拉取灰度列表");
-        doUpdate();
-        updateTimer.schedule(new UpdateTask(),
-                getGrayClientConfig().getServiceUpdateIntervalTimerInMs(),
-                getGrayClientConfig().getServiceUpdateIntervalTimerInMs());
-    }
+        if (getGrayInformationClient() != null) {
+            doUpdate();
+            int timerMs = getGrayClientConfig().getServiceUpdateIntervalTimerInMs();
+            if (timerMs > 0) {
+                updateTimer.schedule(new UpdateTask(), timerMs, timerMs);
+            }
+        } else {
+            loadPropertiesGrays();
+        }
 
+    }
 
     private void doUpdate() {
         try {
             log.debug("更新灰度服务列表...");
-
             List<GrayInstance> grayInstances = getGrayInformationClient().allGrayInstances();
             Map<String, GrayService> grayServices = new ConcurrentHashMap<>();
-            grayInstances.forEach(instance -> {
-                updateGrayInstance(grayServices, instance);
-            });
+            grayInstances.forEach(
+                    instance -> {
+                        updateGrayInstance(grayServices, instance);
+                    });
+            joinLoadedGrays(grayServices);
             this.grayServices = grayServices;
         } catch (Exception e) {
             log.error("更新灰度服务列表失败", e);
         }
     }
 
 
+    private void loadPropertiesGrays() {
+        Map<String, GrayService> grayServices = new ConcurrentHashMap<>();
+        joinLoadedGrays(grayServices);
+        this.grayServices = grayServices;
+    }
+
+
+    /**
+     * 加入配置文件中的灰度实例，但不会覆盖列表中的信息
+     *
+     * @param grayServices 更新的灰度列表
+     */
+    private void joinLoadedGrays(Map<String, GrayService> grayServices) {
+        if (grayLoadProperties != null && grayLoadProperties.isEnabled()) {
+            grayLoadProperties.getGrayInstances().forEach(
+                    instance -> {
+                        if (grayServices.containsKey(instance.getServiceId())
+                                || grayServices.get(instance.getServiceId())
+                                .getGrayInstance(instance.getInstanceId()) != null) {
+                            updateGrayInstance(grayServices, instance);
+                        }
+                    });
+        }
+    }
+
     class UpdateTask extends TimerTask {
 
         @Override
         public void run() {
             doUpdate();
         }
     }
-
-
 }

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

@@ -34,7 +34,7 @@ public interface GrayClientConfig {
 
 
     /**
-     * 更新灰度列表的时间间隔(ms)
+     * 更新灰度列表的时间间隔(ms)，小于等于0将不会开启定时轮询
      *
      * @return 返回更新灰度列表的时间间隔(ms)
      */

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

@@ -0,0 +1,8 @@
+package cn.springcloud.gray;
+
+import cn.springcloud.gray.communication.InformationClient;
+
+public interface GrayServerCommunicable {
+
+    InformationClient getGrayInformationClient();
+}

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

@@ -0,0 +1,6 @@
+package cn.springcloud.gray;
+
+public interface InstanceLocalInfoAware {
+
+    void setInstanceLocalInfo(InstanceLocalInfo instanceLocalInfo);
+}