dubbo traceID 完成

cash-api/account-server/src/main/resources/logback.xml

@@ -3,9 +3,9 @@
     <contextName>account-server</contextName>
     <property name="log.charset" value="utf-8" />
     <property name="log.pattern"
-              value="%yellow(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) %X{traceId} [traceId=%X{traceId:-}, spanId=%X{spanId:-}] - %msg%n" />
+              value="%yellow(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) [traceId=%X{traceId:-}] - %msg%n" />
     <!--写入文件格式-->
-    <property name="p_file" value="%d ｜ %X{traceId} [traceId=%X{traceId:-}] | [%thread] %-5level %c [%L] - %msg %n "/>
+    <property name="p_file" value="%d ｜[traceId=%X{traceId:-}] | [%thread] %-5level %c [%L] - %msg %n "/>
     <!--输出到控制台-->
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>

cash-api/market-server/src/main/resources/application.yml

@@ -31,5 +31,8 @@ pagehelper:
   support-methods-arguments: true
 
 dubbo:
+  provider:
+    filter: traceProviderFilter
   consumer:
+    filter: traceConsumerFilter
     check: false

cash-api/market-server/src/main/resources/logback.xml

@@ -3,9 +3,9 @@
     <contextName>market-server</contextName>
     <property name="log.charset" value="utf-8" />
     <property name="log.pattern"
-              value="%yellow(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) [traceId=%X{traceId:-}, spanId=%X{spanId:-}] - %msg%n" />
+              value="%yellow(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) [traceId=%X{traceId:-}] - %msg%n" />
     <!--写入文件格式-->
-    <property name="p_file" value="%d ｜ [traceId=%X{traceId:-}] | [%thread] %-5level %c [%L] - %msg %n "/>
+    <property name="p_file" value="%d ｜[traceId=%X{traceId:-}] | [%thread] %-5level %c [%L] - %msg %n "/>
     <!--输出到控制台-->
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>

cash-api/order-server/src/main/resources/application.yml

@@ -25,7 +25,10 @@ pagehelper:
   support-methods-arguments: true
 
 dubbo:
+  provider:
+    filter: traceProviderFilter
   consumer:
+    filter: traceConsumerFilter
     check: false
 
 

cash-api/order-server/src/main/resources/logback.xml

@@ -3,9 +3,9 @@
     <contextName>order-server</contextName>
     <property name="log.charset" value="utf-8" />
     <property name="log.pattern"
-              value="%yellow(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) [traceId=%X{traceId:-}, spanId=%X{spanId:-}] - %msg%n" />
+              value="%yellow(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) [traceId=%X{traceId:-}] - %msg%n" />
     <!--写入文件格式-->
-    <property name="p_file" value="%d ｜ [traceId=%X{traceId:-}] | [%thread] %-5level %c [%L] - %msg %n "/>
+    <property name="p_file" value="%d ｜[traceId=%X{traceId:-}] | [%thread] %-5level %c [%L] - %msg %n "/>
     <!--输出到控制台-->
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>

cash-api/product-server/src/main/resources/application.yml

@@ -36,5 +36,8 @@ pagehelper:
   support-methods-arguments: true
 
 dubbo:
+  provider:
+    filter: traceProviderFilter
   consumer:
+    filter: traceConsumerFilter
     check: false

cash-api/product-server/src/main/resources/logback.xml

@@ -3,9 +3,9 @@
     <contextName>product-server</contextName>
     <property name="log.charset" value="utf-8" />
     <property name="log.pattern"
-              value="%yellow(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) [traceId=%X{traceId:-}, spanId=%X{spanId:-}] - %msg%n" />
+              value="%yellow(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) [traceId=%X{traceId:-}] - %msg%n" />
     <!--写入文件格式-->
-    <property name="p_file" value="%d ｜ [traceId=%X{traceId:-}] | [%thread] %-5level %c [%L] - %msg %n "/>
+    <property name="p_file" value="%d ｜[traceId=%X{traceId:-}] | [%thread] %-5level %c [%L] - %msg %n "/>
     <!--输出到控制台-->
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>

cash-api/system-server/src/main/resources/application.yml

@@ -20,3 +20,10 @@ alipay:
     key: your-key
     secret: your-secret
     templateCode: c
+
+dubbo:
+  provider:
+    filter: traceProviderFilter
+  consumer:
+    filter: traceConsumerFilter
+    check: false

cash-api/system-server/src/main/resources/logback.xml

@@ -2,11 +2,10 @@
 <configuration scan="true" scanPeriod="30 seconds" debug="false">
     <contextName>system-server</contextName>
     <property name="log.charset" value="utf-8" />
-<!--    <property name="log.pattern" value="%yellow(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %msg%n" />-->
     <property name="log.pattern"
-              value="%yellow(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) [traceId=%X{traceId:-}, spanId=%X{spanId:-}] - %msg%n" />
+              value="%yellow(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) [traceId=%X{traceId:-}] - %msg%n" />
     <!--写入文件格式-->
-    <property name="p_file" value="%d ｜ [traceId=%X{traceId:-}] | [%thread] %-5level %c [%L] - %msg %n "/>
+    <property name="p_file" value="%d ｜[traceId=%X{traceId:-}] | [%thread] %-5level %c [%L] - %msg %n "/>
     <!--输出到控制台-->
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>

cash-common/cash-common-api-config/src/main/java/com/czg/config/TraceConsumerFilter.java

@@ -1,7 +1,7 @@
 package com.czg.config;
 
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.dubbo.common.Constants;
+import org.apache.dubbo.common.constants.CommonConstants;
 import org.apache.dubbo.common.extension.Activate;
 import org.apache.dubbo.rpc.*;
 import org.slf4j.MDC;
@@ -10,7 +10,7 @@ import org.slf4j.MDC;
  * @author ww
  * @description
  */
-@Activate(group = Constants.CONSUMER)
+@Activate(group = CommonConstants.CONSUMER)
 public class TraceConsumerFilter implements Filter {
 
     @Override

cash-common/cash-common-api-config/src/main/java/com/czg/config/TraceContext.java

@@ -1,29 +0,0 @@
-package com.czg.config;
-
-import org.slf4j.MDC;
-
-import java.util.UUID;
-
-/**
- * @author ww
- * @description
- */
-public class TraceContext {
-    private static final String TRACE_ID = "traceId";
-
-    public static void setTraceId(String traceId) {
-        MDC.put(TRACE_ID, traceId);
-    }
-
-    public static String getTraceId() {
-        return MDC.get(TRACE_ID);
-    }
-
-    public static void clear() {
-        MDC.clear();
-    }
-
-    public static String generateTraceId() {
-        return UUID.randomUUID().toString().replace("-", "");
-    }
-}

cash-common/cash-common-api-config/src/main/java/com/czg/config/TraceProviderFilter.java

@@ -1,9 +1,8 @@
 package com.czg.config;
 
 import cn.hutool.core.util.StrUtil;
+import org.apache.dubbo.common.constants.CommonConstants;
 import org.apache.dubbo.rpc.*;
-
-import com.alibaba.dubbo.common.Constants;
 import org.apache.dubbo.common.extension.Activate;
 import org.slf4j.MDC;
 
@@ -11,7 +10,7 @@ import org.slf4j.MDC;
  * @author ww
  * @description
  */
-@Activate(group = Constants.PROVIDER)
+@Activate(group = CommonConstants.PROVIDER)
 public class TraceProviderFilter implements Filter {
 
     @Override