You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by zh...@apache.org on 2018/01/05 09:41:42 UTC
[incubator-skywalking] branch collector/instrument updated (6504c00
-> 45410f5)
This is an automated email from the ASF dual-hosted git repository.
zhangxin pushed a change to branch collector/instrument
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from 6504c00 Make the agent.jar output to the /agent folder in collector package.
add 4e64362 [Agent] fix the spring plugin doesn't work
add 48717e4 Merge pull request #728 from ascrutae/fix/spring-plugin-issue
add bfcb372 [Agent] fix jetty client doesn't work in after version 9.1
add e7b72eb catch up the TODO list.
add fd08a73 Fix compile
add ef284dc Make the applicationCodeRegister only for single code.
add d934ec5 Fix test cases
add f86426b Merge branch 'master' into adjust-network-proto
add c11f37a Remove an unused import.
add dfeeeab Merge branch 'master' into adjust-network-proto
add 1bf8961 Merge branch 'master' into adjust-network-proto
add 381d742 Merge pull request #727 from apache/adjust-network-proto
add 9843647 Merge branch 'master' into fix/jetty-client-9.0-issue
add af2c1b9 Merge pull request #729 from ascrutae/fix/jetty-client-9.0-issue
new 45410f5 Merge branch 'master' into collector/instrument
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:
.../handler/ApplicationRegisterServiceHandler.java | 23 +++++++---------
.../handler/InstanceDiscoveryServiceHandler.java | 2 +-
.../ApplicationRegisterServiceHandlerTestCase.java | 10 +++----
.../main/proto/ApplicationRegisterService.proto | 11 ++++----
.../src/main/proto/DiscoveryService.proto | 3 +--
.../core/remote/AppAndServiceRegisterClient.java | 15 +++++------
.../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 +
.../mvc/commons/EnhanceRequireObjectCache.java | 12 +++++++--
...tationMethodHandlerAdapterInstrumentation.java} | 25 +++++------------
.../InvokeHandlerMethodInterceptor.java} | 12 +++++----
.../src/main/resources/skywalking-plugin.def | 1 +
pom.xml | 5 ----
21 files changed, 101 insertions(+), 104 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%)
copy apm-sniffer/apm-sdk-plugin/{struts2-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/struts2/define/Struts2Instrumentation.java => spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/define/AnnotationMethodHandlerAdapterInstrumentation.java} (73%)
copy apm-sniffer/apm-sdk-plugin/{tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/TomcatExceptionInterceptor.java => spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/InvokeHandlerMethodInterceptor.java} (76%)
create mode 100644 apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/resources/skywalking-plugin.def
--
To stop receiving notification emails like this one, please contact
['"commits@skywalking.apache.org" <co...@skywalking.apache.org>'].
[incubator-skywalking] 01/01: Merge branch 'master' into
collector/instrument
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangxin pushed a commit to branch collector/instrument
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 45410f5053d3a424099cb34bc9897626713562a9
Merge: 6504c00 af2c1b9
Author: Xin,Zhang <zh...@apache.org>
AuthorDate: Fri Jan 5 17:41:39 2018 +0800
Merge branch 'master' into collector/instrument
.../handler/ApplicationRegisterServiceHandler.java | 23 +++++------
.../handler/InstanceDiscoveryServiceHandler.java | 2 +-
.../ApplicationRegisterServiceHandlerTestCase.java | 10 ++---
.../main/proto/ApplicationRegisterService.proto | 11 +++--
.../src/main/proto/DiscoveryService.proto | 3 +-
.../core/remote/AppAndServiceRegisterClient.java | 15 ++++---
.../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 +
.../mvc/commons/EnhanceRequireObjectCache.java | 12 +++++-
...tationMethodHandlerAdapterInstrumentation.java} | 28 +++----------
.../InvokeHandlerMethodInterceptor.java | 47 ++++++++++++++++++++++
.../src/main/resources/skywalking-plugin.def | 1 +
pom.xml | 5 ---
21 files changed, 141 insertions(+), 102 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@skywalking.apache.org" <co...@skywalking.apache.org>.