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/09/23 12:48:20 UTC
[incubator-skywalking] 01/01: Merge master.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch docs
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 91e6b81ab68ec3f95562c839a0b6ed1c8d62f34e
Merge: 90348cd e83e175
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Sun Sep 23 20:48:08 2018 +0800
Merge master.
README.md | 2 +-
.../network/trace/component/ComponentsDefine.java | 2 +
.../skywalking/apm/agent/SkyWalkingAgent.java | 51 ++--
.../elasticsearch-5.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/pom.xml | 1 +
docs/en/concepts-and-designs/scope-definitions.md | 2 +-
oap-server/server-core/pom.xml | 5 +
.../apache/skywalking/oap/server/core/Const.java | 2 +
.../skywalking/oap/server/core/CoreModule.java | 5 +-
.../oap/server/core/CoreModuleProvider.java | 7 +-
.../server/core/analysis/DispatcherManager.java | 9 +-
.../server/core/analysis/data/MergeDataCache.java | 6 +-
.../core/analysis/data/MergeDataCollection.java | 27 +--
.../core/analysis/data/NonMergeDataCache.java | 12 +-
.../core/analysis/data/NonMergeDataCollection.java | 26 ++-
.../data/{Collection.java => SWCollection.java} | 12 +-
.../oap/server/core/analysis/data/Window.java | 18 +-
.../generated/all/AllHeatmapIndicator.java | 6 +-
.../analysis/generated/all/AllP50Indicator.java | 6 +-
.../analysis/generated/all/AllP75Indicator.java | 6 +-
.../analysis/generated/all/AllP90Indicator.java | 6 +-
.../analysis/generated/all/AllP95Indicator.java | 6 +-
.../analysis/generated/all/AllP99Indicator.java | 6 +-
.../generated/endpoint/EndpointDispatcher.java | 71 +++++-
...entIndicator.java => EndpointP50Indicator.java} | 71 +++---
...entIndicator.java => EndpointP75Indicator.java} | 71 +++---
...entIndicator.java => EndpointP90Indicator.java} | 71 +++---
...entIndicator.java => EndpointP95Indicator.java} | 71 +++---
...entIndicator.java => EndpointP99Indicator.java} | 71 +++---
...entIndicator.java => EndpointSlaIndicator.java} | 22 +-
...ator.java => EndpointRelationCpmIndicator.java} | 47 ++--
.../EndpointRelationDispatcher.java | 27 ++-
...java => EndpointRelationRespTimeIndicator.java} | 22 +-
...sSumIndicator.java => ServiceCpmIndicator.java} | 33 +--
.../generated/service/ServiceDispatcher.java | 72 +++++-
.../ServiceP50Indicator.java} | 43 ++--
.../ServiceP75Indicator.java} | 43 ++--
.../ServiceP90Indicator.java} | 43 ++--
.../ServiceP95Indicator.java} | 43 ++--
.../ServiceP99Indicator.java} | 43 ++--
...ndicator.java => ServiceRespTimeIndicator.java} | 22 +-
...eAvgIndicator.java => ServiceSlaIndicator.java} | 64 ++---
...cator.java => ServiceInstanceCpmIndicator.java} | 47 ++--
.../serviceinstance/ServiceInstanceDispatcher.java | 11 +
.../ServiceInstanceRespTimeIndicator.java | 4 +-
.../InstanceJvmOldGcCountIndicator.java} | 32 ++-
.../InstanceJvmOldGcTimeIndicator.java} | 24 +-
.../InstanceJvmYoungGcCountIndicator.java} | 32 ++-
.../ServiceInstanceJVMGCDispatcher.java | 42 ++++
.../InstanceJvmMemoryHeapIndicator.java} | 24 +-
....java => InstanceJvmMemoryNoheapIndicator.java} | 22 +-
.../ServiceInstanceJVMMemoryDispatcher.java | 24 +-
.../ServiceInstanceJVMMemoryPoolDispatcher.java | 12 -
.../ServiceInstanceRelationAvgIndicator.java | 189 ---------------
.../ServiceInstanceRelationDispatcher.java | 13 --
.../ServiceRelationClientCallSlaIndicator.java} | 50 ++--
...java => ServiceRelationClientCpmIndicator.java} | 33 +--
...=> ServiceRelationClientRespTimeIndicator.java} | 22 +-
.../servicerelation/ServiceRelationDispatcher.java | 60 ++++-
.../ServiceRelationServerCallSlaIndicator.java} | 50 ++--
...java => ServiceRelationServerCpmIndicator.java} | 33 +--
...=> ServiceRelationServerRespTimeIndicator.java} | 22 +-
.../{SumIndicator.java => CPMIndicator.java} | 21 +-
.../{SumIndicator.java => CountIndicator.java} | 6 +-
.../server/core/analysis/indicator/Indicator.java | 61 +++--
.../core/analysis/indicator/IntKeyLongValue.java | 19 +-
.../analysis/indicator/IntKeyLongValueArray.java | 59 +++++
.../core/analysis/indicator/LongAvgIndicator.java | 11 +-
.../core/analysis/indicator/PxxIndicator.java | 25 +-
.../core/analysis/indicator/SumIndicator.java | 15 +-
.../analysis/indicator/ThermodynamicIndicator.java | 23 +-
.../EndpointCallRelationDispatcher.java} | 43 ++--
.../EndpointRelationClientSideIndicator.java | 151 ++++++++++++
.../EndpointRelationServerSideIndicator.java | 151 ++++++++++++
.../analysis/manual/segment/SegmentDispatcher.java | 45 ++++
.../analysis/manual/segment/SegmentRecord.java | 103 ++++++++
.../record/Record.java} | 15 +-
.../record/annotation/RecordType.java} | 12 +-
.../record/annotation/RecordTypeListener.java} | 37 ++-
.../analysis/worker/IndicatorAggregateWorker.java | 2 +-
.../analysis/worker/IndicatorPersistentWorker.java | 56 +----
...ersistentWorker.java => PersistenceWorker.java} | 80 ++-----
.../analysis/worker/RecordPersistentWorker.java | 68 ++++++
.../server/core/analysis/worker/RecordProcess.java | 62 +++++
.../ModelColumn.java => query/DurationPoint.java} | 30 ++-
.../oap/server/core/query/DurationUtils.java | 243 +++++++++++++++++++
.../server/core/query/MetadataQueryService.java | 80 +++++++
.../oap/server/core/query/MetricQueryService.java | 84 +++++++
.../oap/server/core/query/PaginationUtils.java} | 33 ++-
.../oap/server/core/query/TopologyBuilder.java | 24 +-
.../server/core/query/TopologyQueryService.java | 38 +++
.../oap/server/core/query/TraceQueryService.java | 260 +++++++++++++++++++++
.../oap/server/core/query/entity}/Attribute.java | 2 +-
.../oap/server/core/query/entity}/BasicTrace.java | 11 +-
.../oap/server/core/query/entity/Call.java | 5 +-
.../server/core/query/entity}/ClusterBrief.java | 6 +-
.../oap/server/core/query/entity}/Endpoint.java | 6 +-
.../oap/server/core/query/entity}/KeyValue.java | 6 +-
.../oap/server/core/query/entity}/Language.java | 2 +-
.../server/core/query/entity/LanguageTrans.java | 64 +++++
.../oap/server/core/query/entity}/LogEntity.java | 9 +-
.../oap/server/core/query/entity}/Pagination.java | 6 +-
.../oap/server/core/query/entity}/QueryOrder.java | 2 +-
.../oap/server/core/query/entity}/Ref.java | 6 +-
.../oap/server/core/query/entity}/RefType.java | 2 +-
.../oap/server/core/query/entity}/Service.java | 6 +-
.../server/core/query/entity}/ServiceInstance.java | 9 +-
.../oap/server/core/query/entity}/Span.java | 21 +-
.../server/core/query/entity}/Thermodynamic.java | 9 +-
.../oap/server/core/query/entity}/Trace.java | 8 +-
.../oap/server/core/query/entity}/TraceBrief.java | 9 +-
.../oap/server/core/query/entity}/TraceState.java | 2 +-
.../oap/server/core/query/sql/Function.java | 2 +-
.../sql/{IntKeyValues.java => KeyValues.java} | 4 +-
.../oap/server/core/query/sql/Where.java | 2 +-
.../server/core/register/EndpointInventory.java | 6 +-
.../core/register/NetworkAddressInventory.java | 12 +
.../oap/server/core/register/RegisterSource.java | 4 +-
.../core/register/ServiceInstanceInventory.java | 20 +-
.../oap/server/core/register/ServiceInventory.java | 4 +-
.../service/INetworkAddressInventoryRegister.java | 2 +
.../service/NetworkAddressInventoryRegister.java | 22 +-
.../oap/server/core/source/EndpointRelation.java | 4 +
.../skywalking/oap/server/core/source/Scope.java | 3 +-
...{ServiceInstanceJVMMemory.java => Segment.java} | 27 ++-
.../core/source/ServiceInstanceJVMMemory.java | 2 +-
.../oap/server/core/source/ServiceRelation.java | 4 +
.../Collection.java => storage/IRecordDAO.java} | 25 +-
.../oap/server/core/storage/PersistenceTimer.java | 8 +-
.../oap/server/core/storage/StorageDAO.java | 3 +
.../oap/server/core/storage/StorageModule.java | 4 +-
.../oap/server/core/storage/annotation/Column.java | 7 +-
.../annotation/StorageAnnotationListener.java | 14 +-
.../{Column.java => ValueColumnIds.java} | 33 ++-
.../oap/server/core/storage/model/Model.java | 5 +-
.../oap/server/core/storage/model/ModelColumn.java | 9 +-
.../server/core/storage/model/ModelInstaller.java | 2 +-
...opologyQueryDAO.java => IMetadataQueryDAO.java} | 26 ++-
.../server/core/storage/query/IMetricQueryDAO.java | 12 +-
.../core/storage/query/ITopologyQueryDAO.java | 6 +
.../{IUniqueQueryDAO.java => ITraceQueryDAO.java} | 15 +-
.../TwoIdGroup.java => type/StorageDataType.java} | 14 +-
.../src/main/resources/official_analysis.oal | 143 ++++++------
...mIndicatorTest.java => CountIndicatorTest.java} | 10 +-
.../client/elasticsearch/ElasticSearchClient.java | 7 +
.../oap/server/library/module/Service.java | 1 -
.../oap/server/library/util/CollectionUtils.java | 8 +
.../oap/query/graphql/GraphQLQueryProvider.java | 6 +-
.../oap/query/graphql/resolver/AlarmQuery.java | 9 +-
.../oap/query/graphql/resolver/MetadataQuery.java | 64 +++--
.../oap/query/graphql/resolver/MetricQuery.java | 44 +++-
.../oap/query/graphql/resolver/TopologyQuery.java | 10 +-
.../oap/query/graphql/resolver/TraceQuery.java | 54 ++++-
.../query/graphql/type/BatchMetricConditions.java | 9 +-
.../oap/query/graphql/type/MetricCondition.java | 4 +
.../query/graphql/type/TraceQueryCondition.java | 9 +-
.../provider/handler/JVMMetricsServiceHandler.java | 2 +-
.../trace/provider/TraceModuleProvider.java | 2 +
.../trace/provider/parser/SegmentParse.java | 12 +-
.../provider/parser/decorator/SegmentCoreInfo.java | 70 +-----
.../provider/parser/listener/SpanListener.java | 2 +-
.../listener/segment/SegmentSpanListener.java | 106 +++++++++
.../parser/standardization/SpanIdExchanger.java | 6 +-
.../server-starter/src/main/resources/log4j2.xml | 4 +-
.../StorageModuleElasticsearchProvider.java | 7 +-
.../elasticsearch/base/ColumnTypeEsMapping.java | 6 +-
.../plugin/elasticsearch/base/IndicatorEsDAO.java | 15 +-
.../elasticsearch/base/MatchCNameBuilder.java} | 10 +-
.../base/{IndicatorEsDAO.java => RecordEsDAO.java} | 44 ++--
.../plugin/elasticsearch/base/StorageEsDAO.java | 5 +
.../elasticsearch/base/StorageEsInstaller.java | 33 ++-
.../elasticsearch/query/MetadataQueryEsDAO.java | 224 ++++++++++++++++++
.../elasticsearch/query/MetricQueryEsDAO.java | 117 +++++-----
.../elasticsearch/query/TopologyQueryEsDAO.java | 101 +++++---
.../elasticsearch/query/TraceQueryEsDAO.java | 141 +++++++++++
.../elasticsearch/query/UniqueQueryEsDAO.java | 68 ------
176 files changed, 3916 insertions(+), 1707 deletions(-)