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/01/29 03:09:16 UTC
[incubator-skywalking] branch master updated (e2d8f62 -> 9924da7)
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 e2d8f62 Merge pull request #778 from ascrutae/feature/spring-bean-plugin
add 22ead46 [Agent] Support kafka framework
add 5fab1fa add spanlayer and component for kafka span
add 906a2c4 add testcase
add ed5e49d Merge branch 'master' into feature/kafka-plugin
add 14a61d7 remove readme.md
add 4774b02 rename kafka plugin module
add 111f31c change package
add 0794ebd Merge branch 'master' into feature/kafka-plugin
add 133470d Merge branch 'feature/kafka-plugin' of https://github.com/ascrutae/sky-walking into feature/kafka-plugin
new 9924da7 Merge pull request #772 from ascrutae/feature/kafka-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:
.../network/trace/component/ComponentsDefine.java | 5 +-
.../apm/agent/core/context/trace/AbstractSpan.java | 2 +
.../core/context/trace/AbstractTracingSpan.java | 6 +
.../apm/agent/core/context/trace/NoopSpan.java | 4 +
.../core-patch => kafka-v1-plugin}/pom.xml | 14 +-
.../apm/plugin/kafka/v1/CallbackInterceptor.java} | 28 ++--
.../kafka/v1/ConsumerConstructorInterceptor.java} | 17 ++-
.../kafka/v1/ConsumerEnhanceRequiredInfo.java | 43 +++---
.../plugin/kafka/v1/KafkaConsumerInterceptor.java | 94 +++++++++++++
.../plugin/kafka/v1/KafkaProducerInterceptor.java} | 47 ++++---
.../kafka/v1/ProducerConstructorInterceptor.java} | 15 +--
.../v1/ProducerRecordConstructorInterceptor.java} | 14 +-
.../kafka/v1/SubscribeMethodInterceptor.java} | 12 +-
.../kafka/v1}/define/CallbackInstrumentation.java | 33 +++--
.../v1/define/KafkaConsumerInstrumentation.java} | 62 +++++----
.../v1/define/KafkaProducerInstrumentation.java} | 38 ++++--
.../v1/define/ProducerRecordInstrumentation.java} | 41 +++---
.../src/main/resources/skywalking-plugin.def | 4 +
.../plugin/kafka/v11/CallbackInterceptorTest.java | 148 +++++++++++++++++++++
.../v11/ConsumerConstructorInterceptorTest.java | 75 +++++++++++
.../kafka/v11/KafkaConsumerInterceptorTest.java | 142 ++++++++++++++++++++
.../kafka/v11/KafkaProducerInterceptorTest.java | 116 ++++++++++++++++
.../v11/ProducerConstructorInterceptorTest.java} | 62 ++++-----
.../ProducerRecordConstructorInterceptorTest.java} | 54 +++-----
.../kafka/v11/SubscribeMethodInterceptorTest.java} | 61 ++++-----
apm-sniffer/apm-sdk-plugin/pom.xml | 1 +
.../agent/core/context/MockContextSnapshot.java | 47 +++++++
27 files changed, 907 insertions(+), 278 deletions(-)
copy apm-sniffer/apm-sdk-plugin/{spring-plugins/core-patch => kafka-v1-plugin}/pom.xml (82%)
copy apm-sniffer/apm-sdk-plugin/{grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/ServerCallOnCancelInterceptor.java => kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/CallbackInterceptor.java} (74%)
copy apm-sniffer/apm-sdk-plugin/{grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/UnaryStreamToFutureConstructorInterceptor.java => kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/ConsumerConstructorInterceptor.java} (67%)
copy apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/util/CollectionUtils.java => apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/ConsumerEnhanceRequiredInfo.java (51%)
create mode 100644 apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/KafkaConsumerInterceptor.java
copy apm-sniffer/apm-sdk-plugin/{jetty-plugin/jetty-client-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/client/SyncHttpRequestSendInterceptor.java => kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/KafkaProducerInterceptor.java} (66%)
copy apm-sniffer/apm-sdk-plugin/{grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/UnaryStreamToFutureConstructorInterceptor.java => kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/ProducerConstructorInterceptor.java} (71%)
copy apm-sniffer/apm-sdk-plugin/{grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/UnaryStreamToFutureConstructorInterceptor.java => kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/ProducerRecordConstructorInterceptor.java} (79%)
copy apm-sniffer/{optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/SpringAnnotationInterceptor.java => apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/SubscribeMethodInterceptor.java} (81%)
copy apm-sniffer/apm-sdk-plugin/{okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3 => kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1}/define/CallbackInstrumentation.java (74%)
copy apm-sniffer/apm-sdk-plugin/{okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/define/RealCallInstrumentation.java => kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/KafkaConsumerInstrumentation.java} (54%)
copy apm-sniffer/apm-sdk-plugin/{okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/define/AsyncCallInstrumentation.java => kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/KafkaProducerInstrumentation.java} (58%)
copy apm-sniffer/apm-sdk-plugin/{okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/define/AsyncCallInstrumentation.java => kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/ProducerRecordInstrumentation.java} (62%)
create mode 100644 apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/resources/skywalking-plugin.def
create mode 100644 apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/v11/CallbackInterceptorTest.java
create mode 100644 apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/v11/ConsumerConstructorInterceptorTest.java
create mode 100644 apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/v11/KafkaConsumerInterceptorTest.java
create mode 100644 apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/v11/KafkaProducerInterceptorTest.java
copy apm-sniffer/apm-sdk-plugin/{spring-plugins/core-patch/src/test/java/org/apache/skywalking/apm/plugin/spring/patch/CreateAopProxyInterceptorTest.java => kafka-v1-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/v11/ProducerConstructorInterceptorTest.java} (51%)
copy apm-sniffer/apm-sdk-plugin/{spring-plugins/core-patch/src/test/java/org/apache/skywalking/apm/plugin/spring/patch/CreateAopProxyInterceptorTest.java => kafka-v1-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/v11/ProducerRecordConstructorInterceptorTest.java} (54%)
copy apm-sniffer/apm-sdk-plugin/{spring-plugins/core-patch/src/test/java/org/apache/skywalking/apm/plugin/spring/patch/CreateAopProxyInterceptorTest.java => kafka-v1-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/v11/SubscribeMethodInterceptorTest.java} (50%)
create mode 100644 apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/core/context/MockContextSnapshot.java
--
To stop receiving notification emails like this one, please contact
wusheng@apache.org.
[incubator-skywalking] 01/01: Merge pull request #772 from
ascrutae/feature/kafka-plugin
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 9924da71b121e91f22218909bebbfe854ea827f2
Merge: e2d8f62 133470d
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Mon Jan 29 11:09:12 2018 +0800
Merge pull request #772 from ascrutae/feature/kafka-plugin
[Agent] Support kafka framework
.../network/trace/component/ComponentsDefine.java | 5 +-
.../apm/agent/core/context/trace/AbstractSpan.java | 2 +
.../core/context/trace/AbstractTracingSpan.java | 6 +
.../apm/agent/core/context/trace/NoopSpan.java | 4 +
apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/pom.xml | 40 ++++++
.../apm/plugin/kafka/v1/CallbackInterceptor.java | 55 ++++++++
.../kafka/v1/ConsumerConstructorInterceptor.java | 34 +++++
.../kafka/v1/ConsumerEnhanceRequiredInfo.java | 53 ++++++++
.../plugin/kafka/v1/KafkaConsumerInterceptor.java | 94 +++++++++++++
.../plugin/kafka/v1/KafkaProducerInterceptor.java | 81 +++++++++++
.../kafka/v1/ProducerConstructorInterceptor.java | 32 +++++
.../v1/ProducerRecordConstructorInterceptor.java | 29 ++++
.../kafka/v1/SubscribeMethodInterceptor.java | 48 +++++++
.../kafka/v1/define/CallbackInstrumentation.java | 69 ++++++++++
.../v1/define/KafkaConsumerInstrumentation.java | 106 +++++++++++++++
.../v1/define/KafkaProducerInstrumentation.java | 91 +++++++++++++
.../v1/define/ProducerRecordInstrumentation.java | 66 +++++++++
.../src/main/resources/skywalking-plugin.def | 4 +
.../plugin/kafka/v11/CallbackInterceptorTest.java | 148 +++++++++++++++++++++
.../v11/ConsumerConstructorInterceptorTest.java | 75 +++++++++++
.../kafka/v11/KafkaConsumerInterceptorTest.java | 142 ++++++++++++++++++++
.../kafka/v11/KafkaProducerInterceptorTest.java | 116 ++++++++++++++++
.../v11/ProducerConstructorInterceptorTest.java | 70 ++++++++++
.../ProducerRecordConstructorInterceptorTest.java | 60 +++++++++
.../kafka/v11/SubscribeMethodInterceptorTest.java | 69 ++++++++++
apm-sniffer/apm-sdk-plugin/pom.xml | 1 +
.../agent/core/context/MockContextSnapshot.java | 47 +++++++
27 files changed, 1546 insertions(+), 1 deletion(-)
--
To stop receiving notification emails like this one, please contact
wusheng@apache.org.