From 1ab4858f8ace7b65d4db02909f48f96ab12db48d Mon Sep 17 00:00:00 2001 From: wusheng Date: Mon, 9 Jan 2017 11:44:02 +0800 Subject: [PATCH] =?UTF-8?q?Add=20comments=20on=20=E2=80=9Capplication-tool?= =?UTF-8?q?kit=E2=80=9D=20module.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../toolkit/log/log4j/v1/x/TraceIdPatternConverter.java | 3 +++ .../toolkit/log/log4j/v1/x/TraceIdPatternLayout.java | 4 ++++ .../toolkit/log/log4j/v1/x/TraceIdPatternParser.java | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/src/main/java/com/a/eye/skywalking/toolkit/log/log4j/v1/x/TraceIdPatternConverter.java b/skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/src/main/java/com/a/eye/skywalking/toolkit/log/log4j/v1/x/TraceIdPatternConverter.java index 6e60e958d..069cd9dca 100644 --- a/skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/src/main/java/com/a/eye/skywalking/toolkit/log/log4j/v1/x/TraceIdPatternConverter.java +++ b/skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/src/main/java/com/a/eye/skywalking/toolkit/log/log4j/v1/x/TraceIdPatternConverter.java @@ -4,6 +4,9 @@ import org.apache.log4j.helpers.PatternConverter; import org.apache.log4j.spi.LoggingEvent; /** + * Default implementation outputs "TID: N/A". + * But, if in sky-walking agent active mode, output will become the real TraceId. + *

* Created by wusheng on 2016/12/7. */ diff --git a/skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/src/main/java/com/a/eye/skywalking/toolkit/log/log4j/v1/x/TraceIdPatternLayout.java b/skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/src/main/java/com/a/eye/skywalking/toolkit/log/log4j/v1/x/TraceIdPatternLayout.java index 806337228..221df76e8 100644 --- a/skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/src/main/java/com/a/eye/skywalking/toolkit/log/log4j/v1/x/TraceIdPatternLayout.java +++ b/skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/src/main/java/com/a/eye/skywalking/toolkit/log/log4j/v1/x/TraceIdPatternLayout.java @@ -3,8 +3,12 @@ package com.a.eye.skywalking.toolkit.log.log4j.v1.x; import org.apache.log4j.PatternLayout; import org.apache.log4j.helpers.PatternParser; +import org.apache.log4j.spi.LoggingEvent; /** + * The log4j extend pattern. + * By using this pattern, if sky-walking agent is also active, {@link PatternParser#finalizeConverter(char)} method will be override dynamic. + *

* Created by wusheng on 2016/12/7. */ public class TraceIdPatternLayout extends PatternLayout { diff --git a/skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/src/main/java/com/a/eye/skywalking/toolkit/log/log4j/v1/x/TraceIdPatternParser.java b/skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/src/main/java/com/a/eye/skywalking/toolkit/log/log4j/v1/x/TraceIdPatternParser.java index 9ca4d405c..87c3c72cd 100644 --- a/skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/src/main/java/com/a/eye/skywalking/toolkit/log/log4j/v1/x/TraceIdPatternParser.java +++ b/skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/src/main/java/com/a/eye/skywalking/toolkit/log/log4j/v1/x/TraceIdPatternParser.java @@ -3,9 +3,10 @@ package com.a.eye.skywalking.toolkit.log.log4j.v1.x; import org.apache.log4j.helpers.PatternParser; /** + * Base on '%T', use {@link TraceIdPatternConverter} to convert the '%t' to traceId. + *

* Created by wusheng on 2016/12/7. */ - public class TraceIdPatternParser extends PatternParser { public TraceIdPatternParser(String pattern) { super(pattern);