优化代码

Author: saleson

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

@@ -5,28 +5,29 @@
 import cn.springcloud.gray.client.netflix.connectionpoint.RibbonConnectionPoint;
 import cn.springcloud.gray.client.netflix.hystrix.HystrixRequestLocalStorage;
 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;
 import feign.hystrix.HystrixFeign;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import java.io.IOException;
 
 @Configuration
 @ConditionalOnBean(GrayManager.class)
 @ConditionalOnClass({HystrixCommand.class, HystrixFeign.class})
-@Import(HystrixGrayTrackWebConfiguration.class)
+//@Import(HystrixGrayTrackWebConfiguration.class)
 public class HystrixGrayAutoConfiguration {
 
 
-    @Autowired
-    private GrayManager grayManager;
-    @Autowired
-    private RequestLocalStorage requestLocalStorage;
-
-
     @Bean
     public RequestLocalStorage requestLocalStorage() {
         return new HystrixRequestLocalStorage();
@@ -39,8 +40,30 @@ public RequestLocalStorage requestLocalStorage() {
      * @return DefaultHystrixRibbonConnectionPoint
      */
     @Bean
-    public RibbonConnectionPoint hystrixRibbonConnectionPoint() {
+    public RibbonConnectionPoint hystrixRibbonConnectionPoint(
+            GrayManager grayManager, RequestLocalStorage requestLocalStorage) {
         return new DefaultHystrixRibbonConnectionPoint(grayManager, requestLocalStorage);
     }
 
+
+    @Bean
+    public GrayTrackFilter grayTrackFilter(
+            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()) {
+                    HystrixRequestContext.initializeContext();
+                }
+                try {
+                    super.doFilter(request, response, chain);
+                } finally {
+                    if (HystrixRequestContext.isCurrentThreadInitialized()) {
+                        HystrixRequestContext.getContextForCurrentThread().shutdown();
+                    }
+                }
+            }
+        };
+    }
 }

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

@@ -5,6 +5,7 @@
 import cn.springcloud.gray.decision.GrayDecisionFactoryKeeper;
 import cn.springcloud.gray.model.GrayInstance;
 import cn.springcloud.gray.model.GrayService;
+import cn.springcloud.gray.model.GrayStatus;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.List;
@@ -83,6 +84,9 @@ private void joinLoadedGrays(Map<String, GrayService> grayServices) {
                         if (grayServices.containsKey(instance.getServiceId())
                                 || grayServices.get(instance.getServiceId())
                                 .getGrayInstance(instance.getInstanceId()) != null) {
+                            if (instance.getGrayStatus() == null) {
+                                instance.setGrayStatus(GrayStatus.OPEN);
+                            }
                             updateGrayInstance(grayServices, instance);
                         }
                     });

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

@@ -23,7 +23,7 @@
 import java.util.List;
 
 @Configuration
-@EnableConfigurationProperties({GrayClientProperties.class, GrayRequestProperties.class})
+@EnableConfigurationProperties({GrayClientProperties.class, GrayRequestProperties.class, GrayLoadProperties.class})
 //@ConditionalOnBean(GrayClientMarkerConfiguration.GrayClientMarker.class)
 @ConditionalOnProperty(value = "gray.enabled")
 @Import({GrayDecisionFactoryConfiguration.class, GrayTrackConfiguration.class})

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

@@ -3,7 +3,6 @@
 
 import cn.springcloud.gray.client.config.properties.GrayTrackProperties;
 import cn.springcloud.gray.communication.InformationClient;
-import cn.springcloud.gray.request.GrayHttpTrackInfo;
 import cn.springcloud.gray.request.GrayInfoTracker;
 import cn.springcloud.gray.request.GrayTrackInfo;
 import cn.springcloud.gray.request.RequestLocalStorage;
@@ -20,7 +19,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 @Configuration
@@ -46,15 +44,10 @@ public static class GrayClientWebConfiguration {
         @Autowired
         private GrayTrackProperties grayTrackProperties;
 
-        @Autowired
-        private List<GrayInfoTracker<GrayHttpTrackInfo, HttpServletRequest>> trackors;
-
-        @Autowired
-        private RequestLocalStorage requestLocalStorage;
-
         @Bean
         @ConditionalOnMissingBean
-        public GrayTrackFilter grayTrackFilter(GrayTrackHolder grayTrackHolder) {
+        public GrayTrackFilter grayTrackFilter(
+                GrayTrackHolder grayTrackHolder, RequestLocalStorage requestLocalStorage) {
             return new GrayTrackFilter(grayTrackHolder, requestLocalStorage);
         }
 

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

@@ -15,6 +15,11 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 
+/**
+ * 灰度事件监听器，处理灰度管控端发来的事件消息。
+ * 事件源分两种：灰度实例的，或灰度追踪的。
+ * 事件类型分两种：更新、删除
+ */
 public class DefaultGrayEventListener implements GrayEventListener, InstanceLocalInfoAware {
 
     private CommunicableGrayManager grayManager;
@@ -58,6 +63,10 @@ private DefaultGrayEventListener putHandler(SourceType sourceType, Consumer<Gray
 
 
     private void handleGrayInstance(GrayEventMsg msg) {
+        if (StringUtils.equals(msg.getServiceId(), instanceLocalInfo.getServiceId())
+                && StringUtils.equals(msg.getInstanceId(), instanceLocalInfo.getInstanceId())) {
+            return;
+        }
         switch (msg.getEventType()) {
             case DOWN:
                 grayManager.closeGray(msg.getServiceId(), msg.getInstanceId());