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 05:06:24 UTC
[incubator-skywalking] branch doc/roadmap updated (6a379aa ->
7ad55bd)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch doc/roadmap
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from 6a379aa Proposal our ROADMAP.
add dbf0104 Add kafka plugin docs
add c1d2afb Update Supported-list.md
add 1a21409 Update Kafka-plugin-CN.md
add 73fd9c7 Update kafka-plugin.md
add 7670ef3 link the kafka FAQ document
add 843e32a link the page
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 f377c33 [Agent] support spring bean plugin
add 44e9665 [Agent] modify the method matcher of spring bean
add c300e85 Change the file structure of spring bean plugin
add a5e3710 refactory code
add e2d8f62 Merge pull request #778 from ascrutae/feature/spring-bean-plugin
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
add 9924da7 Merge pull request #772 from ascrutae/feature/kafka-plugin
add 9290e20 Merge branch 'master' into feature/change-docs
add ab6f4f3 Update README.md
add a0428d1 Update Why-have-traces-no-others-CN.md
add 36cc9e5 Update Why-have-traces-no-others.md
add e9cffe3 Update Why-have-traces-no-others-CN.md
add ddbe5dc Merge pull request #780 from ascrutae/feature/change-docs
new 7ad55bd Merge branch 'master' into doc/roadmap
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} | 10 +-
.../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 | 8 +-
.../agent/core/context/MockContextSnapshot.java | 47 +++++++
.../optional-spring-plugins}/pom.xml | 14 +-
.../spring-annotation-plugin}/pom.xml | 13 +-
.../AbstractSpringBeanInstrumentation.java} | 33 ++---
.../annotations/SpringAnnotationInterceptor.java} | 8 +-
.../bean/SpringBeanInstrumentation.java} | 15 +--
.../component/SpringComponentInstrumentation.java} | 18 +--
.../SpringRepositoryInstrumentation.java} | 18 +--
.../services/SpringServicesInstrumentation.java} | 18 +--
.../src/main/resources/skywalking-plugin.def | 4 +
.../pom.xml | 72 +++-------
apm-sniffer/pom.xml | 1 +
docs/README.md | 3 +
docs/README_ZH.md | 1 +
docs/Supported-list.md | 4 +-
docs/cn/FAQ/Kafka-plugin-CN.md | 7 +
docs/cn/FAQ/Why-have-traces-no-others-CN.md | 5 +-
docs/en/FAQ/Too-many-gRPC-logs.md | 6 +
docs/en/FAQ/Why-have-traces-no-others.md | 9 ++
docs/en/FAQ/kafka-plugin.md | 8 ++
46 files changed, 1029 insertions(+), 418 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/apm-sdk-plugin/{okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/OnFailureInterceptor.java => 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
copy {apm-collector/apm-collector-agent/agent-jetty => apm-sniffer/optional-plugins/optional-spring-plugins}/pom.xml (80%)
copy apm-sniffer/{apm-sdk-plugin/spring-plugins/core-patch => optional-plugins/optional-spring-plugins/spring-annotation-plugin}/pom.xml (84%)
copy apm-sniffer/{apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/define/AopProxyFactoryInstrumentation.java => optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/AbstractSpringBeanInstrumentation.java} (63%)
copy apm-sniffer/{apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/OnFailureInterceptor.java => optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/SpringAnnotationInterceptor.java} (84%)
copy apm-sniffer/{apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/JdbcConnectionInstrumentation.java => optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/bean/SpringBeanInstrumentation.java} (68%)
copy apm-sniffer/{apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/JdbcConnectionInstrumentation.java => optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/component/SpringComponentInstrumentation.java} (68%)
copy apm-sniffer/{apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/JdbcConnectionInstrumentation.java => optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/repository/SpringRepositoryInstrumentation.java} (68%)
copy apm-sniffer/{apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/JdbcConnectionInstrumentation.java => optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/services/SpringServicesInstrumentation.java} (68%)
create mode 100644 apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/resources/skywalking-plugin.def
copy apm-sniffer/{apm-toolkit-activation => optional-plugins}/pom.xml (55%)
create mode 100644 docs/cn/FAQ/Kafka-plugin-CN.md
create mode 100644 docs/en/FAQ/Too-many-gRPC-logs.md
create mode 100644 docs/en/FAQ/Why-have-traces-no-others.md
create mode 100644 docs/en/FAQ/kafka-plugin.md
--
To stop receiving notification emails like this one, please contact
wusheng@apache.org.
[incubator-skywalking] 01/01: Merge branch 'master' into doc/roadmap
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch doc/roadmap
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 7ad55bd092350b309ad69847000f9e05f658a9a6
Merge: 6a379aa ddbe5dc
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Mon Jan 29 13:06:22 2018 +0800
Merge branch 'master' into doc/roadmap
.../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-sdk-plugin/kafka-v1-plugin}/pom.xml | 27 ++--
.../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 | 8 +-
.../agent/core/context/MockContextSnapshot.java | 47 +++++++
.../optional-spring-plugins}/pom.xml | 21 ++-
.../spring-annotation-plugin}/pom.xml | 28 ++--
.../AbstractSpringBeanInstrumentation.java | 58 ++++++++
.../annotations/SpringAnnotationInterceptor.java | 46 +++++++
.../bean/SpringBeanInstrumentation.java | 36 +++++
.../component/SpringComponentInstrumentation.java | 33 +++++
.../SpringRepositoryInstrumentation.java | 33 +++++
.../services/SpringServicesInstrumentation.java | 33 +++++
.../src/main/resources/skywalking-plugin.def | 4 +
apm-sniffer/optional-plugins/pom.xml | 114 ++++++++++++++++
apm-sniffer/pom.xml | 1 +
docs/README.md | 3 +
docs/README_ZH.md | 1 +
docs/Supported-list.md | 4 +-
docs/cn/FAQ/Kafka-plugin-CN.md | 7 +
docs/cn/FAQ/Why-have-traces-no-others-CN.md | 5 +-
docs/en/FAQ/Too-many-gRPC-logs.md | 6 +
docs/en/FAQ/Why-have-traces-no-others.md | 9 ++
docs/en/FAQ/kafka-plugin.md | 8 ++
46 files changed, 1939 insertions(+), 52 deletions(-)
diff --cc docs/README.md
index 8b7eaec,6b34add..ba5ddf0
--- a/docs/README.md
+++ b/docs/README.md
@@@ -22,6 -22,8 +22,9 @@@
* [Plugin development guide](en/Plugin-Development-Guide.md)
* Protocol
* [Cross Process Propagation Headers Protocol, v1.0](en/Skywalking-Cross-Process-Propagation-Headers-Protocol-v1.md)
+ * [Roadmap](ROADMAP.md)
* FAQ
+ * [Why only traces in UI?](cn/FAQ/Why-have-traces-no-others.md)
+ * [Too many GRPC logs in the console](cn/FAQ/Too-many-gRPC-logs.md)
+ * [The trace doesn't continue in kafka consumer side](en/FAQ/kafka-plugin.md)
--
To stop receiving notification emails like this one, please contact
wusheng@apache.org.