You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/02/28 03:17:46 UTC

[incubator-skywalking] branch fix/typo updated (534b049 -> 6f12e8b)

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a change to branch fix/typo
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.


    from 534b049  Fix typo. K8s - > Kubernetes
     add f50c5b1  add rocketMQ-3.x-plugin
     add 3b58be2  Merge branch 'master' of https://github.com/carlvine500/incubator-skywalking
     add 02d1ec4  Merge branch 'master' into master
     add e56a5e6  Merge https://github.com/apache/incubator-skywalking
     add 8956b9b  rocketMQ-3.x-plugin class MQVersion cause ClassNotFoundException
     add bcec5c8  rocketmq-3.x-plugin refactor tag name
     add 8d5fbcf  update rocketMQ-3.x-plugin junit tests like rocketMQ-4.x-plugin
     add 2f70e3a  Merge branch 'master' into master
     add eb70abd  Merge branch 'master' of https://github.com/carlvine500/incubator-skywalking
     add 78b4b34  remove interceptor in xxxInstrument
     add e2adfe4  Merge branch 'master' into master
     add e9c9a3e  Merge branch 'master' into master
     add 14546ec  Update pom.xml
     add 2e3ee1b  Merge branch 'master' of https://github.com/carlvine500/incubator-skywalking
     add 4019070  Merge branch 'master' into master
     add d1a6f0d  Merge pull request #796 from carlvine500/master
     new 6f12e8b  Merge branch 'master' into fix/typo

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:
 apm-sniffer/apm-sdk-plugin/pom.xml                 |  1 +
 .../pom.xml                                        |  8 +++----
 .../v3}/AbstractMessageConsumeInterceptor.java     | 17 +++++++-------
 .../v3}/MessageConcurrentlyConsumeInterceptor.java | 13 +++++------
 .../v3}/MessageOrderlyConsumeInterceptor.java      | 13 +++++------
 .../rocketMQ/v3}/MessageSendInterceptor.java       | 27 +++++++++++-----------
 .../rocketMQ/v3}/OnExceptionInterceptor.java       | 11 ++++-----
 .../plugin/rocketMQ/v3}/OnSuccessInterceptor.java  | 13 +++++------
 .../rocketMQ/v3}/UpdateNameServerInterceptor.java  |  3 +--
 .../ConsumeMessageConcurrentlyInstrumentation.java | 17 ++++++++++----
 .../ConsumeMessageOrderlyInstrumentation.java      | 13 ++++++++---
 .../v3}/define/MQClientAPIImplInstrumentation.java | 25 ++++++++++++++------
 .../v3}/define/SendCallBackEnhanceInfo.java        |  5 ++--
 .../v3}/define/SendCallbackInstrumentation.java    | 18 +++++++++++----
 .../src/main/resources/skywalking-plugin.def       |  4 ++++
 .../rocketMQ/v3}/MessageSendInterceptorTest.java   |  8 +++----
 .../rocketMQ/v3}/OnExceptionInterceptorTest.java   |  4 ++--
 .../rocketMQ/v3}/OnSuccessInterceptorTest.java     |  8 +++----
 18 files changed, 119 insertions(+), 89 deletions(-)
 copy apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin => rocketMQ-3.x-plugin}/pom.xml (92%)
 copy apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4 => rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3}/AbstractMessageConsumeInterceptor.java (86%)
 copy apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4 => rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3}/MessageConcurrentlyConsumeInterceptor.java (84%)
 copy apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4 => rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3}/MessageOrderlyConsumeInterceptor.java (84%)
 copy apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4 => rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3}/MessageSendInterceptor.java (79%)
 copy apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4 => rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3}/OnExceptionInterceptor.java (89%)
 copy apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4 => rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3}/OnSuccessInterceptor.java (89%)
 copy apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4 => rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3}/UpdateNameServerInterceptor.java (97%)
 copy apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4 => rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3}/define/ConsumeMessageConcurrentlyInstrumentation.java (74%)
 copy apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4 => rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3}/define/ConsumeMessageOrderlyInstrumentation.java (80%)
 copy apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4 => rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3}/define/MQClientAPIImplInstrumentation.java (68%)
 copy apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4 => rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3}/define/SendCallBackEnhanceInfo.java (94%)
 copy apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4 => rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3}/define/SendCallbackInstrumentation.java (79%)
 create mode 100644 apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/resources/skywalking-plugin.def
 copy apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v4 => rocketMQ-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v3}/MessageSendInterceptorTest.java (95%)
 copy apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v4 => rocketMQ-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v3}/OnExceptionInterceptorTest.java (96%)
 copy apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v4 => rocketMQ-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v3}/OnSuccessInterceptorTest.java (95%)

-- 
To stop receiving notification emails like this one, please contact
wusheng@apache.org.

[incubator-skywalking] 01/01: Merge branch 'master' into fix/typo

Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch fix/typo
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git

commit 6f12e8bd8d1f72df9515b12cc6dedef9235b5511
Merge: 534b049 d1a6f0d
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Feb 28 11:17:45 2018 +0800

    Merge branch 'master' into fix/typo

 apm-sniffer/apm-sdk-plugin/pom.xml                 |   1 +
 .../apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml     |  68 +++++++++++
 .../v3/AbstractMessageConsumeInterceptor.java      |  78 ++++++++++++
 .../v3/MessageConcurrentlyConsumeInterceptor.java  |  50 ++++++++
 .../v3/MessageOrderlyConsumeInterceptor.java       |  51 ++++++++
 .../plugin/rocketMQ/v3/MessageSendInterceptor.java | 100 +++++++++++++++
 .../plugin/rocketMQ/v3/OnExceptionInterceptor.java |  61 +++++++++
 .../plugin/rocketMQ/v3/OnSuccessInterceptor.java   |  68 +++++++++++
 .../rocketMQ/v3/UpdateNameServerInterceptor.java   |  43 +++++++
 .../ConsumeMessageConcurrentlyInstrumentation.java |  68 +++++++++++
 .../ConsumeMessageOrderlyInstrumentation.java      |  68 +++++++++++
 .../v3/define/MQClientAPIImplInstrumentation.java  |  89 ++++++++++++++
 .../v3/define/SendCallBackEnhanceInfo.java         |  44 +++++++
 .../v3/define/SendCallbackInstrumentation.java     |  86 +++++++++++++
 .../src/main/resources/skywalking-plugin.def       |   4 +
 .../rocketMQ/v3/MessageSendInterceptorTest.java    | 136 +++++++++++++++++++++
 .../rocketMQ/v3/OnExceptionInterceptorTest.java    |  88 +++++++++++++
 .../rocketMQ/v3/OnSuccessInterceptorTest.java      | 114 +++++++++++++++++
 18 files changed, 1217 insertions(+)

-- 
To stop receiving notification emails like this one, please contact
wusheng@apache.org.