添加Decision日志

saleson · saleson · commit 99a56ea902c6 · 2020-07-29T17:00:11.000+08:00
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/factory/FlowRateGrayDecisionFactory.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/factory/FlowRateGrayDecisionFactory.java
@@ -5,6 +5,8 @@
 import cn.springcloud.gray.request.GrayHttpTrackInfo;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.Collection;
@@ -17,6 +19,7 @@
  * 按(value(type,feild)+salt)%100， &lt; rate的将放量。
  * 从以上的逻辑中实现按百分比灰度放量.
  */
+@Slf4j
 public class FlowRateGrayDecisionFactory extends AbstractGrayDecisionFactory<FlowRateGrayDecisionFactory.Config> {
 
     public static final String FIELD_SCOPE_HTTP_HEADER = "HttpHeader";
@@ -38,11 +41,16 @@ public GrayDecision apply(Config configBean) {
             GrayHttpRequest grayHttpRequest = (GrayHttpRequest) args.getGrayRequest();
             String value = getFieldValue(grayHttpRequest, configBean);
             if (StringUtils.isEmpty(value)) {
+                log.debug("[FlowRateGrayDecision] serviceId:{}, uri:{}, decisionConfig:{}, testResult:{}",
+                        grayHttpRequest.getServiceId(), grayHttpRequest.getUri(), configBean, false);
                 return false;
             }
             int hashcode = Math.abs((value + StringUtils.defaultString(configBean.getSalt())).hashCode());
             int mod = hashcode % 100;
-            return mod <= configBean.getRate();
+            boolean b = mod <= configBean.getRate();
+            log.debug("[FlowRateGrayDecision] serviceId:{}, uri:{}, decisionConfig:{}, mod:{}, testResult:{}",
+                    grayHttpRequest.getServiceId(), grayHttpRequest.getUri(), configBean, mod, b);
+            return b;
         };
     }
 
