This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch ui-template
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 80e3de8 fix e2e test
add 705f97f Increased Vert.x support (#4840)
add 962cac2 Merge branch 'master' into ui-template
No new revisions were added by this update.
Summary of changes:
.github/workflows/plugins-test.3.yaml | 4 +-
.../vertx-plugins/vertx-core-3.x-plugin/pom.xml | 14 ++-
.../ClusteredEventBusSendRemoteInterceptor.java | 2 +-
.../EventBusImplDeliverToHandlerInterceptor.java | 2 +-
.../vertx3/HandlerRegistrationInterceptor.java | 2 +-
...lientRequestImplHandleExceptionInterceptor.java | 1 -
...ClientRequestImplHandleResponseInterceptor.java | 23 ++--
....java => HttpClientRequestImplInterceptor.java} | 54 ++++++----
...pContextHandleDispatchResponseInterceptor.java} | 36 ++++---
...java => HttpContextSendRequestInterceptor.java} | 9 +-
...tpServerRequestImplConstructorInterceptor.java} | 6 +-
...erverRequestWrapperConstructorInterceptor.java} | 5 +-
...rverResponseImplHandleExceptionInterceptor.java | 1 -
...java => HttpServerResponseImplInterceptor.java} | 13 ++-
.../apm/plugin/vertx3/RouteStateInterceptor.java} | 75 +++++++------
...ptor.java => RouterImplHandlerInterceptor.java} | 9 +-
...tingContextImplBaseConstructorInterceptor.java} | 8 +-
...utingContextWrapperConstructorInterceptor.java} | 7 +-
... ServerConnectionHandleMessageInterceptor.java} | 40 +++----
...ntRequestImplHandleResponseInstrumentation.java | 4 +-
...a => HttpClientRequestImplInstrumentation.java} | 13 +--
...textHandleDispatchResponseInstrumentation.java} | 33 +++---
.../HttpContextSendRequestInstrumentation.java} | 31 +++---
...rverRequestImplConstructorInstrumentation.java} | 53 +++++-----
...rRequestWrapperConstructorInstrumentation.java} | 53 +++++-----
...ResponseImplHandleExceptionInstrumentation.java | 2 +-
... => HttpServerResponseImplInstrumentation.java} | 23 +++-
...ntation.java => RouteStateInstrumentation.java} | 33 ++++--
...ContextImplBaseConstructorInstrumentation.java} | 53 +++++-----
....java => RouterImplHandlerInstrumentation.java} | 14 +--
.../vertx3/define/RouterImplInstrumentation.java} | 49 +++++----
...gContextWrapperConstructorInstrumentation.java} | 55 +++++-----
...verConnectionHandleMessageInstrumentation.java} | 24 +++--
.../src/main/resources/skywalking-plugin.def | 17 ++-
.../config/expectedData.yaml | 20 +++-
.../support-version.list | 1 +
.../config/expectedData.yaml | 117 ++++++++++++++++++---
.../vertxweb/controller/VertxWebController.java | 16 ++-
.../config/expectedData.yaml | 117 ++++++++++++++++++---
.../scenarios/vertx-web-3.6plus-scenario/pom.xml | 2 +-
.../vertxweb/controller/VertxWebController.java | 20 +++-
.../support-version.list | 1 +
42 files changed, 704 insertions(+), 358 deletions(-)
rename
apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/{HttpClientRequestImplEndInterceptor.java
=> HttpClientRequestImplInterceptor.java} (66%)
copy
apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/{HttpClientRequestImplHandleResponseInterceptor.java
=> HttpContextHandleDispatchResponseInterceptor.java} (61%)
copy
apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/{HttpServerResponseImplHandleExceptionInterceptor.java
=> HttpContextSendRequestInterceptor.java} (82%)
copy
apm-sniffer/apm-sdk-plugin/{spring-plugins/spring-webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/ServerWebExchangeConstructorInterceptor.java
=>
vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/HttpServerRequestImplConstructorInterceptor.java}
(83%)
copy
apm-sniffer/apm-sdk-plugin/{h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/PooledJdbcConnectionConstructorInterceptor.java
=>
vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/HttpServerRequestWrapperConstructorInterceptor.java}
(88%)
rename
apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/{HttpServerResponseImplEndInterceptor.java
=> HttpServerResponseImplInterceptor.java} (76%)
copy
apm-sniffer/apm-sdk-plugin/{elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/TransportActionNodeProxyInterceptor.java
=>
vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/RouteStateInterceptor.java}
(50%)
copy
apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/{HttpClientRequestImplHandleExceptionInterceptor.java
=> RouterImplHandlerInterceptor.java} (86%)
copy
apm-sniffer/apm-sdk-plugin/{spring-plugins/spring-webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/ServerWebExchangeConstructorInterceptor.java
=>
vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/RoutingContextImplBaseConstructorInterceptor.java}
(80%)
copy
apm-sniffer/apm-sdk-plugin/{h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/PooledJdbcConnectionConstructorInterceptor.java
=>
vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/RoutingContextWrapperConstructorInterceptor.java}
(85%)
rename
apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/{RouterImplAcceptInterceptor.java
=> ServerConnectionHandleMessageInterceptor.java} (68%)
rename
apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/{HttpClientRequestImplEndInstrumentation.java
=> HttpClientRequestImplInstrumentation.java} (89%)
copy
apm-sniffer/apm-sdk-plugin/{spring-plugins/spring-cloud/spring-cloud-feign-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/string/cloud/netflix/feign/v2/define/LoadBalancerFeignClientInstrumentation.java
=>
vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/HttpContextHandleDispatchResponseInstrumentation.java}
(71%)
copy
apm-sniffer/apm-sdk-plugin/{spring-plugins/spring-cloud/spring-cloud-feign-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/string/cloud/netflix/feign/v2/define/LoadBalancerFeignClientInstrumentation.java
=>
vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/HttpContextSendRequestInstrumentation.java}
(73%)
copy
apm-sniffer/apm-sdk-plugin/{spring-plugins/spring-cloud/spring-cloud-feign-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/string/cloud/netflix/feign/v2/define/LoadBalancerFeignClientInstrumentation.java
=>
vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/HttpServerRequestImplConstructorInstrumentation.java}
(64%)
copy
apm-sniffer/apm-sdk-plugin/{spring-plugins/spring-cloud/spring-cloud-feign-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/string/cloud/netflix/feign/v2/define/LoadBalancerFeignClientInstrumentation.java
=>
vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/HttpServerRequestWrapperConstructorInstrumentation.java}
(64%)
rename
apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/{HttpServerResponseImplEndInstrumentation.java
=> HttpServerResponseImplInstrumentation.java} (78%)
copy
apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/{RouterImplAcceptInstrumentation.java
=> RouteStateInstrumentation.java} (71%)
copy
apm-sniffer/apm-sdk-plugin/{spring-plugins/spring-cloud/spring-cloud-feign-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/string/cloud/netflix/feign/v2/define/LoadBalancerFeignClientInstrumentation.java
=>
vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/RouterContextImplBaseConstructorInstrumentation.java}
(64%)
rename
apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/{RouterImplHandleInstrumentation.java
=> RouterImplHandlerInstrumentation.java} (86%)
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/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/RouterImplInstrumentation.java}
(68%)
copy
apm-sniffer/apm-sdk-plugin/{spring-plugins/spring-cloud/spring-cloud-feign-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/string/cloud/netflix/feign/v2/define/LoadBalancerFeignClientInstrumentation.java
=>
vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/RoutingContextWrapperConstructorInstrumentation.java}
(64%)
rename
apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/{RouterImplAcceptInstrumentation.java
=> ServerConnectionHandleMessageInstrumentation.java} (69%)
