This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch webapp_refactoring
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 8d88e3a Merge branch 'webapp_refactoring' of
github.com:apache/skywalking into webapp_refactoring
add 0f62d92 Add agent plugin to support Sentinel (#7190)
add 0f9c39f Merge branch 'master' into webapp_refactoring
No new revisions were added by this update.
Summary of changes:
.github/workflows/plugins-test.1.yaml | 1 +
CHANGES.md | 1 +
.../network/trace/component/ComponentsDefine.java | 2 +
apm-sniffer/optional-plugins/pom.xml | 1 +
.../pom.xml | 20 ++--
.../apm/plugin/sentinel/v1}/Constants.java | 7 +-
.../sentinel/v1/EntryMethodInterceptor.java} | 51 ++++++----
.../SentinelAsyncEntryConstructorInterceptor.java} | 37 ++++---
.../sentinel/v1/SentinelAsyncExitInterceptor.java} | 22 ++--
.../v1/SentinelCtEntryConstructorInterceptor.java | 52 ++++++++++
.../sentinel/v1/SentinelExitInterceptor.java} | 21 ++--
.../define/SentinelAsyncEntryInstrumentation.java} | 20 ++--
.../v1/define/SentinelCtEntryInstrumentation.java} | 21 ++--
.../v1/define/SentinelCtSphInstrumentation.java} | 19 ++--
.../src/main}/resources/skywalking-plugin.def | 4 +-
.../setup/service-agent/java-agent/Plugin-list.md | 1 +
docs/en/setup/service-agent/java-agent/README.md | 1 +
.../service-agent/java-agent/Supported-list.md | 1 +
.../src/main/resources/component-libraries.yml | 3 +
.../bin/startup.sh | 2 +-
.../config/expectedData.yaml | 84 ++++++++--------
.../configuration.yml | 6 +-
.../pom.xml | 18 ++--
.../src/main/assembly/assembly.xml | 2 +-
.../apm/testcase/sentinel}/Application.java | 2 +-
.../sentinel/controller/CaseController.java | 111 +++++++++++++++++++++
.../src/main/resources/application.yaml | 2 +-
.../src/main/resources/log4j2.xml | 0
.../support-version.list | 7 +-
29 files changed, 358 insertions(+), 161 deletions(-)
copy apm-sniffer/optional-plugins/{mybatis-3.x-plugin =>
sentinel-1.x-plugin}/pom.xml (71%)
copy
apm-sniffer/{apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define
=>
optional-plugins/sentinel-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sentinel/v1}/Constants.java
(82%)
copy
apm-sniffer/{apm-sdk-plugin/quasar-plugin/src/main/java/org/apache/skywalking/apm/plugin/quasar/FiberInterceptor.java
=>
optional-plugins/sentinel-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sentinel/v1/EntryMethodInterceptor.java}
(54%)
copy
apm-sniffer/{apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/GenericRequestorInterceptor.java
=>
optional-plugins/sentinel-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sentinel/v1/SentinelAsyncEntryConstructorInterceptor.java}
(50%)
copy
apm-sniffer/{apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/PipelineSetClientMethodInterceptor.java
=>
optional-plugins/sentinel-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sentinel/v1/SentinelAsyncExitInterceptor.java}
(76%)
create mode 100644
apm-sniffer/optional-plugins/sentinel-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sentinel/v1/SentinelCtEntryConstructorInterceptor.java
copy
apm-sniffer/{apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/PipelineSetClientMethodInterceptor.java
=>
optional-plugins/sentinel-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sentinel/v1/SentinelExitInterceptor.java}
(76%)
copy
apm-sniffer/{apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/define/ApplicationDispatcherInstrumentation.java
=>
optional-plugins/sentinel-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sentinel/v1/define/SentinelAsyncEntryInstrumentation.java}
(77%)
copy
apm-sniffer/{apm-sdk-plugin/thrift-plugin/src/main/java/org/apache/skywalking/apm/plugin/thrift/define/TBaseProcessorInstrumentation.java
=>
optional-plugins/sentinel-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sentinel/v1/define/SentinelCtEntryInstrumentation.java}
(79%)
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/async/AsyncAppenderInstrumentation.java
=>
optional-plugins/sentinel-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sentinel/v1/define/SentinelCtSphInstrumentation.java}
(80%)
copy apm-sniffer/{apm-agent-core/src/test =>
optional-plugins/sentinel-1.x-plugin/src/main}/resources/skywalking-plugin.def
(73%)
copy test/plugin/scenarios/{dbcp-2.x-scenario =>
sentinel-scenario}/bin/startup.sh (92%)
mode change 100755 => 100644
copy test/plugin/scenarios/{hbase-scenario =>
sentinel-scenario}/config/expectedData.yaml (54%)
copy test/plugin/scenarios/{gson-scenario =>
sentinel-scenario}/configuration.yml (82%)
copy test/plugin/scenarios/{hystrix-scenario => sentinel-scenario}/pom.xml
(89%)
copy test/plugin/scenarios/{dbcp-2.x-scenario =>
sentinel-scenario}/src/main/assembly/assembly.xml (95%)
mode change 100755 => 100644
copy
test/plugin/scenarios/{avro-scenario/avro-client/src/main/java/org/apache/skywalking/apm/testcase/avro
=>
sentinel-scenario/src/main/java/test/apache/skywalking/apm/testcase/sentinel}/Application.java
(95%)
create mode 100644
test/plugin/scenarios/sentinel-scenario/src/main/java/test/apache/skywalking/apm/testcase/sentinel/controller/CaseController.java
copy test/plugin/scenarios/{quasar-scenario =>
sentinel-scenario}/src/main/resources/application.yaml (95%)
copy test/plugin/scenarios/{spring-kafka-2.3.x-scenario =>
sentinel-scenario}/src/main/resources/log4j2.xml (100%)
copy test/plugin/scenarios/{avro-scenario =>
sentinel-scenario}/support-version.list (96%)
