修复灰度追踪的bug

Author: saleson

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

@@ -25,6 +25,7 @@ public abstract class AbstractGrayManager implements GrayManager {
 
     private GrayDecisionFactoryKeeper grayDecisionFactoryKeeper;
     private Map<String, List<RequestInterceptor>> requestInterceptors = new HashMap<>();
+    private List<RequestInterceptor> communalRequestInterceptors = ListUtils.EMPTY_LIST;
 
 
     public AbstractGrayManager(
@@ -37,7 +38,7 @@ public AbstractGrayManager(
     public List<RequestInterceptor> getRequeestInterceptors(String interceptroType) {
         List<RequestInterceptor> list = requestInterceptors.get(interceptroType);
         if (list == null) {
-            return ListUtils.EMPTY_LIST;
+            return communalRequestInterceptors;
         }
         return list;
     }
@@ -78,8 +79,8 @@ private GrayDecision createGrayDecision(PolicyDefinition policyDefinition) {
 
     public void setRequestInterceptors(Collection<RequestInterceptor> requestInterceptors) {
         Map<String, List<RequestInterceptor>> requestInterceptorMap = new HashMap<>();
+        List<RequestInterceptor> all = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(requestInterceptors)) {
-            List<RequestInterceptor> all = new ArrayList<>();
             for (RequestInterceptor interceptor : requestInterceptors) {
                 if (StringUtils.equals(interceptor.interceptroType(), "all")) {
                     all.add(interceptor);
@@ -93,8 +94,11 @@ public void setRequestInterceptors(Collection<RequestInterceptor> requestInterce
                 }
             }
             putTypeAllTo(requestInterceptorMap, all);
+            this.communalRequestInterceptors = all;
         }
+        this.communalRequestInterceptors = all;
         this.requestInterceptors = requestInterceptorMap;
+
     }
 
     private void putTypeAllTo(Map<String, List<RequestInterceptor>> requestInterceptorMap, List<RequestInterceptor> all) {

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/web/tracker/HttpHeaderGrayInfoTracker.java

@@ -6,7 +6,9 @@
 import org.springframework.util.StringUtils;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.Enumeration;
+import java.util.List;
 
 @Slf4j
 public class HttpHeaderGrayInfoTracker implements HttpGrayInfoTracker {
@@ -23,11 +25,13 @@ public void call(TrackArgs<GrayHttpTrackInfo, HttpServletRequest> args) {
 
         for (String header : defValue.split(",")) {
             Enumeration<String> headerValues = request.getHeaders(header);
+            List<String> values = new ArrayList<>();
             while (headerValues.hasMoreElements()) {
                 String value = headerValues.nextElement();
-                trackInfo.addHeader(header, value);
-                log.debug("记录下header:{} -> {}", header, value);
+                values.add(value);
             }
+            log.debug("记录下header:{} -> {}", header, values);
+            trackInfo.setHeader(header, values);
         }
     }
 }

spring-cloud-gray-samples/spring-cloud-gray-service-a1-sample/src/main/java/cn/springcloud/service/a/rest/TestResource.java

@@ -1,25 +1,40 @@
 package cn.springcloud.service.a.rest;
 
+import cn.springcloud.gray.request.GrayHttpTrackInfo;
 import com.google.common.collect.ImmutableMap;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Enumeration;
 import java.util.Map;
 
 /**
  * Created by saleson on 2017/10/18.
  */
 @RestController
 @RequestMapping("/api/test")
+@Slf4j
 public class TestResource {
     @Autowired
     Environment env;
 
     @RequestMapping(value = "/get", method = RequestMethod.GET)
     @ResponseBody
-    public Map<String, String> testGet(@RequestParam(value = "version", required = false) String version) {
+    public Map<String, String> testGet(
+            @RequestParam(value = "version", required = false) String version,
+            HttpServletRequest request) {
+        Enumeration<String> names = request.getHeaderNames();
+        while (names.hasMoreElements()) {
+            String name = names.nextElement();
+            if (StringUtils.startsWith(name, GrayHttpTrackInfo.GRAY_TRACK_HEADER_PREFIX)) {
+                log.info("{}:{}", name, request.getHeader(name));
+            }
+        }
+        request.getHeader("");
         return ImmutableMap.of("test", "success.", "version", StringUtils.defaultIfEmpty(version, ""), "serverPort", env.getProperty("server.port"));
     }
 

spring-cloud-gray-samples/spring-cloud-gray-service-b-sample/src/main/java/cn/springcloud/gray/service/b/rest/TestResource.java

@@ -1,20 +1,24 @@
 package cn.springcloud.gray.service.b.rest;
 
+import cn.springcloud.gray.request.GrayHttpTrackInfo;
 import cn.springcloud.gray.service.b.feign.TestClient;
 import com.google.common.collect.ImmutableMap;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Enumeration;
 import java.util.Map;
 
 /**
  * Created by saleson on 2017/10/18.
  */
 @RestController
 @RequestMapping("/api/test")
+@Slf4j
 public class TestResource {
     @Autowired
     private RestTemplate restTemplate;
@@ -57,7 +61,20 @@ public Map<String, Object> restTemplateGet(HttpServletRequest request) {
      */
     @RequestMapping(value = "/feignGet", method = RequestMethod.GET)
     @ResponseBody
-    public Map<String, Object> feignGet(@RequestParam(value = "version", required = false) String version) {
+    public Map<String, Object> feignGet(
+            @RequestParam(value = "version", required = false) String version,
+            HttpServletRequest request) {
+        Enumeration<String> names = request.getHeaderNames();
+        while (names.hasMoreElements()) {
+            String name = names.nextElement();
+            if (org.apache.commons.lang.StringUtils.startsWith(name, GrayHttpTrackInfo.GRAY_TRACK_HEADER_PREFIX)) {
+                log.info("{}:{}", name, request.getHeader(name));
+                Enumeration<String> values = request.getHeaders(name);
+                while (values.hasMoreElements()) {
+                    System.out.println(values.nextElement());
+                }
+            }
+        }
         Map map = testClient.testGet(version);
         return ImmutableMap.of("feignGet", "success.", "service-a-result", map);
     }