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/11/24 12:03:18 UTC
[skywalking] branch otel-istio updated (5bac7dc -> ebcb35a)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch otel-istio
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 5bac7dc Exclude otel-oc-rules
add d9623ec Spring-Kafka 1.x support (#5879)
add ebcb35a Merge branch 'master' into otel-istio
No new revisions were added by this update.
Summary of changes:
.github/workflows/plugins-test.3.yaml | 1 +
CHANGES.md | 1 +
apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml | 1 +
.../pom.xml | 4 ++--
.../spring/kafka/PostRunMethodInterceptor.java} | 9 +++----
.../kafka/ProcessSeeksMethodInterceptor.java} | 7 +++---
.../LegacyListenerConsumerInstrumentation.java} | 28 +++++++++++++---------
.../src/main/resources/skywalking-plugin.def | 3 +--
docs/en/FAQ/kafka-plugin.md | 4 ++--
.../setup/service-agent/java-agent/Plugin-list.md | 1 +
.../service-agent/java-agent/Supported-list.md | 2 +-
.../bin/startup.sh | 2 +-
.../config/expectedData.yaml | 14 +++++------
.../configuration.yml | 4 ++--
.../pom.xml | 12 +++++-----
.../src/main/assembly/assembly.xml | 2 +-
.../apm/testcase/spring/kafka/Application.java | 0
.../spring/kafka/controller/CaseController.java | 7 +++---
.../src/main/resources/application.properties | 2 +-
.../src/main/resources/log4j2.xml | 0
.../support-version.list | 5 ++--
21 files changed, 61 insertions(+), 48 deletions(-)
copy apm-sniffer/apm-sdk-plugin/spring-plugins/{spring-kafka-2.x-plugin => spring-kafka-1.x-plugin}/pom.xml (93%)
copy apm-sniffer/{apm-toolkit-activation/apm-toolkit-meter-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/meter/GaugeGetInterceptor.java => apm-sdk-plugin/spring-plugins/spring-kafka-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/kafka/PostRunMethodInterceptor.java} (86%)
copy apm-sniffer/apm-sdk-plugin/spring-plugins/{spring-kafka-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/kafka/PollAndInvokeMethodInterceptor.java => spring-kafka-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/kafka/ProcessSeeksMethodInterceptor.java} (93%)
copy apm-sniffer/{apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/async/AsyncAppenderInstrumentation.java => apm-sdk-plugin/spring-plugins/spring-kafka-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/kafka/define/LegacyListenerConsumerInstrumentation.java} (70%)
copy apm-sniffer/apm-sdk-plugin/{dubbo-conflict-patch => spring-plugins/spring-kafka-1.x-plugin}/src/main/resources/skywalking-plugin.def (87%)
copy test/plugin/scenarios/{kafka-scenario => spring-kafka-1.3.x-scenario}/bin/startup.sh (88%)
copy test/plugin/scenarios/{spring-kafka-2.2.x-scenario => spring-kafka-1.3.x-scenario}/config/expectedData.yaml (92%)
copy test/plugin/scenarios/{spring-kafka-2.2.x-scenario => spring-kafka-1.3.x-scenario}/configuration.yml (91%)
copy test/plugin/scenarios/{spring-kafka-2.2.x-scenario => spring-kafka-1.3.x-scenario}/pom.xml (93%)
copy test/plugin/scenarios/{shardingsphere-3.x-scenario => spring-kafka-1.3.x-scenario}/src/main/assembly/assembly.xml (96%)
copy test/plugin/scenarios/{spring-kafka-2.2.x-scenario => spring-kafka-1.3.x-scenario}/src/main/java/test/org/apache/skywalking/apm/testcase/spring/kafka/Application.java (100%)
copy test/plugin/scenarios/{spring-kafka-2.2.x-scenario => spring-kafka-1.3.x-scenario}/src/main/java/test/org/apache/skywalking/apm/testcase/spring/kafka/controller/CaseController.java (94%)
copy test/plugin/scenarios/{canal-scenario => spring-kafka-1.3.x-scenario}/src/main/resources/application.properties (94%)
copy test/plugin/scenarios/{spring-kafka-2.3.x-scenario => spring-kafka-1.3.x-scenario}/src/main/resources/log4j2.xml (100%)
copy test/plugin/scenarios/{avro-scenario => spring-kafka-1.3.x-scenario}/support-version.list (94%)