diff --git a/skywalking-collector/skywalking-log/logback-plugin/pom.xml b/skywalking-collector/skywalking-log/logback-plugin/pom.xml new file mode 100644 index 000000000..c5d865877 --- /dev/null +++ b/skywalking-collector/skywalking-log/logback-plugin/pom.xml @@ -0,0 +1,55 @@ + + 4.0.0 + + com.ai.cloud + skywalking-log + 1.0-Final + + logback-plugin + logback-plugin + http://maven.apache.org + + + UTF-8 + + + + + junit + junit + 3.8.1 + test + + + ch.qos.logback + logback-classic + 1.1.5 + compile + + + com.ai.cloud + skywalking-api + 1.0-Final + + + + + + org.apache.maven.plugins + maven-resources-plugin + 2.4.3 + + ${project.build.sourceEncoding} + + + + + + + + bintray-wu-sheng-sky-walking-repository + wu-sheng-sky-walking-repository + https://api.bintray.com/maven/wu-sheng/skywalking/com.ai.cloud.skywalking-log4j-1.x-plugin/;publish=1 + + + \ No newline at end of file diff --git a/skywalking-collector/skywalking-log/logback-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/logback/LogbackPatternConverter.java b/skywalking-collector/skywalking-log/logback-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/logback/LogbackPatternConverter.java new file mode 100644 index 000000000..95180313f --- /dev/null +++ b/skywalking-collector/skywalking-log/logback-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/logback/LogbackPatternConverter.java @@ -0,0 +1,22 @@ +package com.ai.cloud.skywalking.plugin.log.logback; +import ch.qos.logback.classic.pattern.ClassicConverter; +import ch.qos.logback.classic.spi.ILoggingEvent; + +import com.ai.cloud.skywalking.api.Tracing; +import com.ai.cloud.skywalking.conf.AuthDesc; +/** + * + * @author yushuqiang + * + */ +public class LogbackPatternConverter extends ClassicConverter { + + @Override + public String convert(ILoggingEvent event) { + if (AuthDesc.isAuth()) { + return "TID:" + Tracing.getTraceId(); + } + + return "TID: N/A"+" "+event.toString(); + } +} \ No newline at end of file diff --git a/skywalking-collector/skywalking-log/logback-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/logback/TraceIdPatternLogbackLayout.java b/skywalking-collector/skywalking-log/logback-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/logback/TraceIdPatternLogbackLayout.java new file mode 100644 index 000000000..9e46dfc8b --- /dev/null +++ b/skywalking-collector/skywalking-log/logback-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/logback/TraceIdPatternLogbackLayout.java @@ -0,0 +1,12 @@ +package com.ai.cloud.skywalking.plugin.log.logback; +import ch.qos.logback.classic.PatternLayout; +/** + * + * @author yushuqiang + * + */ +public class TraceIdPatternLogbackLayout extends PatternLayout { + static { + defaultConverterMap.put("tid",LogbackPatternConverter.class.getName()); + } +} \ No newline at end of file diff --git a/skywalking-collector/skywalking-log/logback-plugin/src/test/java/com/ai/LogbackMain.java b/skywalking-collector/skywalking-log/logback-plugin/src/test/java/com/ai/LogbackMain.java new file mode 100644 index 000000000..5daff3170 --- /dev/null +++ b/skywalking-collector/skywalking-log/logback-plugin/src/test/java/com/ai/LogbackMain.java @@ -0,0 +1,25 @@ +package com.ai; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.joran.JoranConfigurator; +import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.util.StatusPrinter; +public class LogbackMain { + + static Logger logger = LoggerFactory.getLogger(LogbackMain.class); + + public static void main(String[] args) throws JoranException { + LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + + JoranConfigurator configurator = new JoranConfigurator(); + configurator.setContext(lc); + lc.reset(); + configurator.doConfigure("E:\\testdubbo\\GTrace\\GTrace-client\\src\\test\\resources\\logback.xml"); + StatusPrinter.printInCaseOfErrorsOrWarnings(lc); + + logger.info("Hello world11"); + } + +} diff --git a/skywalking-collector/skywalking-log/logback-plugin/src/test/resources/logback.xml b/skywalking-collector/skywalking-log/logback-plugin/src/test/resources/logback.xml new file mode 100644 index 000000000..5033c927a --- /dev/null +++ b/skywalking-collector/skywalking-log/logback-plugin/src/test/resources/logback.xml @@ -0,0 +1,14 @@ + + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%tid] [%thread] %-5level %logger{36} -%msg%n + + + + + + + \ No newline at end of file