zhangyi преди 5 месеца
родител
ревизия
d20f3a8257

+ 10 - 10
src/main/java/cn/seecoder/seecoderlog/context/TraceInfo.java

@@ -17,7 +17,7 @@ public class TraceInfo {
     private static volatile int counter = 0;
 
     private String traceId;
-    private String rpcId;
+    private String spanId;
 
     // 在现有字段中添加时间戳记录
     private static volatile long lastTimestamp = 0;
@@ -25,22 +25,22 @@ public class TraceInfo {
     /**
      * 根据当前RPC ID生成子级RPC ID
      */
-    public static String generateChildRpcId(String currentRpcId) {
-        if (StringUtils.isEmpty(currentRpcId)) {
-            return "1";
+    public static String generateChildSpanId(String currentSpanId) {
+        if (StringUtils.isEmpty(currentSpanId)) {
+            return "0";
         }
-        return currentRpcId + ".1";
+        return currentSpanId + ".1";
     }
 
     /**
      * 根据当前RPC ID生成同级下一个RPC ID
      */
-    public static String generateNextRpcId(String currentRpcId) {
-        return incurRpcId(currentRpcId);
+    public static String generateNextSpanId(String currentSpanId) {
+        return incurSpanId(currentSpanId);
     }
 
-    public void updateNextRpcId(){
-        rpcId = incurRpcId(rpcId);
+    public void updateNextSpanId(){
+        spanId = incurSpanId(spanId);
     }
 
     /**
@@ -90,7 +90,7 @@ public class TraceInfo {
         return ++counter % 10000;
     }
 
-    private static String incurRpcId(String currentRpcId){
+    private static String incurSpanId(String currentRpcId){
         if (StringUtils.isEmpty(currentRpcId)){
             return "1";
         }

+ 3 - 3
src/main/java/cn/seecoder/seecoderlog/interceptor/SeecoderHttpClientInterceptor.java

@@ -20,10 +20,10 @@ public class SeecoderHttpClientInterceptor implements ClientHttpRequestIntercept
             request.getHeaders().add("X-Trace-Id", traceInfo.getTraceId());
 
             // 设置rpcId
-            request.getHeaders().add("X-Rpc-Id", traceInfo.getRpcId());
+            request.getHeaders().add("X-Span-Id", traceInfo.getSpanId());
 
-            // 增加rpcId层级
-            traceInfo.updateNextRpcId();
+            // 增加spanId层级
+            traceInfo.updateNextSpanId();
         }
 
         return execution.execute(request, body);

+ 3 - 3
src/main/java/cn/seecoder/seecoderlog/interceptor/SeecoderRequestInterceptor.java

@@ -26,10 +26,10 @@ public class SeecoderRequestInterceptor implements HandlerInterceptor {
             traceId = TraceInfo.generateTraceId();
         }
 
-        String parentRpcId = request.getHeader("X-Rpc-Id");
-        String rpcId = TraceInfo.generateChildRpcId(parentRpcId);
+        String parentSpanId = request.getHeader("X-Span-Id");
+        String spanId = TraceInfo.generateChildSpanId(parentSpanId);
 
-        TraceInfo traceInfo = new TraceInfo(traceId, rpcId);
+        TraceInfo traceInfo = new TraceInfo(traceId, spanId);
 
         // 设置到当前线程上下文
         TraceContext.setTraceInfo(traceInfo);

+ 1 - 1
src/main/java/cn/seecoder/seecoderlog/utils/SeecoderLogUtils.java

@@ -24,7 +24,7 @@ public class SeecoderLogUtils {
     public static String getRpcId(){
         TraceInfo traceInfo = TraceContext.getTraceInfo();
         if (Objects.nonNull(traceInfo) && Objects.nonNull(TraceContext.getTraceInfo())){
-            return traceInfo.getRpcId();
+            return traceInfo.getSpanId();
         }
         return StringUtils.EMPTY;
     }

+ 3 - 1
src/main/resources/ logback-spring.xml

@@ -6,7 +6,9 @@
     <!-- 控制台输出配置 -->
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [${appName}] [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <pattern>
+                %d{yyyy-MM-dd HH:mm:ss.SSS} [${appName}] [%thread] %-5level %logger{20} - %msg%n
+            </pattern>
         </encoder>
     </appender>