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/incubator-skywalking.git.
from 014fd12 Merge pull request #835 from ascrutae/fix/toolkit-issue
add fa99652 [Agent] Support hystrix plugin
add c58c9ec Merge upstream/master to master
add 6545671 add comment
add b4d58cd Adjust variable name and remove some confuse comment
add 851ee0f Merge branch 'master' into feature/support-hystrix-plugin
add 107eaac Adjust hystrix plugin buried point
add acae617 Merge branch 'master' into feature/support-hystrix-plugin
add a1711f7 Update pom.xml
add 64c48ea remove javadoc
add 9a401a3 Merge branch 'master' into feature/support-hystrix-plugin
add 2b153b8 Merge branch 'master' into feature/support-hystrix-plugin
new ca9bada Merge pull request #829 from
ascrutae/feature/support-hystrix-plugin
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../storage/table/register/ServerTypeDefine.java | 3 +-
.../network/trace/component/ComponentsDefine.java | 5 +-
.../apm-sdk-plugin/hystrix-1.x-plugin/pom.xml | 24 +++
.../hystrix/v1/EnhanceRequireObjectCache.java} | 23 +--
.../v1/HystrixCommandConstructorInterceptor.java | 60 +++++++
.../v1/HystrixCommandGetFallbackInterceptor.java} | 18 +--
.../hystrix/v1/HystrixCommandRunInterceptor.java} | 31 ++--
.../hystrix/v1/HystrixPluginsInterceptor.java} | 21 +--
.../plugin/hystrix/v1/SWExecutionHookWrapper.java | 180 +++++++++++++++++++++
.../v1/define/HystrixCommandInstrumentation.java} | 38 ++---
.../v1/define/HystrixPluginsInstrumentation.java} | 33 ++--
.../src/main/resources/skywalking-plugin.def | 2 +
apm-sniffer/apm-sdk-plugin/pom.xml | 1 +
13 files changed, 343 insertions(+), 96 deletions(-)
create mode 100644 apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml
copy
apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/SendCallBackEnhanceInfo.java
=>
hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/EnhanceRequireObjectCache.java}
(68%)
create mode 100644
apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandConstructorInterceptor.java
copy
apm-sniffer/apm-sdk-plugin/{kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/CallbackInterceptor.java
=>
hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandGetFallbackInterceptor.java}
(74%)
copy
apm-sniffer/apm-sdk-plugin/{spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/FailureCallbackInterceptor.java
=>
hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandRunInterceptor.java}
(69%)
copy
apm-sniffer/apm-sdk-plugin/{spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/CreateAopProxyInterceptor.java
=>
hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixPluginsInterceptor.java}
(76%)
create mode 100644
apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWExecutionHookWrapper.java
copy
apm-sniffer/apm-sdk-plugin/{okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/define/RealCallInstrumentation.java
=>
hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixCommandInstrumentation.java}
(76%)
copy
apm-sniffer/apm-sdk-plugin/{feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/define/DefaultHttpClientInstrumentation.java
=>
hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixPluginsInstrumentation.java}
(73%)
create mode 100644
apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/resources/skywalking-plugin.def
--
To stop receiving notification emails like this one, please contact
[email protected].
