You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/01/05 08:34:05 UTC
[incubator-skywalking] branch master updated (381d742 -> af2c1b9)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from 381d742 Merge pull request #727 from apache/adjust-network-proto
add bfcb372 [Agent] fix jetty client doesn't work in after version 9.1
add 9843647 Merge branch 'master' into fix/jetty-client-9.0-issue
new af2c1b9 Merge pull request #729 from ascrutae/fix/jetty-client-9.0-issue
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../pom.xml | 4 +--
.../client/SyncHttpRequestSendInterceptor.java | 31 +++++++++++++---------
.../client/define/HttpRequestInstrumentation.java | 9 ++++---
.../src/main/resources/skywalking-plugin.def | 1 +
.../client/SyncHttpRequestSendInterceptorTest.java | 2 +-
.../jetty-plugin/jetty-client-9.x-plugin/pom.xml | 2 +-
.../v9/client/SyncHttpRequestSendInterceptor.java | 24 ++++++++---------
.../client/define/HttpRequestInstrumentation.java | 4 +++
.../client/SyncHttpRequestSendInterceptorTest.java | 8 +++---
apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml | 1 +
10 files changed, 48 insertions(+), 38 deletions(-)
copy apm-sniffer/apm-sdk-plugin/jetty-plugin/{jetty-client-9.x-plugin => jetty-client-9.0-plugin}/pom.xml (94%)
copy apm-sniffer/apm-sdk-plugin/jetty-plugin/{jetty-client-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9 => jetty-client-9.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v90}/client/SyncHttpRequestSendInterceptor.java (94%)
copy apm-sniffer/apm-sdk-plugin/jetty-plugin/{jetty-client-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9 => jetty-client-9.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v90}/client/define/HttpRequestInstrumentation.java (91%)
create mode 100644 apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/src/main/resources/skywalking-plugin.def
copy apm-sniffer/apm-sdk-plugin/jetty-plugin/{jetty-client-9.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jetty/v9 => jetty-client-9.0-plugin/src/test/java/org/apache/skywalking/apm/plugin/jetty/v90}/client/SyncHttpRequestSendInterceptorTest.java (98%)
--
To stop receiving notification emails like this one, please contact
['"commits@skywalking.apache.org" <co...@skywalking.apache.org>'].
[incubator-skywalking] 01/01: Merge pull request #729 from
ascrutae/fix/jetty-client-9.0-issue
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit af2c1b979fe025603dc65d7e2a2dbdea8005ede8
Merge: 381d742 9843647
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Fri Jan 5 16:34:02 2018 +0800
Merge pull request #729 from ascrutae/fix/jetty-client-9.0-issue
[Agent] fix jetty client doesn't work in after version 9.1
.../pom.xml | 4 +--
.../client/SyncHttpRequestSendInterceptor.java | 31 +++++++++++++---------
.../client/define/HttpRequestInstrumentation.java | 9 ++++---
.../src/main/resources/skywalking-plugin.def | 1 +
.../client/SyncHttpRequestSendInterceptorTest.java | 2 +-
.../jetty-plugin/jetty-client-9.x-plugin/pom.xml | 2 +-
.../v9/client/SyncHttpRequestSendInterceptor.java | 24 ++++++++---------
.../client/define/HttpRequestInstrumentation.java | 4 +++
.../client/SyncHttpRequestSendInterceptorTest.java | 8 +++---
apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml | 1 +
10 files changed, 48 insertions(+), 38 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@skywalking.apache.org" <co...@skywalking.apache.org>.