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 2018/11/20 07:22:52 UTC

[incubator-skywalking] branch v6-protocol updated (9385fd8 -> 3e27585)

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

wusheng pushed a change to branch v6-protocol
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.


    from 9385fd8  Merge branch 'master' into v6-protocol
     add 3e27585  Fix bugs.

No new revisions were added by this update.

Summary of changes:
 apm-protocol/apm-network/src/main/proto            |  2 +-
 .../apm/agent/core/context/TracingContext.java     | 12 ++--
 .../agent/core/context/trace/TraceSegmentRef.java  | 70 +++++++++++-----------
 .../apm/agent/core/context/ContextManagerTest.java |  4 +-
 .../apm/plugin/dubbo/DubboInterceptorTest.java     |  2 +-
 .../jetty/v9/server/HandleInterceptorTest.java     |  2 +-
 .../plugin/kafka/v11/CallbackInterceptorTest.java  |  2 +-
 .../kafka/v11/KafkaConsumerInterceptorTest.java    |  2 +-
 .../plugin/motan/MotanProviderInterceptorTest.java |  2 +-
 .../sofarpc/SofaRpcProviderInterceptorTest.java    |  2 +-
 .../v4/RequestMappingMethodInterceptorTest.java    |  2 +-
 .../mvc/v4/RestMappingMethodInterceptorTest.java   |  2 +-
 .../apm/plugin/struts2/Struts2InterceptorTest.java |  2 +-
 .../tomcat78x/TomcatInvokeInterceptorTest.java     |  2 +-
 .../v2x/ExecuteRootHandlerInterceptorTest.java     |  2 +-
 .../apm/agent/test/helper/SegmentRefHelper.java    |  4 +-
 .../apm/agent/test/tools/SegmentRefAssert.java     |  2 +-
 .../register/provider/RegisterModuleProvider.java  |  2 +
 .../handler/v6/grpc/RegisterServiceHandler.java    | 43 +++++++++++++
 .../grpc/ServiceInstancePingServiceHandler.java}   | 67 ++++++++-------------
 .../parser/decorator/ReferenceDecorator.java       |  2 +-
 .../parser/decorator/SegmentDecorator.java         |  2 +-
 .../listener/endpoint/MultiScopesSpanListener.java | 27 ++++++---
 23 files changed, 151 insertions(+), 108 deletions(-)
 copy oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/{v5/rest/InstanceHeartBeatServletHandler.java => v6/grpc/ServiceInstancePingServiceHandler.java} (53%)