You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by da...@apache.org on 2020/06/11 16:39:40 UTC
[skywalking] branch bug-fix updated (673cfca -> a64fc9b)
This is an automated email from the ASF dual-hosted git repository.
daming pushed a change to branch bug-fix
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 673cfca Fix 2 high priority bugs
add 7b99019 Refactory spring gateway plugin (#4878)
add a64fc9b Merge branch 'master' into bug-fix
No new revisions were added by this update.
Summary of changes:
.github/workflows/plugins-test.0.yaml | 3 +-
CHANGES.md | 2 +
.../DispatcherHandlerHandleMethodInterceptor.java | 22 ++--
.../pom.xml | 10 +-
.../gateway/v20x/HttpClientRequestInterceptor.java | 116 +++++++++++++++++++++
.../v20x/HttpclientRequestHeadersInterceptor.java | 62 +++++++++++
.../v20x/NettyRoutingFilterInterceptor.java | 71 +++++++++++++
.../cloud/gateway/v20x/define/Constants.java | 32 ++++++
.../gateway/v20x/define/EnhanceCacheObject.java | 38 +++++++
.../v20x/define/HttpClientInstrumentation.java} | 48 ++++-----
.../define/HttpClientRequestInstrumentation.java} | 46 ++++----
.../define/NettyRoutingFilterInstrumentation.java} | 44 ++++----
.../src/main/resources/skywalking-plugin.def | 7 +-
.../gateway-2.1.x-plugin/pom.xml | 10 +-
.../v21x/DefaultHttpHeadersInterceptor.java | 34 ------
.../v21x/FilteringWebHandlerInterceptor.java | 94 -----------------
.../HttpClientFinalizerConstructorInterceptor.java | 34 ++++++
...ientFinalizerResponseConnectionInterceptor.java | 69 ++++++++++++
.../v21x/HttpClientFinalizerSendInterceptor.java | 97 +++++++++++++++++
.../v21x/HttpClientFinalizerURIInterceptor.java | 46 ++++++++
.../HttpClientOperationsHeadersInterceptor.java | 53 ----------
.../v21x/HttpClientOperationsSendInterceptor.java | 84 ---------------
.../HttpClientOperationsStatusInterceptor.java | 59 -----------
.../v21x/NettyRoutingFilterInterceptor.java | 90 +++++++---------
.../v21x/TcpClientConstructorInterceptor.java | 29 ++++++
.../cloud/gateway/v21x/context/Constants.java | 23 ----
.../cloud/gateway/v21x/context/SWTransmitter.java | 58 -----------
.../AbstractGateway210EnhancePluginDefine.java | 30 ++++++
.../cloud/gateway/v21x/define/Constants.java | 36 +++++++
.../define/DefaultHttpHeadersInstrumentation.java | 59 -----------
.../gateway/v21x/define/EnhanceObjectCache.java | 50 +++++++++
...ava => HttpClientFinalizerInstrumentation.java} | 72 +++++++------
.../define/NettyRoutingFilterInstrumentation.java | 53 ++++------
.../v21x/define/TcpClientInstrumentation.java | 57 ++++++++++
.../src/main/resources/skywalking-plugin.def | 5 +-
.../optional-spring-cloud/pom.xml | 1 +
docs/en/guides/Plugin-test.md | 2 +-
.../service-agent/java-agent/Supported-list.md | 2 +-
.../config/expectedData.yaml | 46 ++++----
.../configuration.yml | 2 +-
.../gateway-dist/bin/startup.sh | 0
.../gateway-dist/pom.xml | 2 +-
.../gateway-dist/src/main/assembly/assembly.xml | 0
.../gateway-projectA-scenario/pom.xml | 8 +-
.../sc/gateway/projectA/ApiKeyResolver.java | 0
.../testcase/sc/gateway/projectA/Application.java | 0
.../testcase/sc/gateway/projectA/Test1Filter.java | 0
.../testcase/sc/gateway/projectA/Test2Filter.java | 0
.../sc/gateway/projectA/TestFilterConfig.java | 0
.../src/main/resources/application.yml | 9 --
.../gateway-projectB-scenario/pom.xml | 2 +-
.../testcase/sc/gateway/projectB/Application.java | 0
.../projectB/controller/TestController.java | 0
.../src/main/resources/application.properties | 0
.../pom.xml | 8 +-
.../support-version.list | 4 +-
.../config/expectedData.yaml | 46 ++++----
.../configuration.yml | 2 +-
.../gateway-dist/bin/startup.sh | 0
.../gateway-dist/pom.xml | 2 +-
.../gateway-dist/src/main/assembly/assembly.xml | 0
.../gateway-projectA-scenario/pom.xml | 8 +-
.../sc/gateway/projectA/ApiKeyResolver.java | 0
.../testcase/sc/gateway/projectA/Application.java | 0
.../testcase/sc/gateway/projectA/Test1Filter.java | 0
.../testcase/sc/gateway/projectA/Test2Filter.java | 0
.../sc/gateway/projectA/TestFilterConfig.java | 0
.../src/main/resources/application.yml | 12 ++-
.../gateway-projectB-scenario/pom.xml | 2 +-
.../testcase/sc/gateway/projectB/Application.java | 0
.../projectB/controller/TestController.java | 0
.../src/main/resources/application.properties | 0
.../pom.xml | 8 +-
.../support-version.list | 4 +
74 files changed, 1065 insertions(+), 748 deletions(-)
copy apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/{gateway-2.1.x-plugin => gateway-2.0.x-plugin}/pom.xml (84%)
create mode 100644 apm-sniffer/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/HttpClientRequestInterceptor.java
create mode 100644 apm-sniffer/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/HttpclientRequestHeadersInterceptor.java
create mode 100644 apm-sniffer/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/NettyRoutingFilterInterceptor.java
create mode 100644 apm-sniffer/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/Constants.java
create mode 100644 apm-sniffer/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/EnhanceCacheObject.java
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/FilteringWebHandlerInstrumentation.java => gateway-2.0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v20x/define/HttpClientInstrumentation.java} (51%)
rename 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/FilteringWebHandlerInstrumentation.java => gateway-2.0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v20x/define/HttpClientRequestInstrumentation.java} (54%)
copy apm-sniffer/{apm-sdk-plugin/spring-plugins/async-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/async/define/AsyncExecutionInterceptorInstrumentation.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/NettyRoutingFilterInstrumentation.java} (53%)
copy apm-sniffer/{apm-sdk-plugin/armeria-0.85.x-plugin => optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.0.x-plugin}/src/main/resources/skywalking-plugin.def (67%)
delete mode 100644 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/DefaultHttpHeadersInterceptor.java
delete mode 100644 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/FilteringWebHandlerInterceptor.java
create mode 100644 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/HttpClientFinalizerConstructorInterceptor.java
create mode 100644 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/HttpClientFinalizerResponseConnectionInterceptor.java
create mode 100644 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/HttpClientFinalizerSendInterceptor.java
create mode 100644 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/HttpClientFinalizerURIInterceptor.java
delete mode 100644 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/HttpClientOperationsHeadersInterceptor.java
delete mode 100644 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/HttpClientOperationsSendInterceptor.java
delete mode 100644 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/HttpClientOperationsStatusInterceptor.java
create mode 100644 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/TcpClientConstructorInterceptor.java
delete mode 100644 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/context/Constants.java
delete mode 100644 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/context/SWTransmitter.java
create mode 100644 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
create mode 100644 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/Constants.java
delete mode 100644 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/DefaultHttpHeadersInstrumentation.java
create mode 100644 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/EnhanceObjectCache.java
rename 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/{HttpClientOperationsInstrumentation.java => HttpClientFinalizerInstrumentation.java} (51%)
create mode 100644 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/TcpClientInstrumentation.java
copy test/plugin/scenarios/{gateway-scenario => gateway-2.0.x-scenario}/config/expectedData.yaml (77%)
copy test/plugin/scenarios/{gateway-scenario => gateway-2.0.x-scenario}/configuration.yml (94%)
copy test/plugin/scenarios/{gateway-scenario => gateway-2.0.x-scenario}/gateway-dist/bin/startup.sh (100%)
copy test/plugin/scenarios/{gateway-scenario => gateway-2.0.x-scenario}/gateway-dist/pom.xml (97%)
copy test/plugin/scenarios/{gateway-scenario => gateway-2.0.x-scenario}/gateway-dist/src/main/assembly/assembly.xml (100%)
copy test/plugin/scenarios/{gateway-scenario => gateway-2.0.x-scenario}/gateway-projectA-scenario/pom.xml (90%)
copy test/plugin/scenarios/{gateway-scenario => gateway-2.0.x-scenario}/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/ApiKeyResolver.java (100%)
copy test/plugin/scenarios/{gateway-scenario => gateway-2.0.x-scenario}/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/Application.java (100%)
copy test/plugin/scenarios/{gateway-scenario => gateway-2.0.x-scenario}/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/Test1Filter.java (100%)
copy test/plugin/scenarios/{gateway-scenario => gateway-2.0.x-scenario}/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/Test2Filter.java (100%)
copy test/plugin/scenarios/{gateway-scenario => gateway-2.0.x-scenario}/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/TestFilterConfig.java (100%)
rename test/plugin/scenarios/{gateway-scenario => gateway-2.0.x-scenario}/gateway-projectA-scenario/src/main/resources/application.yml (79%)
copy test/plugin/scenarios/{gateway-scenario => gateway-2.0.x-scenario}/gateway-projectB-scenario/pom.xml (96%)
copy test/plugin/scenarios/{gateway-scenario => gateway-2.0.x-scenario}/gateway-projectB-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectB/Application.java (100%)
copy test/plugin/scenarios/{gateway-scenario => gateway-2.0.x-scenario}/gateway-projectB-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectB/controller/TestController.java (100%)
copy test/plugin/scenarios/{gateway-scenario => gateway-2.0.x-scenario}/gateway-projectB-scenario/src/main/resources/application.properties (100%)
copy test/plugin/scenarios/{gateway-scenario => gateway-2.0.x-scenario}/pom.xml (90%)
copy test/plugin/scenarios/{customize-scenario => gateway-2.0.x-scenario}/support-version.list (95%)
rename test/plugin/scenarios/{gateway-scenario => gateway-2.1.x-scenario}/config/expectedData.yaml (77%)
rename test/plugin/scenarios/{gateway-scenario => gateway-2.1.x-scenario}/configuration.yml (94%)
rename test/plugin/scenarios/{gateway-scenario => gateway-2.1.x-scenario}/gateway-dist/bin/startup.sh (100%)
rename test/plugin/scenarios/{gateway-scenario => gateway-2.1.x-scenario}/gateway-dist/pom.xml (97%)
rename test/plugin/scenarios/{gateway-scenario => gateway-2.1.x-scenario}/gateway-dist/src/main/assembly/assembly.xml (100%)
rename test/plugin/scenarios/{gateway-scenario => gateway-2.1.x-scenario}/gateway-projectA-scenario/pom.xml (90%)
rename test/plugin/scenarios/{gateway-scenario => gateway-2.1.x-scenario}/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/ApiKeyResolver.java (100%)
rename test/plugin/scenarios/{gateway-scenario => gateway-2.1.x-scenario}/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/Application.java (100%)
rename test/plugin/scenarios/{gateway-scenario => gateway-2.1.x-scenario}/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/Test1Filter.java (100%)
rename test/plugin/scenarios/{gateway-scenario => gateway-2.1.x-scenario}/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/Test2Filter.java (100%)
rename test/plugin/scenarios/{gateway-scenario => gateway-2.1.x-scenario}/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/TestFilterConfig.java (100%)
copy test/plugin/scenarios/{webflux-scenario/webflux-projectA-scenario => gateway-2.1.x-scenario/gateway-projectA-scenario}/src/main/resources/application.yml (82%)
rename test/plugin/scenarios/{gateway-scenario => gateway-2.1.x-scenario}/gateway-projectB-scenario/pom.xml (96%)
rename test/plugin/scenarios/{gateway-scenario => gateway-2.1.x-scenario}/gateway-projectB-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectB/Application.java (100%)
rename test/plugin/scenarios/{gateway-scenario => gateway-2.1.x-scenario}/gateway-projectB-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectB/controller/TestController.java (100%)
rename test/plugin/scenarios/{gateway-scenario => gateway-2.1.x-scenario}/gateway-projectB-scenario/src/main/resources/application.properties (100%)
rename test/plugin/scenarios/{gateway-scenario => gateway-2.1.x-scenario}/pom.xml (90%)
rename test/plugin/scenarios/{gateway-scenario => gateway-2.1.x-scenario}/support-version.list (93%)