spanId生成规则优化

zlt-commons/zlt-log-spring-boot-starter/src/main/java/com/central/log/trace/DubboTraceFilter.java

@@ -34,9 +34,8 @@ public class DubboTraceFilter implements Filter {
         } else { //服务消费者逻辑
             String traceId = MDCTraceUtils.getTraceId();
             if (StrUtil.isNotEmpty(traceId)) {
-                String spanId = MDCTraceUtils.getSpanId();
                 invocation.setAttachment(MDCTraceUtils.KEY_TRACE_ID, traceId);
-                invocation.setAttachment(MDCTraceUtils.KEY_SPAN_ID, spanId);
+                invocation.setAttachment(MDCTraceUtils.KEY_SPAN_ID, MDCTraceUtils.getNextSpanId());
             }
         }
         try {

zlt-commons/zlt-log-spring-boot-starter/src/main/java/com/central/log/trace/FeignTraceConfig.java

 package com.central.log.trace;
 
+import cn.hutool.core.util.StrUtil;
 import com.central.log.properties.TraceProperties;
 import feign.RequestInterceptor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
 
@@ -30,10 +30,9 @@ public class FeignTraceConfig {
             if (traceProperties.getEnable()) {
                 //传递日志traceId
                 String traceId = MDCTraceUtils.getTraceId();
-                if (!StringUtils.isEmpty(traceId)) {
-                    String spanId = MDCTraceUtils.getSpanId();
+                if (StrUtil.isNotEmpty(traceId)) {
                     template.header(MDCTraceUtils.TRACE_ID_HEADER, traceId);
-                    template.header(MDCTraceUtils.SPAN_ID_HEADER, spanId);
+                    template.header(MDCTraceUtils.SPAN_ID_HEADER, MDCTraceUtils.getNextSpanId());
                 }
             }
         };

zlt-commons/zlt-log-spring-boot-starter/src/main/java/com/central/log/trace/MDCTraceUtils.java

 package com.central.log.trace;
 
 import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.ttl.TransmittableThreadLocal;
 import org.slf4j.MDC;
 
-import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * 日志追踪工具类
@@ -47,13 +48,16 @@ public class MDCTraceUtils {
      */
     public static final int FILTER_ORDER = -1;
 
+    private static final TransmittableThreadLocal<AtomicInteger> spanNumber = new TransmittableThreadLocal<>();
+
     /**
      * 创建traceId并赋值MDC
      */
     public static void addTrace() {
         String traceId = createTraceId();
         MDC.put(KEY_TRACE_ID, traceId);
-        MDC.put(KEY_SPAN_ID, traceId);
+        MDC.put(KEY_SPAN_ID, "0");
+        initSpanNumber();
     }
 
     /**
@@ -61,8 +65,8 @@ public class MDCTraceUtils {
      */
     public static void putTrace(String traceId, String spanId) {
         MDC.put(KEY_TRACE_ID, traceId);
-        MDC.put(KEY_PARENT_ID, spanId);
-        MDC.put(KEY_SPAN_ID, createTraceId());
+        MDC.put(KEY_SPAN_ID, spanId);
+        initSpanNumber();
     }
 
     /**
@@ -84,13 +88,21 @@ public class MDCTraceUtils {
     public static void removeTrace() {
         MDC.remove(KEY_TRACE_ID);
         MDC.remove(KEY_SPAN_ID);
-        MDC.remove(KEY_PARENT_ID);
+        spanNumber.remove();
     }
 
     /**
      * 创建traceId
      */
     public static String createTraceId() {
-        return RandomUtil.randomString(16);
+        return IdUtil.getSnowflake().nextIdStr();
+    }
+
+    public static String getNextSpanId() {
+        return StrUtil.format("{}.{}", getSpanId(), spanNumber.get().incrementAndGet());
+    }
+
+    private static void initSpanNumber() {
+        spanNumber.set(new AtomicInteger(0));
     }
 }

zlt-commons/zlt-log-spring-boot-starter/src/main/java/com/central/log/trace/WebTraceFilter.java

 package com.central.log.trace;
 
+import cn.hutool.core.util.StrUtil;
 import com.central.log.properties.TraceProperties;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
 import org.springframework.web.filter.OncePerRequestFilter;
 
 import javax.annotation.Resource;
@@ -41,7 +41,7 @@ public class WebTraceFilter extends OncePerRequestFilter {
         try {
             String traceId = request.getHeader(MDCTraceUtils.TRACE_ID_HEADER);
             String spanId = request.getHeader(MDCTraceUtils.SPAN_ID_HEADER);
-            if (StringUtils.isEmpty(traceId)) {
+            if (StrUtil.isEmpty(traceId)) {
                 MDCTraceUtils.addTrace();
             } else {
                 MDCTraceUtils.putTrace(traceId, spanId);

zlt-commons/zlt-log-spring-boot-starter/src/main/resources/logback-spring.xml

@@ -18,8 +18,8 @@
 
     <!-- 彩色日志格式 -->
     <property name="CONSOLE_LOG_PATTERN"
-              value="[${APP_NAME}:${ServerIP}:${ServerPort}] %clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%level){blue} %clr(${PID}){magenta} %clr([%X{traceId},%X{spanId},%X{parentId}]){yellow} %clr([%thread]){orange} %clr(%-40.40logger{39}){cyan} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}" />
-    <property name="CONSOLE_LOG_PATTERN_NO_COLOR" value="[${APP_NAME}:${ServerIP}:${ServerPort}] %d{yyyy-MM-dd HH:mm:ss.SSS} %level ${PID} [%X{traceId},%X{spanId},%X{parentId}] [%thread] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}" />
+              value="[${APP_NAME}:${ServerIP}:${ServerPort}] %clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%level){blue} %clr(${PID}){magenta} %clr([%X{traceId}-%X{spanId}]){yellow} %clr([%thread]){orange} %clr(%-40.40logger{39}){cyan} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}" />
+    <property name="CONSOLE_LOG_PATTERN_NO_COLOR" value="[${APP_NAME}:${ServerIP}:${ServerPort}] %d{yyyy-MM-dd HH:mm:ss.SSS} %level ${PID} [%X{traceId}-%X{spanId}] [%thread] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}" />
 
     <!-- 控制台日志 -->
     <appender name="StdoutAppender" class="ch.qos.logback.core.ConsoleAppender">

zlt-gateway/sc-gateway/src/main/java/com/central/gateway/filter/TraceFilter.java

@@ -34,7 +34,7 @@ public class TraceFilter implements GlobalFilter, Ordered {
             ServerHttpRequest serverHttpRequest = exchange.getRequest().mutate()
                     .headers(h -> {
                         h.add(MDCTraceUtils.TRACE_ID_HEADER, MDCTraceUtils.getTraceId());
-                        h.add(MDCTraceUtils.SPAN_ID_HEADER, MDCTraceUtils.getSpanId());
+                        h.add(MDCTraceUtils.SPAN_ID_HEADER, MDCTraceUtils.getNextSpanId());
                     })
                     .build();