From c1a90c9b7f26cce27e6fa13ecf055dd78eff1163 Mon Sep 17 00:00:00 2001 From: zhangxin10 Date: Mon, 4 Jan 2016 10:15:40 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=9C=A8=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=8E=88=E6=9D=83=E6=97=B6=EF=BC=8C=E8=BE=93?= =?UTF-8?q?=E5=87=BAN/A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/log/log4j/v1/x/TraceIdPatternConverter.java | 7 ++++++- .../skywalking/plugin/log/log4j/v2/x/TraceIdConverter.java | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) 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"); + } } }