@@ -97,6 +105,7 @@ private String joinString(Collection<String> collection) {
 
     @Setter
     @Getter
+    @ToString
     public static class Config {
         private String type;
         private String field;
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/factory/HttpHeaderGrayDecisionFactory.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/factory/HttpHeaderGrayDecisionFactory.java
@@ -4,15 +4,16 @@
 import cn.springcloud.gray.decision.compare.Comparators;
 import cn.springcloud.gray.decision.compare.PredicateComparator;
 import cn.springcloud.gray.request.GrayHttpRequest;
+import cn.springcloud.gray.utils.JsonUtils;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 
 public class HttpHeaderGrayDecisionFactory
         extends CompareGrayDecisionFactory<HttpHeaderGrayDecisionFactory.Config> {
@@ -31,16 +32,25 @@ public GrayDecision apply(Config configBean) {
             PredicateComparator<Collection<String>> predicateComparator =
                     Comparators.getCollectionStringComparator(configBean.getCompareMode());
             if (predicateComparator == null) {
-                log.warn("没有找到相应与compareMode'{}'对应的PredicateComparator", configBean.getCompareMode());
+                log.warn("[HttpHeaderGrayDecision] serviceId:{}, uri:{}, 没有找到相应与compareMode'{}'对应的PredicateComparator, testResult:{}",
+                        grayRequest.getServiceId(), grayRequest.getUri(), configBean.getCompareMode(), false);
                 return false;
             }
-            return predicateComparator.test(grayRequest.getHeader(configBean.getHeader()), configBean.getValues());
+
+            List<String> headerValues = grayRequest.getHeader(configBean.getHeader());
+            boolean b = predicateComparator.test(headerValues, configBean.getValues());
+            if (log.isDebugEnabled()) {
+                log.debug("[HttpHeaderGrayDecision] serviceId:{}, uri:{}, decisionConfig:{}, headerValues:{}, testResult:{}",
+                        grayRequest.getServiceId(), grayRequest.getUri(), JsonUtils.toJsonString(configBean), headerValues, b);
+            }
+            return b;
         };
     }
 
 
     @Setter
     @Getter
+    @ToString
     public static class Config extends CompareGrayDecisionFactory.CompareConfig {
         private String header;
         private List<String> values;
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/factory/HttpMethodGrayDecisionFactory.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/factory/HttpMethodGrayDecisionFactory.java
@@ -4,8 +4,10 @@
 import cn.springcloud.gray.decision.compare.Comparators;
 import cn.springcloud.gray.decision.compare.PredicateComparator;
 import cn.springcloud.gray.request.GrayHttpRequest;
+import cn.springcloud.gray.utils.JsonUtils;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpMethod;
@@ -26,16 +28,23 @@ public GrayDecision apply(Config configBean) {
             GrayHttpRequest grayRequest = (GrayHttpRequest) args.getGrayRequest();
             PredicateComparator<String> predicateComparator = Comparators.getStringComparator(configBean.getCompareMode());
             if (predicateComparator == null) {
-                log.warn("没有找到相应与compareMode'{}'对应的PredicateComparator", configBean.getCompareMode());
+                log.warn("[HttpMethodGrayDecision] serviceId:{}, uri:{}, 没有找到相应与compareMode'{}'对应的PredicateComparator, testResult:{}",
+                        grayRequest.getServiceId(), grayRequest.getUri(), configBean.getCompareMode(), false);
                 return false;
             }
-            return predicateComparator.test(grayRequest.getMethod(), configBean.getMethod().name());
+            boolean b = predicateComparator.test(grayRequest.getMethod(), configBean.getMethod().name());
+            if (log.isDebugEnabled()) {
+                log.debug("[HttpMethodGrayDecision] serviceId:{}, uri:{}, decisionConfig:{}, headerValues:{}, testResult:{}",
+                        grayRequest.getServiceId(), grayRequest.getUri(), JsonUtils.toJsonString(configBean), grayRequest.getMethod(), b);
+            }
+            return b;
         };
     }
 
 
     @Setter
     @Getter
+    @ToString
     public static class Config extends CompareGrayDecisionFactory.CompareConfig {
         private HttpMethod method;
 
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/factory/HttpParameterGrayDecisionFactory.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/factory/HttpParameterGrayDecisionFactory.java
@@ -4,8 +4,10 @@
 import cn.springcloud.gray.decision.compare.Comparators;
 import cn.springcloud.gray.decision.compare.PredicateComparator;
 import cn.springcloud.gray.request.GrayHttpRequest;
+import cn.springcloud.gray.utils.JsonUtils;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,13 +34,20 @@ public GrayDecision apply(Config configBean) {
                 log.warn("没有找到相应与compareMode'{}'对应的PredicateComparator", configBean.getCompareMode());
                 return false;
             }
-            return predicateComparator.test(grayRequest.getParameter(configBean.getName()), configBean.getValues());
+            List<String> parameters = grayRequest.getParameter(configBean.getName());
+            boolean b = predicateComparator.test(parameters, configBean.getValues());
+            if (log.isDebugEnabled()) {
+                log.debug("[HttpParameterGrayDecision] serviceId:{}, uri:{}, decisionConfig:{}, headerValues:{}, testResult:{}",
+                        grayRequest.getServiceId(), grayRequest.getUri(), JsonUtils.toJsonString(configBean), grayRequest.getMethod(), b);
+            }
+            return b;
         };
     }
 
 
     @Setter
     @Getter
+    @ToString
     public static class Config extends CompareGrayDecisionFactory.CompareConfig {
         private String name;
         private List<String> values;
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/factory/HttpTrackHeaderGrayDecisionFactory.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/factory/HttpTrackHeaderGrayDecisionFactory.java
@@ -3,12 +3,17 @@
 import cn.springcloud.gray.decision.GrayDecision;
 import cn.springcloud.gray.decision.compare.Comparators;
 import cn.springcloud.gray.decision.compare.PredicateComparator;
+import cn.springcloud.gray.request.GrayHttpRequest;
 import cn.springcloud.gray.request.GrayHttpTrackInfo;
+import cn.springcloud.gray.utils.JsonUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.Collection;
+import java.util.List;
 
+@Slf4j
 public class HttpTrackHeaderGrayDecisionFactory extends CompareGrayDecisionFactory<HttpHeaderGrayDecisionFactory.Config> {
 
     private static final Logger log = LoggerFactory.getLogger(HttpTrackHeaderGrayDecisionFactory.class);
@@ -20,19 +25,29 @@ public HttpTrackHeaderGrayDecisionFactory() {
     @Override
     public GrayDecision apply(HttpHeaderGrayDecisionFactory.Config configBean) {
         return args -> {
-            GrayHttpTrackInfo grayTrackInfo = (GrayHttpTrackInfo) args.getGrayRequest().getGrayTrackInfo();
+            GrayHttpRequest grayRequest = (GrayHttpRequest) args.getGrayRequest();
+            GrayHttpTrackInfo grayTrackInfo = (GrayHttpTrackInfo) grayRequest.getGrayTrackInfo();
             if (grayTrackInfo == null) {
-                log.warn("没有获取到灰度追踪信息");
+                log.warn("[HttpTrackHeaderGrayDecision] serviceId:{}, uri:{} 没有获取到灰度追踪信息, testReslut:{}",
+                        grayRequest.getServiceId(), grayRequest.getUri(), false);
                 return false;
             }
 
             PredicateComparator<Collection<String>> predicateComparator =
                     Comparators.getCollectionStringComparator(configBean.getCompareMode());
             if (predicateComparator == null) {
-                log.warn("没有找到相应与compareMode'{}'对应的PredicateComparator", configBean.getCompareMode());
+                log.warn("[HttpTrackHeaderGrayDecision] serviceId:{}, uri:{} 没有找到相应与compareMode'{}'对应的PredicateComparator, testReslut:{}",
+                        grayRequest.getServiceId(), grayRequest.getUri(), configBean.getCompareMode(), false);
                 return false;
             }
-            return predicateComparator.test(grayTrackInfo.getHeader(configBean.getHeader()), configBean.getValues());
+
+            List<String> headerValues = grayTrackInfo.getHeader(configBean.getHeader());
+            boolean b = predicateComparator.test(headerValues, configBean.getValues());
+            if (log.isDebugEnabled()) {
+                log.debug("[HttpTrackHeaderGrayDecision] serviceId:{}, uri:{}, decisionConfig:{}, trackHeader:{}, testReslut:{}",
+                        grayRequest.getServiceId(), grayRequest.getUri(), JsonUtils.toJsonString(configBean), headerValues, b);
+            }
+            return b;
         };
     }
 }
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/factory/HttpTrackParameterGrayDecisionFactory.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/factory/HttpTrackParameterGrayDecisionFactory.java
@@ -3,11 +3,14 @@
 import cn.springcloud.gray.decision.GrayDecision;
 import cn.springcloud.gray.decision.compare.Comparators;
 import cn.springcloud.gray.decision.compare.PredicateComparator;
+import cn.springcloud.gray.request.GrayHttpRequest;
 import cn.springcloud.gray.request.GrayHttpTrackInfo;
+import cn.springcloud.gray.utils.JsonUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.Collection;
+import java.util.List;
 
 public class HttpTrackParameterGrayDecisionFactory extends CompareGrayDecisionFactory<HttpParameterGrayDecisionFactory.Config> {
 
@@ -20,18 +23,28 @@ public HttpTrackParameterGrayDecisionFactory() {
     @Override
     public GrayDecision apply(HttpParameterGrayDecisionFactory.Config configBean) {
         return args -> {
-            GrayHttpTrackInfo grayTrackInfo = (GrayHttpTrackInfo) args.getGrayRequest().getGrayTrackInfo();
+            GrayHttpRequest grayRequest = (GrayHttpRequest) args.getGrayRequest();
+            GrayHttpTrackInfo grayTrackInfo = (GrayHttpTrackInfo) grayRequest.getGrayTrackInfo();
             if (grayTrackInfo == null) {
-                log.warn("没有获取到灰度追踪信息");
+                log.warn("[HttpTrackParameterGrayDecision] serviceId:{}, uri:{} 没有获取到灰度追踪信息, testResult:{}",
+                        grayRequest.getServiceId(), grayRequest.getUri(), false);
                 return false;
             }
             PredicateComparator<Collection<String>> predicateComparator =
                     Comparators.getCollectionStringComparator(configBean.getCompareMode());
             if (predicateComparator == null) {
-                log.warn("没有找到相应与compareMode'{}'对应的PredicateComparator", configBean.getCompareMode());
+                log.warn("[HttpTrackParameterGrayDecision] serviceId:{}, uri:{} 没有找到相应与compareMode'{}'对应的PredicateComparator, testReslut:{}",
+                        grayRequest.getServiceId(), grayRequest.getUri(), configBean.getCompareMode(), false);
                 return false;
             }
-            return predicateComparator.test(grayTrackInfo.getParameter(configBean.getName()), configBean.getValues());
+
+            List<String> parameters = grayTrackInfo.getParameter(configBean.getName());
+            boolean b = predicateComparator.test(parameters, configBean.getValues());
+            if (log.isDebugEnabled()) {
+                log.debug("[HttpTrackParameterGrayDecision] serviceId:{}, uri:{}, decisionConfig:{}, trackParameter:{}, testReslut:{}",
+                        grayRequest.getServiceId(), grayRequest.getUri(), JsonUtils.toJsonString(configBean), parameters, b);
+            }
+            return b;
         };
     }
 }
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/factory/TraceIpGrayDecisionFactory.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/factory/TraceIpGrayDecisionFactory.java
@@ -1,6 +1,7 @@
 package cn.springcloud.gray.decision.factory;
 
 import cn.springcloud.gray.decision.GrayDecision;
+import cn.springcloud.gray.request.GrayRequest;
 import cn.springcloud.gray.request.GrayTrackInfo;
 import lombok.Getter;
 import lombok.Setter;
@@ -23,18 +24,26 @@ public TraceIpGrayDecisionFactory() {
     public GrayDecision apply(Config configBean) {
         return args -> {
             Pattern pat = Pattern.compile(configBean.getIp());
-            GrayTrackInfo trackInfo = args.getGrayRequest().getGrayTrackInfo();
+            GrayRequest grayRequest = args.getGrayRequest();
+            GrayTrackInfo trackInfo = grayRequest.getGrayTrackInfo();
             if (trackInfo == null) {
-                log.warn("没有获取到灰度追踪信息");
+                log.warn("[TraceIpGrayDecision] serviceId:{} 没有获取到灰度追踪信息, testResult:{}",
+                        grayRequest.getServiceId(), false);
                 return false;
             }
             String traceIp = trackInfo.getTraceIp();
             if (StringUtils.isEmpty(traceIp)) {
-                log.warn("灰度追踪记录的ip为空");
+                log.warn("[TraceIpGrayDecision] serviceId:{} 灰度追踪记录的ip为空, testResult:{}",
+                        grayRequest.getServiceId(), false);
                 return false;
             }
             Matcher mat = pat.matcher(traceIp);
-            return mat.find();
+            boolean b = mat.find();
+            if (log.isDebugEnabled()) {
+                log.debug("[TraceIpGrayDecision] serviceId:{} config.ip:{}, traceIp:{}, testResult:{}",
+                        grayRequest.getServiceId(), configBean.getIp(), traceIp, false);
+            }
+            return b;
         };
     }
 
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/factory/TrackAttributeGrayDecisionFactory.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/factory/TrackAttributeGrayDecisionFactory.java
@@ -3,7 +3,9 @@
 import cn.springcloud.gray.decision.GrayDecision;
 import cn.springcloud.gray.decision.compare.Comparators;
 import cn.springcloud.gray.decision.compare.PredicateComparator;
-import cn.springcloud.gray.request.GrayHttpTrackInfo;
+import cn.springcloud.gray.request.GrayRequest;
+import cn.springcloud.gray.request.GrayTrackInfo;
+import cn.springcloud.gray.utils.JsonUtils;
 import lombok.Getter;
 import lombok.Setter;
 import org.slf4j.Logger;
@@ -21,17 +23,27 @@ public TrackAttributeGrayDecisionFactory() {
     @Override
     public GrayDecision apply(Config configBean) {
         return args -> {
-            GrayHttpTrackInfo grayTrackInfo = (GrayHttpTrackInfo) args.getGrayRequest().getGrayTrackInfo();
+            GrayRequest grayRequest = args.getGrayRequest();
+            GrayTrackInfo grayTrackInfo = grayRequest.getGrayTrackInfo();
             if (grayTrackInfo == null) {
-                log.warn("没有获取到灰度追踪信息");
+                log.warn("[TrackAttributeGrayDecision] serviceId:{} 没有获取到灰度追踪信息, testResult:{}",
+                        grayRequest.getServiceId(), false);
                 return false;
             }
             PredicateComparator<String> predicateComparator = Comparators.getStringComparator(configBean.getCompareMode());
             if (predicateComparator == null) {
-                log.warn("没有找到相应与compareMode'{}'对应的PredicateComparator", configBean.getCompareMode());
+                log.warn("[TrackAttributeGrayDecision] serviceId:{} 没有找到相应与compareMode'{}'对应的PredicateComparator, testResult:{}",
+                        grayRequest.getServiceId(), configBean.getCompareMode(), false);
                 return false;
             }
-            return predicateComparator.test(grayTrackInfo.getAttribute(configBean.getName()), configBean.getValue());
+
+            String attributeValue = grayTrackInfo.getAttribute(configBean.getName());
+            boolean b = predicateComparator.test(attributeValue, configBean.getValue());
+            if (log.isDebugEnabled()) {
+                log.debug("[TrackAttributeGrayDecision] serviceId:{}, decisionConfig:{}, attributeValue:{}, testReslut:{}",
+                        grayRequest.getServiceId(), JsonUtils.toJsonString(configBean), attributeValue, b);
+            }
+            return b;
         };
     }
 
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/factory/TrackAttributesGrayDecisionFactory.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/decision/factory/TrackAttributesGrayDecisionFactory.java
@@ -3,7 +3,9 @@
 import cn.springcloud.gray.decision.GrayDecision;
 import cn.springcloud.gray.decision.compare.Comparators;
 import cn.springcloud.gray.decision.compare.PredicateComparator;
-import cn.springcloud.gray.request.GrayHttpTrackInfo;
+import cn.springcloud.gray.request.GrayRequest;
+import cn.springcloud.gray.request.GrayTrackInfo;
+import cn.springcloud.gray.utils.JsonUtils;
 import lombok.Getter;
 import lombok.Setter;
 import org.slf4j.Logger;
@@ -27,17 +29,27 @@ public TrackAttributesGrayDecisionFactory() {
     @Override
     public GrayDecision apply(Config configBean) {
         return args -> {
-            GrayHttpTrackInfo grayTrackInfo = (GrayHttpTrackInfo) args.getGrayRequest().getGrayTrackInfo();
+            GrayRequest grayRequest = args.getGrayRequest();
+            GrayTrackInfo grayTrackInfo = grayRequest.getGrayTrackInfo();
             if (grayTrackInfo == null) {
-                log.warn("没有获取到灰度追踪信息");
+                log.warn("[TrackAttributesGrayDecision] serviceId:{} 没有获取到灰度追踪信息, testResult:{}",
+                        grayRequest.getServiceId(), false);
                 return false;
             }
             PredicateComparator<Collection<String>> predicateComparator = Comparators.getCollectionStringComparator(configBean.getCompareMode());
             if (predicateComparator == null) {
-                log.warn("没有找到相应与compareMode'{}'对应的PredicateComparator", configBean.getCompareMode());
+                log.warn("[TrackAttributesGrayDecision] serviceId:{} 没有找到相应与compareMode'{}'对应的PredicateComparator, testResult:{}",
+                        grayRequest.getServiceId(), configBean.getCompareMode(), false);
                 return false;
             }
-            return predicateComparator.test(Arrays.asList(grayTrackInfo.getAttribute(configBean.getName())), configBean.getValues());
+
+            List<String> attributeValues = Arrays.asList(grayTrackInfo.getAttribute(configBean.getName()));
+            boolean b = predicateComparator.test(attributeValues, configBean.getValues());
+            if (log.isDebugEnabled()) {
+                log.debug("[TrackAttributesGrayDecision] serviceId:{}, decisionConfig:{}, attributeValues:{}, testReslut:{}",
+                        grayRequest.getServiceId(), JsonUtils.toJsonString(configBean), attributeValues, b);
+            }
+            return b;
         };
     }
 
diff --git a/spring-cloud-gray-utils/src/main/java/cn/springcloud/gray/utils/JsonUtils.java b/spring-cloud-gray-utils/src/main/java/cn/springcloud/gray/utils/JsonUtils.java
