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/07/30 07:08:56 UTC
[incubator-skywalking] 02/03: Merge branch '6.0' of
https://github.com/apache/incubator-skywalking into 6.0
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch 6.0
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit ccfef16cda0241adb42d6fb026dfb64525683b5b
Merge: cb69e96 efe5299
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Mon Jul 30 15:08:24 2018 +0800
Merge branch '6.0' of https://github.com/apache/incubator-skywalking into 6.0
.../plugin/standalone/StandaloneManagerTest.java | 7 +-
.../ClusterModuleZookeeperProviderTestCase.java | 17 +--
oap-server/server-core/pom.xml | 50 +++++++
.../skywalking/oap/server/core/CoreModule.java | 12 ++
.../oap/server/core/CoreModuleProvider.java | 51 ++++---
.../server/core/analysis/DispatcherManager.java | 5 +-
.../oap/server/core/analysis/data/StreamData.java | 4 +-
.../core/analysis/endpoint/EndpointDispatcher.java | 19 ++-
...java => EndpointLatencyAvgAggregateWorker.java} | 16 ++-
.../endpoint/EndpointLatencyAvgIndicator.java | 27 +++-
...ava => EndpointLatencyAvgPersistentWorker.java} | 12 +-
...or.java => EndpointLatencyAvgRemoteWorker.java} | 17 ++-
.../core/analysis/indicator/AvgIndicator.java | 16 +--
.../server/core/analysis/indicator/Indicator.java | 8 +-
.../indicator/annotation/IndicatorType.java | 2 +
.../IndicatorDefineLoadException.java} | 12 +-
.../analysis/indicator/define/IndicatorMapper.java | 82 +++++++++++
.../AbstractAggregatorWorker.java} | 19 +--
.../AbstractPersistentWorker.java} | 16 +--
.../core/analysis/worker/AbstractRemoteWorker.java | 63 ++++++++
.../IndicatorType.java => worker/Worker.java} | 10 +-
.../define/WorkerDefineLoadException.java} | 12 +-
.../core/analysis/worker/define/WorkerMapper.java | 102 +++++++++++++
.../oap/server/core/cluster/RemoteInstance.java | 41 ++----
.../server/core/receiver/SourceReceiverImpl.java | 5 +-
.../remote/{Selector.java => Deserializable.java} | 6 +-
.../server/core/remote/RemoteSenderService.java | 60 ++++++++
.../server/core/remote/RemoteServiceHandler.java | 71 +++++++++
.../RemoteData.java => remote/Serializable.java} | 8 +-
.../core/remote/client/GRPCRemoteClient.java | 158 +++++++++++++++++++++
.../client/RemoteClient.java} | 14 +-
.../core/remote/client/RemoteClientManager.java | 126 ++++++++++++++++
.../core/remote/client/SelfRemoteClient.java} | 34 +++--
.../selector/ForeverFirstSelector.java} | 17 ++-
.../selector/HashCodeSelector.java} | 17 +--
.../selector/RemoteClientSelector.java} | 11 +-
.../selector/RollingSelector.java} | 32 ++---
.../core/remote/{ => selector}/Selector.java | 2 +-
.../Indicator.java => proto/RemoteService.proto} | 33 +++--
.../main/resources/META-INF/defines/indicator.def | 19 +++
.../src/main/resources/META-INF/defines/worker.def | 21 +++
.../indicator/define/IndicatorMapperTestCase.java} | 18 +--
.../indicator/define/TestAvgIndicator.java} | 18 +--
.../test/resources/META-INF/defines/indicator.def | 19 +++
.../src/test/resources/META-INF/defines/worker.def | 17 +++
.../server-core/src/test/resources/log4j2.xml | 31 ++++
.../oap/server/library/client/grpc/GRPCClient.java | 5 +-
.../oap/server/library/module/ModuleProvider.java | 3 +-
.../receiver/mesh/provider/MeshGRPCHandler.java | 2 -
49 files changed, 1117 insertions(+), 250 deletions(-)