You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2020/08/10 11:13:41 UTC
[skywalking] branch master updated (2df3c68 -> e37fc2e)
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/skywalking.git.
from 2df3c68 Super Size Dataset record index es rolling step (#5282)
add e37fc2e Support spring-kafka (#5254)
No new revisions were added by this update.
Summary of changes:
.github/workflows/plugins-test.3.yaml | 2 +
.../network/trace/component/ComponentsDefine.java | 2 +
.../{hbase-1.x-plugin => kafka-commons}/pom.xml | 13 +--
.../apm/plugin/kafka/CallbackAdapter.java | 0
.../AbstractKafkaTemplateInstrumentation.java | 0
.../apm/plugin/kafka/define}/Constants.java | 7 +-
.../plugin/kafka/define/SpringKafkaContext.java | 23 ++--
apm-sniffer/apm-sdk-plugin/kafka-plugin/pom.xml | 11 +-
.../apm/plugin/kafka/KafkaConsumerInterceptor.java | 25 ++--
.../src/main/resources/skywalking-plugin.def | 1 -
apm-sniffer/apm-sdk-plugin/pom.xml | 1 +
apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml | 1 +
.../spring-kafka-2.x-plugin}/pom.xml | 21 ++--
.../kafka/KafkaTemplateCallbackInterceptor.java | 10 +-
.../kafka/PollAndInvokeMethodInterceptor.java} | 29 ++---
.../kafka/define/KafkaTemplateInstrumentation.java | 7 +-
.../define/ListenerConsumerInstrumentation.java} | 16 +--
.../src/main}/resources/skywalking-plugin.def | 3 +-
docs/en/FAQ/kafka-plugin.md | 2 +-
.../service-agent/java-agent/Supported-list.md | 1 +
.../src/main/resources/component-libraries.yml | 6 +-
test/plugin/agent-test-tools/pom.xml | 2 +-
.../bin/startup.sh | 2 +-
.../config/expectedData.yaml | 110 ++++++++++++++++++
.../configuration.yml | 4 +-
.../pom.xml | 69 ++++++-----
.../src/main/assembly/assembly.xml | 2 +-
.../apm/testcase/spring/kafka}/Application.java | 6 +-
.../spring/kafka/controller/CaseController.java | 127 +++++++++++++++++++++
.../src/main/resources/application.properties | 2 +-
.../src/main/resources/log4j2.xml | 0
.../support-version.list | 8 +-
.../bin/startup.sh | 2 +-
.../config/expectedData.yaml | 110 ++++++++++++++++++
.../configuration.yml | 4 +-
.../pom.xml | 46 ++++++--
.../src/main/assembly/assembly.xml | 2 +-
.../apm/testcase/spring/kafka}/Application.java | 2 +-
.../spring/kafka/controller/CaseController.java | 127 +++++++++++++++++++++
.../src/main/resources/application.properties | 2 +-
.../src/main/resources/log4j2.xml | 0
.../support-version.list | 8 +-
42 files changed, 682 insertions(+), 134 deletions(-)
copy apm-sniffer/apm-sdk-plugin/{hbase-1.x-plugin => kafka-commons}/pom.xml (81%)
copy apm-sniffer/apm-sdk-plugin/{kafka-plugin => kafka-commons}/src/main/java/org/apache/skywalking/apm/plugin/kafka/CallbackAdapter.java (100%)
rename apm-sniffer/apm-sdk-plugin/{kafka-plugin => kafka-commons}/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/AbstractKafkaTemplateInstrumentation.java (100%)
copy apm-sniffer/apm-sdk-plugin/{tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x => kafka-commons/src/main/java/org/apache/skywalking/apm/plugin/kafka/define}/Constants.java (77%)
copy test/plugin/scenarios/mongodb-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/mongodb/Application.java => apm-sniffer/apm-sdk-plugin/kafka-commons/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/SpringKafkaContext.java (70%)
copy apm-sniffer/apm-sdk-plugin/{hbase-1.x-plugin => spring-plugins/spring-kafka-2.x-plugin}/pom.xml (70%)
rename apm-sniffer/apm-sdk-plugin/{kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin => spring-plugins/spring-kafka-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring}/kafka/KafkaTemplateCallbackInterceptor.java (84%)
copy apm-sniffer/{apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/SpanSetTagInterceptor.java => apm-sdk-plugin/spring-plugins/spring-kafka-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/kafka/PollAndInvokeMethodInterceptor.java} (70%)
rename apm-sniffer/apm-sdk-plugin/{kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin => spring-plugins/spring-kafka-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring}/kafka/define/KafkaTemplateInstrumentation.java (90%)
copy apm-sniffer/apm-sdk-plugin/spring-plugins/{spring-webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/define/DispatcherHandlerInstrumentation.java => spring-kafka-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/kafka/define/ListenerConsumerInstrumentation.java} (80%)
copy apm-sniffer/{apm-agent-core/src/test => apm-sdk-plugin/spring-plugins/spring-kafka-2.x-plugin/src/main}/resources/skywalking-plugin.def (79%)
copy test/plugin/scenarios/{kafka-scenario => spring-kafka-2.2.x-scenario}/bin/startup.sh (88%)
create mode 100644 test/plugin/scenarios/spring-kafka-2.2.x-scenario/config/expectedData.yaml
copy test/plugin/scenarios/{kafka-scenario => spring-kafka-2.2.x-scenario}/configuration.yml (88%)
copy test/plugin/scenarios/{kafka-scenario => spring-kafka-2.2.x-scenario}/pom.xml (74%)
copy test/plugin/scenarios/{shardingsphere-3.x-scenario => spring-kafka-2.2.x-scenario}/src/main/assembly/assembly.xml (96%)
copy test/plugin/scenarios/{redisson-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/redisson => spring-kafka-2.2.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/kafka}/Application.java (79%)
create mode 100644 test/plugin/scenarios/spring-kafka-2.2.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/kafka/controller/CaseController.java
copy test/plugin/scenarios/{canal-scenario => spring-kafka-2.2.x-scenario}/src/main/resources/application.properties (93%)
copy test/plugin/scenarios/{spring-4.3.x-scenario => spring-kafka-2.2.x-scenario}/src/main/resources/log4j2.xml (100%)
copy test/plugin/{archetypes/jvm/src/main/resources/archetype-resources => scenarios/spring-kafka-2.2.x-scenario}/support-version.list (88%)
copy test/plugin/scenarios/{kafka-scenario => spring-kafka-2.3.x-scenario}/bin/startup.sh (88%)
create mode 100644 test/plugin/scenarios/spring-kafka-2.3.x-scenario/config/expectedData.yaml
copy test/plugin/scenarios/{kafka-scenario => spring-kafka-2.3.x-scenario}/configuration.yml (88%)
copy test/plugin/scenarios/{redisson-scenario => spring-kafka-2.3.x-scenario}/pom.xml (73%)
copy test/plugin/scenarios/{shardingsphere-3.x-scenario => spring-kafka-2.3.x-scenario}/src/main/assembly/assembly.xml (96%)
copy test/plugin/scenarios/{apm-toolkit-trace-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/toolkit => spring-kafka-2.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/kafka}/Application.java (94%)
create mode 100644 test/plugin/scenarios/spring-kafka-2.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/kafka/controller/CaseController.java
copy test/plugin/scenarios/{canal-scenario => spring-kafka-2.3.x-scenario}/src/main/resources/application.properties (93%)
copy test/plugin/scenarios/{spring-4.3.x-scenario => spring-kafka-2.3.x-scenario}/src/main/resources/log4j2.xml (100%)
copy test/plugin/{archetypes/jvm/src/main/resources/archetype-resources => scenarios/spring-kafka-2.3.x-scenario}/support-version.list (88%)