diff --git a/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/src/main/java/com/a/eye/skywalking/toolkit/log4j/v2/x/TraceIdConverter.java b/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/src/main/java/com/a/eye/skywalking/toolkit/log4j/v2/x/TraceIdConverter.java index 046081eef4d0570ca1184d65cc797070741b6cc5..65e3ec77eb6478fce857f3698f95d0e8f9bcec62 100644 --- a/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/src/main/java/com/a/eye/skywalking/toolkit/log4j/v2/x/TraceIdConverter.java +++ b/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/src/main/java/com/a/eye/skywalking/toolkit/log4j/v2/x/TraceIdConverter.java @@ -10,7 +10,7 @@ import org.apache.logging.log4j.core.pattern.LogEventPatternConverter; * Created by wusheng on 2016/12/7. */ @Plugin(name = "TraceIdConverter", category = "Converter") -@ConverterKeys({"tid"}) +@ConverterKeys({"traceId"}) public class TraceIdConverter extends LogEventPatternConverter { /** @@ -24,7 +24,7 @@ public class TraceIdConverter extends LogEventPatternConverter { } public static TraceIdConverter newInstance(String[] options) { - return new TraceIdConverter("tid", "tid"); + return new TraceIdConverter("traceId", "traceId"); } @Override diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/model/ContextData.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/model/ContextData.java index 6ef512a3e5c323003495e236695fdb44431cbe94..05e8bb3a8b5a3768b52c4509a29be52dce031c9b 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/model/ContextData.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/model/ContextData.java @@ -5,6 +5,7 @@ import com.a.eye.skywalking.api.Tracing; import com.a.eye.skywalking.network.grpc.TraceId; import static com.a.eye.skywalking.conf.Constants.CONTEXT_DATA_SEGMENT_SPILT_CHAR; +import static com.a.eye.skywalking.util.TraceIdUtil.formatTraceId; public class ContextData { private TraceId traceId; @@ -76,7 +77,7 @@ public class ContextData { public String toString() { StringBuilder stringBuilder = new StringBuilder(); - stringBuilder.append(Tracing.formatTraceId(traceId)); + stringBuilder.append(formatTraceId(traceId)); stringBuilder.append(CONTEXT_DATA_SEGMENT_SPILT_CHAR); if (parentLevel == null || parentLevel.length() == 0) { stringBuilder.append(" "); diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log4j/v2/x/PrintTraceIdInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log4j/v2/x/PrintTraceIdInterceptor.java index 6fd22bcc5cdd23c7d24838c2486fed6ba17d8bcf..8f00a1bea1d145830192fd13963f91b684f50a32 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log4j/v2/x/PrintTraceIdInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log4j/v2/x/PrintTraceIdInterceptor.java @@ -10,7 +10,7 @@ import com.a.eye.skywalking.plugin.interceptor.enhance.*; public class PrintTraceIdInterceptor implements StaticMethodsAroundInterceptor { @Override public void beforeMethod(StaticMethodInvokeContext interceptorContext, MethodInterceptResult result) { - ((StringBuilder)interceptorContext.allArguments()[1]).append("TID:" + Tracing.getTraceId()); + ((StringBuilder)interceptorContext.allArguments()[0]).append("TID:" + Tracing.getTraceId()); //make sure origin method do not invoke. result.defineReturnValue(null);