...

Author: saleson

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

@@ -5,26 +5,18 @@
 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.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import java.io.IOException;
+import org.springframework.context.annotation.Import;
 
 @Configuration
 @ConditionalOnBean(GrayManager.class)
 @ConditionalOnClass({HystrixCommand.class, HystrixFeign.class})
-//@Import(HystrixGrayTrackWebConfiguration.class)
+@Import(HystrixGrayTrackWebConfiguration.class)
 public class HystrixGrayAutoConfiguration {
 
 
@@ -46,24 +38,24 @@ public RibbonConnectionPoint hystrixRibbonConnectionPoint(
     }
 
 
-    @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();
-                    }
-                }
-            }
-        };
-    }
+//    @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

@@ -0,0 +1,43 @@
+package cn.springcloud.gray.client.netflix.configuration;
+
+import cn.springcloud.gray.request.RequestLocalStorage;
+import cn.springcloud.gray.request.track.GrayTrackHolder;
+import cn.springcloud.gray.web.GrayTrackFilter;
+import com.netflix.hystrix.strategy.concurrency.HystrixRequestContext;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import java.io.IOException;
+
+@Configuration
+@ConditionalOnProperty(value = "gray.request.track.enabled", matchIfMissing = true)
+public class HystrixGrayTrackWebConfiguration {
+
+
+    @Bean
+    @ConditionalOnProperty(value = "gray.client.runenv", havingValue = "web", matchIfMissing = true)
+    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/NetflixGrayAutoConfiguration.java

@@ -5,7 +5,6 @@
 import cn.springcloud.gray.client.netflix.connectionpoint.RibbonConnectionPoint;
 import cn.springcloud.gray.client.netflix.ribbon.configuration.GrayRibbonClientsConfiguration;
 import cn.springcloud.gray.request.RequestLocalStorage;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.cloud.netflix.ribbon.RibbonClients;
@@ -18,15 +17,10 @@
 public class NetflixGrayAutoConfiguration {
 
 
-    @Autowired
-    private GrayManager grayManager;
-    @Autowired
-    private RequestLocalStorage requestLocalStorage;
-
-
     @Bean
     @ConditionalOnMissingBean
-    public RibbonConnectionPoint ribbonConnectionPoint() {
+    public RibbonConnectionPoint ribbonConnectionPoint(
+            GrayManager grayManager, RequestLocalStorage requestLocalStorage) {
         return new DefaultRibbonConnectionPoint(grayManager, requestLocalStorage);
     }
 

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

@@ -16,22 +16,22 @@
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ConditionalOnBean(GrayManager.class)
+@ConditionalOnBean(
+        value = {GrayManager.class},
+        name = {"zuulServlet"})
 @ConditionalOnClass(value = ZuulServlet.class)
 public class GrayZuulAutoConfiguration {
 
     @Autowired
     private GrayRequestProperties grayRequestProperties;
-    @Autowired
-    private RibbonConnectionPoint ribbonConnectionPoint;
 
     @Bean
-    public GrayPreZuulFilter grayPreZuulFilter() {
+    public GrayPreZuulFilter grayPreZuulFilter(RibbonConnectionPoint ribbonConnectionPoint) {
         return new GrayPreZuulFilter(grayRequestProperties, ribbonConnectionPoint);
     }
 
     @Bean
-    public GrayPostZuulFilter grayPostZuulFilter() {
+    public GrayPostZuulFilter grayPostZuulFilter(RibbonConnectionPoint ribbonConnectionPoint) {
         return new GrayPostZuulFilter(ribbonConnectionPoint);
     }