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/09/09 02:07:49 UTC
[skywalking] branch master updated (c89e766 -> 1b5dd9b)
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 c89e766 Fix the bug #5443 and add documents for the local E2E remote debugging. (#5457)
add 1b5dd9b Move spring webflux into optional plugin (#5445)
No new revisions were added by this update.
Summary of changes:
apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml | 1 -
.../gateway-2.0.x-plugin/pom.xml | 32 +++++++++++++++++++
.../AbstractGateway200EnhancePluginDefine.java} | 6 ++--
.../define/DispatcherHandlerInstrumentation.java} | 10 +++---
.../v20x/define/HttpClientInstrumentation.java | 5 ++-
.../define/HttpClientRequestInstrumentation.java | 3 +-
.../define/NettyRoutingFilterInstrumentation.java | 3 +-
.../define/ServerWebExchangeInstrumentation.java} | 10 +++---
.../src/main/resources/skywalking-plugin.def | 4 ++-
.../gateway-2.1.x-plugin/pom.xml | 36 +++++++++++++++++++++-
.../define/DispatcherHandlerInstrumentation.java} | 10 +++---
.../define/ServerWebExchangeInstrumentation.java} | 10 +++---
.../src/main/resources/skywalking-plugin.def | 2 ++
.../optional-spring-plugins/pom.xml | 1 +
.../spring-webflux-5.x-plugin/pom.xml | 2 +-
.../DispatcherHandlerHandleMethodInterceptor.java | 0
.../ServerWebExchangeConstructorInterceptor.java | 0
.../define/DispatcherHandlerInstrumentation.java | 0
.../define/ServerWebExchangeInstrumentation.java | 0
.../src/main/resources/skywalking-plugin.def | 0
docs/en/setup/service-agent/java-agent/README.md | 1 +
.../service-agent/java-agent/Supported-list.md | 2 +-
.../sc/gateway/projectA/ApiKeyResolver.java | 32 -------------------
.../testcase/sc/gateway/projectA/Application.java | 29 -----------------
.../sc/gateway/projectA/TestFilterConfig.java | 35 ---------------------
.../sc/gateway/projectA/ApiKeyResolver.java | 21 ++++++-------
.../testcase/sc/gateway/projectA}/Application.java | 2 +-
.../testcase/sc/gateway/projectA/Test1Filter.java | 20 ++++++------
.../testcase/sc/gateway/projectA/Test2Filter.java | 20 ++++++------
.../sc/gateway/projectA/TestFilterConfig.java} | 20 +++++++-----
.../testcase/sc/gateway/projectB/Application.java | 31 -------------------
.../projectB/controller/TestController.java | 36 ----------------------
.../testcase/sc/gateway}/projectB/Application.java | 4 ++-
.../projectB/controller/TestController.java | 22 +++++++------
.../sc/gateway/projectA/ApiKeyResolver.java | 32 -------------------
.../testcase/sc/gateway/projectA/Application.java | 29 -----------------
.../sc/gateway/projectA/TestFilterConfig.java | 35 ---------------------
.../sc/gateway/projectA/ApiKeyResolver.java | 21 ++++++-------
.../testcase/sc/gateway/projectA}/Application.java | 2 +-
.../testcase/sc/gateway/projectA/Test1Filter.java | 20 ++++++------
.../testcase/sc/gateway/projectA/Test2Filter.java | 20 ++++++------
.../sc/gateway/projectA/TestFilterConfig.java} | 20 +++++++-----
.../testcase/sc/gateway/projectB/Application.java | 31 -------------------
.../projectB/controller/TestController.java | 36 ----------------------
.../testcase/sc/gateway}/projectB/Application.java | 4 ++-
.../projectB/controller/TestController.java | 22 +++++++------
.../scenarios/gateway-2.1.x-scenario/pom.xml | 2 +-
.../scenarios/webflux-scenario/configuration.yml | 2 ++
48 files changed, 222 insertions(+), 464 deletions(-)
copy apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/{gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/define/AbstractGateway210EnhancePluginDefine.java => gateway-2.0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v20x/define/AbstractGateway200EnhancePluginDefine.java} (87%)
copy apm-sniffer/{apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/AbstractKafkaInstrumentation.java => optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v20x/define/DispatcherHandlerInstrumentation.java} (71%)
copy apm-sniffer/{apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/AbstractKafkaInstrumentation.java => optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v20x/define/ServerWebExchangeInstrumentation.java} (71%)
copy apm-sniffer/{apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/AbstractKafkaInstrumentation.java => optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/define/DispatcherHandlerInstrumentation.java} (71%)
copy apm-sniffer/{apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/AbstractKafkaInstrumentation.java => optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/define/ServerWebExchangeInstrumentation.java} (71%)
rename apm-sniffer/{apm-sdk-plugin/spring-plugins => optional-plugins/optional-spring-plugins}/spring-webflux-5.x-plugin/pom.xml (96%)
rename apm-sniffer/{apm-sdk-plugin/spring-plugins => optional-plugins/optional-spring-plugins}/spring-webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/DispatcherHandlerHandleMethodInterceptor.java (100%)
rename apm-sniffer/{apm-sdk-plugin/spring-plugins => optional-plugins/optional-spring-plugins}/spring-webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/ServerWebExchangeConstructorInterceptor.java (100%)
rename apm-sniffer/{apm-sdk-plugin/spring-plugins => optional-plugins/optional-spring-plugins}/spring-webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/define/DispatcherHandlerInstrumentation.java (100%)
rename apm-sniffer/{apm-sdk-plugin/spring-plugins => optional-plugins/optional-spring-plugins}/spring-webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/define/ServerWebExchangeInstrumentation.java (100%)
rename apm-sniffer/{apm-sdk-plugin/spring-plugins => optional-plugins/optional-spring-plugins}/spring-webflux-5.x-plugin/src/main/resources/skywalking-plugin.def (100%)
delete mode 100644 test/plugin/scenarios/gateway-2.0.x-scenario/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/ApiKeyResolver.java
delete mode 100644 test/plugin/scenarios/gateway-2.0.x-scenario/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/Application.java
delete mode 100644 test/plugin/scenarios/gateway-2.0.x-scenario/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/TestFilterConfig.java
copy apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/ReactiveResponseHolder.java => test/plugin/scenarios/gateway-2.0.x-scenario/gateway-projectA-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/gateway/projectA/ApiKeyResolver.java (63%)
copy test/plugin/scenarios/{webflux-scenario/webflux-projectB-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/webflux/projectB => gateway-2.0.x-scenario/gateway-projectA-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/gateway/projectA}/Application.java (94%)
rename test/plugin/scenarios/gateway-2.0.x-scenario/gateway-projectA-scenario/src/main/java/{org => test}/apache/skywalking/apm/testcase/sc/gateway/projectA/Test1Filter.java (55%)
rename test/plugin/scenarios/{gateway-2.1.x-scenario/gateway-projectA-scenario/src/main/java/org => gateway-2.0.x-scenario/gateway-projectA-scenario/src/main/java/test}/apache/skywalking/apm/testcase/sc/gateway/projectA/Test2Filter.java (55%)
copy test/plugin/scenarios/{webflux-scenario/webflux-projectB-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/webflux/projectB/Application.java => gateway-2.0.x-scenario/gateway-projectA-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/gateway/projectA/TestFilterConfig.java} (67%)
delete mode 100644 test/plugin/scenarios/gateway-2.0.x-scenario/gateway-projectB-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectB/Application.java
delete mode 100644 test/plugin/scenarios/gateway-2.0.x-scenario/gateway-projectB-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectB/controller/TestController.java
copy test/plugin/scenarios/{webflux-scenario/webflux-projectB-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/webflux => gateway-2.0.x-scenario/gateway-projectB-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/gateway}/projectB/Application.java (83%)
copy apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/ReactiveResponseHolder.java => test/plugin/scenarios/gateway-2.0.x-scenario/gateway-projectB-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/gateway/projectB/controller/TestController.java (63%)
delete mode 100644 test/plugin/scenarios/gateway-2.1.x-scenario/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/ApiKeyResolver.java
delete mode 100644 test/plugin/scenarios/gateway-2.1.x-scenario/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/Application.java
delete mode 100644 test/plugin/scenarios/gateway-2.1.x-scenario/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/TestFilterConfig.java
copy apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/ReactiveResponseHolder.java => test/plugin/scenarios/gateway-2.1.x-scenario/gateway-projectA-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/gateway/projectA/ApiKeyResolver.java (63%)
copy test/plugin/scenarios/{webflux-scenario/webflux-projectB-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/webflux/projectB => gateway-2.1.x-scenario/gateway-projectA-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/gateway/projectA}/Application.java (94%)
rename test/plugin/scenarios/gateway-2.1.x-scenario/gateway-projectA-scenario/src/main/java/{org => test}/apache/skywalking/apm/testcase/sc/gateway/projectA/Test1Filter.java (55%)
rename test/plugin/scenarios/{gateway-2.0.x-scenario/gateway-projectA-scenario/src/main/java/org => gateway-2.1.x-scenario/gateway-projectA-scenario/src/main/java/test}/apache/skywalking/apm/testcase/sc/gateway/projectA/Test2Filter.java (55%)
copy test/plugin/scenarios/{webflux-scenario/webflux-projectB-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/webflux/projectB/Application.java => gateway-2.1.x-scenario/gateway-projectA-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/gateway/projectA/TestFilterConfig.java} (67%)
delete mode 100644 test/plugin/scenarios/gateway-2.1.x-scenario/gateway-projectB-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectB/Application.java
delete mode 100644 test/plugin/scenarios/gateway-2.1.x-scenario/gateway-projectB-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectB/controller/TestController.java
copy test/plugin/scenarios/{webflux-scenario/webflux-projectB-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/webflux => gateway-2.1.x-scenario/gateway-projectB-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/gateway}/projectB/Application.java (83%)
copy apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/ReactiveResponseHolder.java => test/plugin/scenarios/gateway-2.1.x-scenario/gateway-projectB-scenario/src/main/java/test/apache/skywalking/apm/testcase/sc/gateway/projectB/controller/TestController.java (63%)