This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 2d2ded4 Refine Plugin-test.md (#6805)
add 16b51d5 Support print SkyWalking context to logs (#6795)
No new revisions were added by this update.
Summary of changes:
CHANGES.md | 4 +-
...java => SkyWalkingContextPatternConverter.java} | 8 ++--
.../log/log4j/v1/x/TraceIdPatternConverter.java | 2 +-
.../log/log4j/v1/x/TraceIdPatternLayout.java | 2 +-
.../log/log4j/v1/x/TraceIdPatternParser.java | 11 ++++-
.../log/log4j/v2/x/Log4j2OutputAppender.java | 2 +-
... => Log4j2SkyWalkingContextOutputAppender.java} | 6 +--
...verter.java => SkyWalkingContextConverter.java} | 18 ++++-----
.../log/logback/v1/x/LogbackPatternConverter.java | 2 +-
... LogbackSkyWalkingContextPatternConverter.java} | 8 ++--
.../logback/v1/x/TraceIdPatternLogbackLayout.java | 3 +-
...der.java => SkyWalkingContextJsonProvider.java} | 15 ++++---
.../v1/x/mdc/LogbackMDCPatternConverter.java | 24 +++++++++--
.../v1/x/mdc/TraceIdMDCPatternLogbackLayout.java | 3 +-
...java => PrintSkyWalkingContextInterceptor.java} | 13 ++++--
...yWalkingContextPatternConverterActivation.java} | 12 +++---
.../src/main/resources/skywalking-plugin.def | 1 +
...a => SkyWalkingContextConverterActivation.java} | 6 +--
...yWalkingContextConverterMethodInterceptor.java} | 20 +++++----
.../v2/x/TraceIdConverterMethodInterceptor.java | 7 +++-
.../v2/x/async/AsyncAppenderMethodInterceptor.java | 6 ++-
.../async/AsyncLoggerConfigMethodInterceptor.java | 8 +++-
.../async/Log4jLogEventConstructorInterceptor.java | 5 ++-
.../async/RingBufferLogEventMethodInterceptor.java | 7 +++-
.../src/main/resources/skywalking-plugin.def | 1 +
...yWalkingContextPatternConverterActivation.java} | 14 +++----
...java => PrintSkyWalkingContextInterceptor.java} | 14 ++++---
.../log/logback/v1/x/PrintTraceIdInterceptor.java | 7 ++--
.../async/AsyncAppenderBaseMethodInterceptor.java | 6 ++-
...> SkyWalkingContextJsonProviderActivation.java} | 8 ++--
... SkyWalkingContextJsonProviderInterceptor.java} | 14 ++++---
.../x/logstash/TcpSocketAppenderInterceptor.java | 8 +++-
.../x/logstash/TraceIdJsonProviderInterceptor.java | 7 ++--
.../logback/v1/x/mdc/MDCConverterActivation.java | 26 ++++++++++--
...a => PrintMDCSkyWalkingContextInterceptor.java} | 15 ++++---
.../v1/x/mdc/PrintMDCTraceIdInterceptor.java | 7 ++--
.../src/main/resources/skywalking-plugin.def | 2 +
.../logging/common/log/SkyWalkingContext.java} | 47 +++++++++-------------
.../java-agent/Application-toolkit-log4j-1.x.md | 10 ++++-
.../java-agent/Application-toolkit-log4j-2.x.md | 8 +++-
.../java-agent/Application-toolkit-logback-1.x.md | 33 ++++++++++-----
41 files changed, 267 insertions(+), 153 deletions(-)
copy
apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/{TraceIdPatternConverter.java
=> SkyWalkingContextPatternConverter.java} (81%)
copy
apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/{Log4j2OutputAppender.java
=> Log4j2SkyWalkingContextOutputAppender.java} (82%)
copy
apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/{TraceIdConverter.java
=> SkyWalkingContextConverter.java} (68%)
copy
apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/{LogbackPatternConverter.java
=> LogbackSkyWalkingContextPatternConverter.java} (78%)
copy
apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/logstash/{TraceIdJsonProvider.java
=> SkyWalkingContextJsonProvider.java} (78%)
copy
apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v1/x/{PrintTraceIdInterceptor.java
=> PrintSkyWalkingContextInterceptor.java} (82%)
copy
apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v1/x/{TraceIdPatternConverterActivation.java
=> SkyWalkingContextPatternConverterActivation.java} (87%)
copy
apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/{TraceIdConverterActivation.java
=> SkyWalkingContextConverterActivation.java} (91%)
copy
apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/{TraceIdConverterMethodInterceptor.java
=> SkyWalkingContextConverterMethodInterceptor.java} (70%)
copy
apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/{LogbackPatternConverterActivation.java
=> LogbackSkyWalkingContextPatternConverterActivation.java} (87%)
copy
apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/{PrintTraceIdInterceptor.java
=> PrintSkyWalkingContextInterceptor.java} (75%)
copy
apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/logstash/{TraceIdJsonProviderActivation.java
=> SkyWalkingContextJsonProviderActivation.java} (87%)
copy
apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/logstash/{TraceIdJsonProviderInterceptor.java
=> SkyWalkingContextJsonProviderInterceptor.java} (77%)
copy
apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/mdc/{PrintMDCTraceIdInterceptor.java
=> PrintMDCSkyWalkingContextInterceptor.java} (75%)
copy
apm-sniffer/{apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/ServiceInstanceGenerator.java
=>
apm-toolkit-activation/apm-toolkit-logging-common/src/main/java/org/apache/skywalking/apm/toolkit/logging/common/log/SkyWalkingContext.java}
(51%)
