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 2019/12/24 15:23:18 UTC

[skywalking] branch jdk8 updated (d381844 -> ec3890c)

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a change to branch jdk8
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


    from d381844  Fix more exclusion.
     add bf6491f  [Feature] Provide Java Agent for Apache HttpClient 3.x (#4111)
     add ec3890c  Merge branch 'master' into jdk8

No new revisions were added by this update.

Summary of changes:
 .github/workflows/plugins-test.yaml                |  2 +
 .../pom.xml                                        | 22 +++---
 .../v3/HttpClientExecuteInterceptor.java}          | 79 ++++++++++++----------
 .../v3/define/HttpClientInstrumentation.java}      | 35 +++++-----
 .../src/main/resources/skywalking-plugin.def       |  2 +-
 apm-sniffer/apm-sdk-plugin/pom.xml                 |  1 +
 .../service-agent/java-agent/Supported-list.md     |  2 +-
 .../config/expectedData.yaml                       | 27 ++++----
 .../configuration.yml                              |  4 +-
 .../pom.xml                                        | 15 ++--
 .../apm/testcase/httpclient/CaseServlet.java}      | 34 +++++++---
 .../testcase/httpclient/HealthCheckServlet.java    | 18 ++---
 .../httpclient/ServletForContextPropagate.java     | 18 ++---
 .../src/main/webapp/WEB-INF/web.xml                |  0
 .../support-version.list                           |  6 +-
 15 files changed, 151 insertions(+), 114 deletions(-)
 copy apm-sniffer/apm-sdk-plugin/{mongodb-3.x-plugin => httpclient-3.x-plugin}/pom.xml (65%)
 copy apm-sniffer/apm-sdk-plugin/{armeria-0.84.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/Armeria084ClientInterceptor.java => httpclient-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpclient/v3/HttpClientExecuteInterceptor.java} (57%)
 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/RingBufferLogEventInstrumentation.java => apm-sdk-plugin/httpclient-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpclient/v3/define/HttpClientInstrumentation.java} (72%)
 copy apm-sniffer/apm-sdk-plugin/{dubbo-2.7.x-conflict-patch => httpclient-3.x-plugin}/src/main/resources/skywalking-plugin.def (89%)
 copy test/plugin/scenarios/{httpclient-4.3.x-scenario => httpclient-3.x-scenario}/config/expectedData.yaml (76%)
 copy test/plugin/scenarios/{httpclient-4.3.x-scenario => httpclient-3.x-scenario}/configuration.yml (84%)
 copy test/plugin/scenarios/{ehcache-2.x-scenario => httpclient-3.x-scenario}/pom.xml (86%)
 copy test/plugin/scenarios/{httpclient-4.3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/ServletForContextPropagate.java => httpclient-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/CaseServlet.java} (59%)
 copy test/plugin/scenarios/{httpclient-4.3.x-scenario => httpclient-3.x-scenario}/src/main/java/org/apache/skywalking/apm/testcase/httpclient/HealthCheckServlet.java (84%)
 copy test/plugin/scenarios/{httpclient-4.3.x-scenario => httpclient-3.x-scenario}/src/main/java/org/apache/skywalking/apm/testcase/httpclient/ServletForContextPropagate.java (84%)
 copy test/plugin/scenarios/{httpclient-4.3.x-scenario => httpclient-3.x-scenario}/src/main/webapp/WEB-INF/web.xml (100%)
 copy test/plugin/scenarios/{customize-scenario => httpclient-3.x-scenario}/support-version.list (97%)