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 <[email protected]> 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 "[email protected]" <[email protected]>.
