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/10/25 07:02:58 UTC
[incubator-skywalking] 01/02: Merge branch 'master' into
mesh-receiver
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch mesh-receiver
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 77f8ee186d9d1e94ae6aa297337f0a347164b0f5
Merge: 423fd24 6c92fc5
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Thu Oct 25 14:34:25 2018 +0800
Merge branch 'master' into mesh-receiver
docs/en/concepts-and-designs/scope-definitions.md | 3 +
.../oap/server/core/CoreModuleProvider.java | 2 +
.../server/core/analysis/DispatcherManager.java | 4 -
.../EndpointCallRelationDispatcher.java | 2 +
.../EndpointRelationServerSideIndicator.java | 22 +++
.../manual/service/ServiceComponentDispatcher.java | 42 ------
.../manual/service/ServiceComponentIndicator.java | 157 --------------------
.../manual/service/ServiceMappingDispatcher.java | 42 ------
.../manual/service/ServiceMappingIndicator.java | 160 ---------------------
.../ServiceCallRelationDispatcher.java | 4 +
.../ServiceRelationClientSideIndicator.java | 22 +++
.../ServiceRelationServerSideIndicator.java | 22 +++
.../oap/server/core/cache/CacheUpdateTimer.java | 71 +++++++++
.../config/ComponentLibraryCatalogService.java | 6 +-
.../config/IComponentLibraryCatalogService.java | 2 +-
.../oap/server/core/query/TopologyBuilder.java | 131 ++++++-----------
.../server/core/query/TopologyQueryService.java | 63 ++++----
.../oap/server/core/query/entity/Call.java | 1 +
.../core/register/NetworkAddressInventory.java | 12 --
.../oap/server/core/register/RegisterSource.java | 2 +-
.../oap/server/core/register/ServiceInventory.java | 21 +++
.../service/INetworkAddressInventoryRegister.java | 2 -
.../service/IServiceInventoryRegister.java | 4 +-
.../service/NetworkAddressInventoryRegister.java | 24 +---
.../register/service/ServiceInventoryRegister.java | 18 ++-
.../oap/server/core/source/EndpointRelation.java | 7 +-
.../skywalking/oap/server/core/source/Scope.java | 1 -
.../oap/server/core/source/ServiceComponent.java | 43 ------
.../core/source/ServiceInstanceRelation.java | 3 +-
.../oap/server/core/source/ServiceMapping.java | 42 ------
.../oap/server/core/source/ServiceRelation.java | 7 +-
.../storage/cache/IServiceInventoryCacheDAO.java | 3 +
.../core/storage/query/ITopologyQueryDAO.java | 5 -
.../config/ComponentLibraryCatalogFileTest.java | 2 +-
.../trace/provider/TraceModuleProvider.java | 3 +-
.../listener/endpoint/MultiScopesSpanListener.java | 13 +-
.../parser/listener/endpoint/SourceBuilder.java | 4 +
.../service/ServiceComponentSpanListener.java | 77 ----------
.../service/ServiceMappingSpanListener.java | 41 +++---
.../parser/standardization/SpanIdExchanger.java | 4 -
.../server/receiver/trace/mock/AgentDataMock.java | 41 ++++--
.../server/receiver/trace/mock/RegisterMock.java | 117 +++------------
.../mock/{ConsumerMock.java => ServiceAMock.java} | 103 ++++---------
.../mock/{ProviderMock.java => ServiceBMock.java} | 91 ++++++++----
.../mock/{ProviderMock.java => ServiceCMock.java} | 97 ++++++-------
.../cache/ServiceInventoryCacheEsDAO.java | 29 +++-
.../elasticsearch/query/MetadataQueryEsDAO.java | 13 +-
.../elasticsearch/query/TopologyQueryEsDAO.java | 111 ++++----------
48 files changed, 566 insertions(+), 1130 deletions(-)