You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2020/12/10 05:54:25 UTC
[skywalking] branch master updated (5e4b16c -> 0996151)
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 5e4b16c chore: remove useless codes (#5982)
add 0996151 Support collecting logs of log4j, log4j2, and logback in the tracing context (#5914)
No new revisions were added by this update.
Summary of changes:
.github/workflows/plugins-test.1.yaml | 3 +
CHANGES.md | 1 +
apm-sniffer/optional-plugins/logger-plugin/pom.xml | 50 +++++
.../apm/plugin/logger/ContextConfig.java | 243 +++++++++++++++++++++
.../logger/DebugLog4j2LoggerInterceptor.java | 48 ++++
.../plugin/logger/DebugLog4jLoggerInterceptor.java | 49 +++++
.../logger/DebugLogbackLoggerInterceptor.java | 48 ++++
.../logger/ErrorLog4j2LoggerInterceptor.java | 48 ++++
.../plugin/logger/ErrorLog4jLoggerInterceptor.java | 49 +++++
.../logger/ErrorLogbackLoggerInterceptor.java | 48 ++++
.../logger/FatalLog4j2LoggerInterceptor.java | 48 ++++
.../plugin/logger/FatalLog4jLoggerInterceptor.java | 49 +++++
.../plugin/logger/InfoLog4j2LoggerInterceptor.java | 48 ++++
.../plugin/logger/InfoLog4jLoggerInterceptor.java | 49 +++++
.../logger/InfoLogbackLoggerInterceptor.java | 48 ++++
.../logger/TraceLog4j2LoggerInterceptor.java | 48 ++++
.../plugin/logger/TraceLog4jLoggerInterceptor.java | 49 +++++
.../logger/TraceLogbackLoggerInterceptor.java | 48 ++++
.../plugin/logger/WarnLog4j2LoggerInterceptor.java | 48 ++++
.../plugin/logger/WarnLog4jLoggerInterceptor.java | 49 +++++
.../logger/WarnLogbackLoggerInterceptor.java | 48 ++++
.../logger/define/Log4j2LoggerInstrumentation.java | 75 +++++++
.../logger/define/Log4jLoggerInstrumentation.java | 75 +++++++
.../define/LogbackLoggerInstrumentation.java | 75 +++++++
.../src/main/resources/skywalking-plugin.def | 18 ++
.../plugin/logger/ContextConfigDefaultTest.java | 44 ++++
.../plugin/logger/ContextConfigExceptionTest.java | 94 ++++++++
.../apm/plugin/logger/ContextConfigTest.java | 97 ++++++++
apm-sniffer/optional-plugins/pom.xml | 1 +
.../setup/service-agent/java-agent/Plugin-list.md | 3 +
docs/en/setup/service-agent/java-agent/README.md | 1 +
.../service-agent/java-agent/Supported-list.md | 5 +-
.../agent-optional-plugins/Logger-plugin.md | 78 +++++++
.../scenarios/logger-log4j-scenario/bin/startup.sh | 21 ++
.../logger-log4j-scenario/config/expectedData.yaml | 138 ++++++++++++
.../logger-log4j-scenario/configuration.yml | 22 ++
.../plugin/scenarios/logger-log4j-scenario/pom.xml | 105 +++++++++
.../src/main/assembly/assembly.xml | 41 ++++
.../apm/testcase/logger/Application.java | 34 +++
.../testcase/logger/controller/CaseController.java | 64 ++++++
.../apm/testcase/logger/utils/HttpUtils.java | 57 +++++
.../src/main/resources/application.yaml | 19 ++
.../logger-log4j-scenario/support-version.list | 17 ++
.../logger-log4j2-scenario/bin/startup.sh | 21 ++
.../config/expectedData.yaml | 180 +++++++++++++++
.../logger-log4j2-scenario/configuration.yml | 22 ++
.../scenarios/logger-log4j2-scenario/pom.xml | 110 ++++++++++
.../src/main/assembly/assembly.xml | 41 ++++
.../apm/testcase/logger/Application.java | 34 +++
.../testcase/logger/controller/CaseController.java | 72 ++++++
.../apm/testcase/logger/utils/HttpUtils.java | 57 +++++
.../src/main/resources/application.yaml | 19 ++
.../logger-log4j2-scenario/support-version.list | 31 +++
.../logger-logback-scenario/bin/startup.sh | 21 ++
.../config/expectedData.yaml | 181 +++++++++++++++
.../logger-logback-scenario/configuration.yml | 22 ++
.../scenarios/logger-logback-scenario/pom.xml | 111 ++++++++++
.../src/main/assembly/assembly.xml | 41 ++++
.../apm/testcase/logger/Application.java | 34 +++
.../testcase/logger/controller/CaseController.java | 73 +++++++
.../apm/testcase/logger/utils/HttpUtils.java | 57 +++++
.../src/main/resources/application.yaml | 19 ++
.../logger-logback-scenario/support-version.list | 19 ++
63 files changed, 3367 insertions(+), 1 deletion(-)
create mode 100644 apm-sniffer/optional-plugins/logger-plugin/pom.xml
create mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/ContextConfig.java
create mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/DebugLog4j2LoggerInterceptor.java
create mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/DebugLog4jLoggerInterceptor.java
create mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/DebugLogbackLoggerInterceptor.java
create mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/ErrorLog4j2LoggerInterceptor.java
create mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/ErrorLog4jLoggerInterceptor.java
create mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/ErrorLogbackLoggerInterceptor.java
create mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/FatalLog4j2LoggerInterceptor.java
create mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/FatalLog4jLoggerInterceptor.java
create mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/InfoLog4j2LoggerInterceptor.java
create mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/InfoLog4jLoggerInterceptor.java
create mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/InfoLogbackLoggerInterceptor.java
create mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/TraceLog4j2LoggerInterceptor.java
create mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/TraceLog4jLoggerInterceptor.java
create mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/TraceLogbackLoggerInterceptor.java
create mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/WarnLog4j2LoggerInterceptor.java
create mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/WarnLog4jLoggerInterceptor.java
create mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/WarnLogbackLoggerInterceptor.java
create mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/define/Log4j2LoggerInstrumentation.java
create mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/define/Log4jLoggerInstrumentation.java
create mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/java/org/apache/skywalking/apm/plugin/logger/define/LogbackLoggerInstrumentation.java
create mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/main/resources/skywalking-plugin.def
create mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/test/org/apache/skywalking/apm/plugin/logger/ContextConfigDefaultTest.java
create mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/test/org/apache/skywalking/apm/plugin/logger/ContextConfigExceptionTest.java
create mode 100644 apm-sniffer/optional-plugins/logger-plugin/src/test/org/apache/skywalking/apm/plugin/logger/ContextConfigTest.java
create mode 100644 docs/en/setup/service-agent/java-agent/agent-optional-plugins/Logger-plugin.md
create mode 100644 test/plugin/scenarios/logger-log4j-scenario/bin/startup.sh
create mode 100644 test/plugin/scenarios/logger-log4j-scenario/config/expectedData.yaml
create mode 100644 test/plugin/scenarios/logger-log4j-scenario/configuration.yml
create mode 100644 test/plugin/scenarios/logger-log4j-scenario/pom.xml
create mode 100644 test/plugin/scenarios/logger-log4j-scenario/src/main/assembly/assembly.xml
create mode 100644 test/plugin/scenarios/logger-log4j-scenario/src/main/java/org/apache/skywalking/apm/testcase/logger/Application.java
create mode 100644 test/plugin/scenarios/logger-log4j-scenario/src/main/java/org/apache/skywalking/apm/testcase/logger/controller/CaseController.java
create mode 100644 test/plugin/scenarios/logger-log4j-scenario/src/main/java/org/apache/skywalking/apm/testcase/logger/utils/HttpUtils.java
create mode 100644 test/plugin/scenarios/logger-log4j-scenario/src/main/resources/application.yaml
create mode 100644 test/plugin/scenarios/logger-log4j-scenario/support-version.list
create mode 100644 test/plugin/scenarios/logger-log4j2-scenario/bin/startup.sh
create mode 100644 test/plugin/scenarios/logger-log4j2-scenario/config/expectedData.yaml
create mode 100644 test/plugin/scenarios/logger-log4j2-scenario/configuration.yml
create mode 100644 test/plugin/scenarios/logger-log4j2-scenario/pom.xml
create mode 100644 test/plugin/scenarios/logger-log4j2-scenario/src/main/assembly/assembly.xml
create mode 100644 test/plugin/scenarios/logger-log4j2-scenario/src/main/java/org/apache/skywalking/apm/testcase/logger/Application.java
create mode 100644 test/plugin/scenarios/logger-log4j2-scenario/src/main/java/org/apache/skywalking/apm/testcase/logger/controller/CaseController.java
create mode 100644 test/plugin/scenarios/logger-log4j2-scenario/src/main/java/org/apache/skywalking/apm/testcase/logger/utils/HttpUtils.java
create mode 100644 test/plugin/scenarios/logger-log4j2-scenario/src/main/resources/application.yaml
create mode 100644 test/plugin/scenarios/logger-log4j2-scenario/support-version.list
create mode 100644 test/plugin/scenarios/logger-logback-scenario/bin/startup.sh
create mode 100644 test/plugin/scenarios/logger-logback-scenario/config/expectedData.yaml
create mode 100644 test/plugin/scenarios/logger-logback-scenario/configuration.yml
create mode 100644 test/plugin/scenarios/logger-logback-scenario/pom.xml
create mode 100644 test/plugin/scenarios/logger-logback-scenario/src/main/assembly/assembly.xml
create mode 100644 test/plugin/scenarios/logger-logback-scenario/src/main/java/org/apache/skywalking/apm/testcase/logger/Application.java
create mode 100644 test/plugin/scenarios/logger-logback-scenario/src/main/java/org/apache/skywalking/apm/testcase/logger/controller/CaseController.java
create mode 100644 test/plugin/scenarios/logger-logback-scenario/src/main/java/org/apache/skywalking/apm/testcase/logger/utils/HttpUtils.java
create mode 100644 test/plugin/scenarios/logger-logback-scenario/src/main/resources/application.yaml
create mode 100644 test/plugin/scenarios/logger-logback-scenario/support-version.list