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 2021/09/24 04:56:08 UTC
[skywalking-java] branch main updated (43f2069 -> 8b0f0e1)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git.
from 43f2069 Upgrade byte-buddy to 1.11.18 (#30)
add 8b0f0e1 Support for Apache HttpClient 5 plugin (#31)
No new revisions were added by this update.
Summary of changes:
.github/workflows/plugins-test.1.yaml | 1 +
CHANGES.md | 1 +
.../pom.xml | 22 ++---
.../apm/plugin/httpclient/v5}/Constants.java | 5 +-
.../v5/HttpAsyncClientDoExecuteInterceptor.java} | 42 ++++----
.../v5/HttpClientDoExecuteInterceptor.java} | 80 ++++++---------
.../v5/IOSessionImplPollInterceptor.java} | 92 +++++++++--------
.../v5/define/HttpAsyncClientInstrumentation.java} | 29 +++---
.../v5/define/HttpClientInstrumentation.java} | 21 ++--
.../v5/define/IOSessionImplInstrumentation.java} | 14 +--
.../v5/wrapper/AsyncResponseConsumerWrapper.java | 99 +++++++++++++++++++
.../v5}/wrapper/FutureCallbackWrapper.java | 15 +--
.../src/main/resources/skywalking-plugin.def | 4 +-
.../v5}/HttpClientExecuteInterceptorTest.java | 110 +++++++--------------
apm-sniffer/apm-sdk-plugin/pom.xml | 1 +
.../setup/service-agent/java-agent/Plugin-list.md | 1 +
.../service-agent/java-agent/Supported-list.md | 2 +-
.../httpclient-5.x-scenario}/bin/startup.sh | 4 +-
.../config/expectedData.yaml | 87 +++++++++-------
.../configuration.yml | 4 +-
.../pom.xml | 17 ++--
.../src/main/assembly/assembly.xml | 2 +-
.../testcase/httpclient5}/BackController.java | 4 +-
.../testcase/httpclient5/FrontController.java | 84 ++++++++++++++++
.../testcase/httpclient5/HttpClientConfig.java} | 84 +++++++++-------
.../httpclient5/Httpclient5Application.java} | 6 +-
.../src/main/resource}/application.yml | 0
.../src/main/resource}/log4j2.xml | 0
.../support-version.list | 3 +-
29 files changed, 486 insertions(+), 348 deletions(-)
copy apm-sniffer/apm-sdk-plugin/{httpClient-4.x-plugin => httpclient-5.x-plugin}/pom.xml (71%)
copy apm-sniffer/apm-sdk-plugin/{hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1 => httpclient-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpclient/v5}/Constants.java (84%)
copy apm-sniffer/apm-sdk-plugin/{neo4j-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/neo4j/v4x/SessionBeginTransactionInterceptor.java => httpclient-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpclient/v5/HttpAsyncClientDoExecuteInterceptor.java} (61%)
copy apm-sniffer/apm-sdk-plugin/{httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptor.java => httpclient-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpclient/v5/HttpClientDoExecuteInterceptor.java} (62%)
copy apm-sniffer/apm-sdk-plugin/{servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/TransportClientHandlerInterceptor.java => httpclient-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpclient/v5/IOSessionImplPollInterceptor.java} (53%)
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 => httpclient-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpclient/v5/define/HttpAsyncClientInstrumentation.java} (63%)
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 => httpclient-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpclient/v5/define/HttpClientInstrumentation.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 => httpclient-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpclient/v5/define/IOSessionImplInstrumentation.java} (83%)
create mode 100644 apm-sniffer/apm-sdk-plugin/httpclient-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpclient/v5/wrapper/AsyncResponseConsumerWrapper.java
copy apm-sniffer/apm-sdk-plugin/{httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4 => httpclient-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpclient/v5}/wrapper/FutureCallbackWrapper.java (75%)
copy apm-sniffer/apm-sdk-plugin/{httpclient-3.x-plugin => httpclient-5.x-plugin}/src/main/resources/skywalking-plugin.def (75%)
copy apm-sniffer/apm-sdk-plugin/{httpClient-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/httpClient/v4 => httpclient-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/httpclient/v5}/HttpClientExecuteInterceptorTest.java (64%)
copy test/plugin/{archetypes/jvm/src/main/resources/archetype-resources => scenarios/httpclient-5.x-scenario}/bin/startup.sh (92%)
copy test/plugin/scenarios/{spring-cloud-feign-1.2.x-scenario => httpclient-5.x-scenario}/config/expectedData.yaml (51%)
copy test/plugin/scenarios/{httpasyncclient-scenario => httpclient-5.x-scenario}/configuration.yml (85%)
copy test/plugin/scenarios/{httpasyncclient-scenario => httpclient-5.x-scenario}/pom.xml (90%)
copy test/plugin/scenarios/{elasticjob-2.x-scenario => httpclient-5.x-scenario}/src/main/assembly/assembly.xml (96%)
copy test/plugin/scenarios/{httpasyncclient-scenario/src/main/java/org/apache/skywalking/testcase/httpasyncclient => httpclient-5.x-scenario/src/main/java/org/apache/skywalking/testcase/httpclient5}/BackController.java (92%)
create mode 100644 test/plugin/scenarios/httpclient-5.x-scenario/src/main/java/org/apache/skywalking/testcase/httpclient5/FrontController.java
copy test/plugin/scenarios/{resttemplate-4.x-scenario/src/main/java/org/apache/skywalking/testcase/resttemplate/ResttemplateConfiguration.java => httpclient-5.x-scenario/src/main/java/org/apache/skywalking/testcase/httpclient5/HttpClientConfig.java} (53%)
copy test/plugin/scenarios/{httpasyncclient-scenario/src/main/java/org/apache/skywalking/testcase/httpasyncclient/HttpasyncclientApplication.java => httpclient-5.x-scenario/src/main/java/org/apache/skywalking/testcase/httpclient5/Httpclient5Application.java} (85%)
copy test/plugin/scenarios/{postgresql-scenario/src/main/resources => httpclient-5.x-scenario/src/main/resource}/application.yml (100%)
copy test/plugin/scenarios/{solrj-7.x-scenario/src/main/resources => httpclient-5.x-scenario/src/main/resource}/log4j2.xml (100%)
copy test/plugin/scenarios/{apm-toolkit-trace-scenario => httpclient-5.x-scenario}/support-version.list (98%)