diff --git a/skywalking-log/log4j-1.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/log4j/v1/x/TraceIdPatternConverter.java b/skywalking-log/log4j-1.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/log4j/v1/x/TraceIdPatternConverter.java index addb26893..74e8769e8 100644 --- a/skywalking-log/log4j-1.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/log4j/v1/x/TraceIdPatternConverter.java +++ b/skywalking-log/log4j-1.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/log4j/v1/x/TraceIdPatternConverter.java @@ -1,12 +1,17 @@ package com.ai.cloud.skywalking.plugin.log.log4j.v1.x; import com.ai.cloud.skywalking.api.Tracing; +import com.ai.cloud.skywalking.conf.AuthDesc; import org.apache.log4j.helpers.PatternConverter; import org.apache.log4j.spi.LoggingEvent; public class TraceIdPatternConverter extends PatternConverter { @Override protected String convert(LoggingEvent loggingEvent) { - return "TID:" + Tracing.getTraceId(); + if (AuthDesc.isAuth()) { + return "TID:" + Tracing.getTraceId(); + } + + return "TID: N/A"; } } diff --git a/skywalking-log/log4j-2.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/log4j/v2/x/TraceIdConverter.java b/skywalking-log/log4j-2.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/log4j/v2/x/TraceIdConverter.java index 5b0254fae..a479d4b8c 100644 --- a/skywalking-log/log4j-2.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/log4j/v2/x/TraceIdConverter.java +++ b/skywalking-log/log4j-2.x-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/log4j/v2/x/TraceIdConverter.java @@ -1,6 +1,7 @@ package com.ai.cloud.skywalking.plugin.log.log4j.v2.x; import com.ai.cloud.skywalking.api.Tracing; +import com.ai.cloud.skywalking.conf.AuthDesc; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.plugins.Plugin; import org.apache.logging.log4j.core.pattern.ConverterKeys; @@ -26,6 +27,10 @@ public class TraceIdConverter extends LogEventPatternConverter { @Override public void format(LogEvent event, StringBuilder toAppendTo) { - toAppendTo.append("TId:" + Tracing.getTraceId()); + if (AuthDesc.isAuth()) { + toAppendTo.append("TID:" + Tracing.getTraceId()); + }else{ + toAppendTo.append("TID: N/A"); + } } }