This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch oap-ssl
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 1e04dfc Merge branch 'master' into oap-ssl
add d5efc97 RestTemplate async plugin ClassCastException (#4507)
add e44a7e9 Merge branch 'master' into oap-ssl
No new revisions were added by this update.
Summary of changes:
.github/workflows/plugins-test.yaml | 4 +-
.../resttemplate/async/FutureGetInterceptor.java | 5 +-
.../config/expectedData.yaml | 102 +++++++++------------
.../configuration.yml | 9 +-
.../pom.xml | 37 ++++----
.../testcase/resttemplate}/BackController.java | 15 ++-
.../testcase/resttemplate/FrontController.java | 74 +++++++++++++++
.../resttemplate/ResttemplateConfiguration.java} | 73 ++++++++-------
.../src/main/resource}/log4j2.xml | 0
.../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 2 +-
.../src/main/webapp/WEB-INF/web.xml | 4 +-
.../support-version.list | 62 +++++++------
12 files changed, 228 insertions(+), 159 deletions(-)
copy test/plugin/scenarios/{spring-async-scenario => resttemplate-4.x-scenario}/config/expectedData.yaml (53%)
copy test/plugin/scenarios/{httpasyncclient-scenario => resttemplate-4.x-scenario}/configuration.yml (77%)
copy test/plugin/scenarios/{httpclient-4.3.x-scenario => resttemplate-4.x-scenario}/pom.xml (75%)
copy test/plugin/scenarios/{httpasyncclient-scenario/src/main/java/org/apache/skywalking/testcase/httpasyncclient => resttemplate-4.x-scenario/src/main/java/org/apache/skywalking/testcase/resttemplate}/BackController.java (72%)
create mode 100644 test/plugin/scenarios/resttemplate-4.x-scenario/src/main/java/org/apache/skywalking/testcase/resttemplate/FrontController.java
copy test/plugin/scenarios/{spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/config/TransactionConfig.java => resttemplate-4.x-scenario/src/main/java/org/apache/skywalking/testcase/resttemplate/ResttemplateConfiguration.java} (65%)
copy test/plugin/scenarios/{solrj-7.x-scenario/src/main/resources => resttemplate-4.x-scenario/src/main/resource}/log4j2.xml (100%)
copy test/plugin/scenarios/{spring-4.3.x-scenario => resttemplate-4.x-scenario}/src/main/webapp/WEB-INF/spring-mvc-servlet.xml (94%)
copy test/plugin/scenarios/{spring-4.1.x-scenario => resttemplate-4.x-scenario}/src/main/webapp/WEB-INF/web.xml (95%)
copy test/plugin/scenarios/{spring-4.3.x-scenario => resttemplate-4.x-scenario}/support-version.list (69%)