This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch auth_fix
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from ca2adf3 fix auth in sharing server.
add 9442a51 JsonLogger implementation (#5356) (#5357)
add 960a0e1 Merge branch 'master' into auth_fix
No new revisions were added by this update.
Summary of changes:
apm-commons/apm-datacarrier/pom.xml | 8 +
apm-commons/apm-util/pom.xml | 8 +
.../skywalking/apm/util/ConfigInitializer.java | 2 +-
apm-sniffer/apm-agent-core/pom.xml | 5 +
.../skywalking/apm/agent/core/conf/Config.java | 7 +
.../agent/core/conf/SnifferConfigInitializer.java | 18 +-
.../agent/core/logging/core/AbstractLogger.java | 185 +++++++++++++++++++++
.../apm/agent/core/logging/core/Converter.java | 4 +-
...atternLogResolver.java => JsonLogResolver.java} | 13 +-
.../apm/agent/core/logging/core/JsonLogger.java | 80 +++++++++
.../apm/agent/core/logging/core/Parser.java | 2 +-
.../apm/agent/core/logging/core/PatternLogger.java | 148 +----------------
.../core/{LogOutput.java => ResolverType.java} | 4 +-
.../AgentNameConverter.java | 7 +-
.../{coverts => converters}/ClassConverter.java | 7 +-
.../{coverts => converters}/DateConverter.java | 7 +-
.../{coverts => converters}/LevelConverter.java | 7 +-
.../{coverts => converters}/LiteralConverter.java | 7 +-
.../{coverts => converters}/MessageConverter.java | 7 +-
.../{coverts => converters}/ThreadConverter.java | 7 +-
.../ThrowableConverter.java | 7 +-
.../agent/core/logging/core/JsonLoggerTest.java | 183 ++++++++++++++++++++
.../agent/core/logging/core/LoggingBenchmark.java | 96 +++++++++++
.../agent/core/logging/core/PatternLoggerTest.java | 49 +++++-
.../skywalking/apm/agent/SkyWalkingAgent.java | 34 ++--
.../apm-sdk-plugin/solrj-7.x-plugin/pom.xml | 6 +
apm-sniffer/apm-test-tools/pom.xml | 5 +
docs/en/setup/service-agent/java-agent/README.md | 3 +-
pom.xml | 11 +-
29 files changed, 747 insertions(+), 180 deletions(-)
create mode 100644
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/AbstractLogger.java
copy
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/{PatternLogResolver.java
=> JsonLogResolver.java} (75%)
create mode 100644
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/JsonLogger.java
copy
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/{LogOutput.java
=> ResolverType.java} (95%)
rename
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/{coverts
=> converters}/AgentNameConverter.java (88%)
rename
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/{coverts
=> converters}/ClassConverter.java (88%)
rename
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/{coverts
=> converters}/DateConverter.java (89%)
rename
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/{coverts
=> converters}/LevelConverter.java (88%)
rename
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/{coverts
=> converters}/LiteralConverter.java (90%)
rename
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/{coverts
=> converters}/MessageConverter.java (88%)
rename
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/{coverts
=> converters}/ThreadConverter.java (88%)
rename
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/{coverts
=> converters}/ThrowableConverter.java (92%)
create mode 100644
apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/JsonLoggerTest.java
create mode 100644
apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/LoggingBenchmark.java
