This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch alarm in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from 71b0ee8 Merge commit '6e6aeb4a12c15aa643da38696001a11565b6b187' into alarm add 2b5f28d Update README.md (#1645) add bc57125 Streaming analysis topology test success. (#1646) add 9a2ac64 Remove antd icons, istio, gogo proto from dist NOTICE. (#1648) add 5a55b9b Provide Pxx(p99,p95,p90,p75,p50) indicators and All dispatcher (#1654) add 1936d38 Support ThermodynamicIndicator (#1659) add 23b8d6e Finished topology query. (#1663) add 973ad9e Support time bucket transfer for all indicators. (#1664) add 87449d0 Add IDColumn Annotation. (#1667) add 83cef89 Update startup.sh (#1668) add fd83aa5 Support new indicator core. (#1669) add babc6d2 Global topology and service topology write by manual. (#1671) add 64d886f Add document of contributions and some guides (#1672) add 366609a Endpoint topology metric and query. (#1674) add 7e149ab Metric query. (#1677) add 79024ba Update live demo address (#1673) add 2bad786 Analysis and query implementation of thermodynamic. (#1678) add 7e23f49 Generate all metric for official release, also new func (#1679) add 13fa303 Add record persistence stream analysis. (#1683) add 99fdf02 Feature/trace query (#1685) add 0576466 Implementation of metadata query. (#1686) add 7c619e3 Fix elastic search plugin not work. (#1691) add 7d3e699 Adjust agent setting (#1682) add e83e175 Meta data query implementation are all finished. (#1692) add aca8a7c Merge branch 'master' into alarm No new revisions were added by this update. Summary of changes: CHANGES.md | 2 +- README.md | 8 +- apm-dist/bin/startup.sh | 2 +- apm-dist/release-docs/NOTICE | 22 -- .../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/README.md | 8 +- docs/ROADMAP.md | 54 ----- docs/en/concepts-and-designs/oal.md | 199 +++------------- .../{oal.md => scope-definitions.md} | 84 +------ docs/en/guides/README.md | 35 ++- docs/en/setup/backend/backend-receivers.md | 17 ++ docs/en/setup/backend/backend-setup.md | 3 + docs/en/setup/backend/backend-storage.md | 2 +- docs/en/setup/backend/backend-ui-setup.md | 2 +- .../core/alarm/provider/RunningRuleTest.java | 16 ++ oap-server/server-core/pom.xml | 5 + .../apache/skywalking/oap/server/core/Const.java | 3 +- .../skywalking/oap/server/core/CoreModule.java | 12 + .../oap/server/core/CoreModuleProvider.java | 14 ++ .../oap/server/core/alarm/AlarmEntrance.java | 2 +- .../oap/server/core/alarm/AlarmMeta.java | 25 +- .../skywalking/oap/server/core/alarm/ScopeIDs.java | 52 ----- .../server/core/analysis/DispatcherManager.java | 42 ++-- .../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 +- .../core/analysis/generated/all/AllDispatcher.java | 89 +++++++ .../AllHeatmapIndicator.java} | 102 +++++--- .../AllP50Indicator.java} | 100 +++++--- .../AllP75Indicator.java} | 100 +++++--- .../AllP90Indicator.java} | 100 +++++--- .../AllP95Indicator.java} | 100 +++++--- .../AllP99Indicator.java} | 100 +++++--- .../generated/endpoint/EndpointAvgIndicator.java | 85 +++++-- .../generated/endpoint/EndpointDispatcher.java | 75 +++++- .../generated/endpoint/EndpointP50Indicator.java | 192 +++++++++++++++ .../generated/endpoint/EndpointP75Indicator.java | 192 +++++++++++++++ .../generated/endpoint/EndpointP90Indicator.java | 192 +++++++++++++++ .../generated/endpoint/EndpointP95Indicator.java | 192 +++++++++++++++ .../generated/endpoint/EndpointP99Indicator.java | 192 +++++++++++++++ ...entIndicator.java => EndpointSlaIndicator.java} | 99 ++++++-- .../EndpointRelationCpmIndicator.java | 198 ++++++++++++++++ .../EndpointRelationDispatcher.java | 30 ++- ...java => EndpointRelationRespTimeIndicator.java} | 126 ++++++---- .../service/ServiceCallsSumIndicator.java | 119 ---------- ...eAvgIndicator.java => ServiceCpmIndicator.java} | 90 ++++--- .../generated/service/ServiceDispatcher.java | 78 ++++++- .../generated/service/ServiceP50Indicator.java | 176 ++++++++++++++ .../generated/service/ServiceP75Indicator.java | 176 ++++++++++++++ .../generated/service/ServiceP90Indicator.java | 176 ++++++++++++++ .../generated/service/ServiceP95Indicator.java | 176 ++++++++++++++ .../generated/service/ServiceP99Indicator.java | 176 ++++++++++++++ ...ndicator.java => ServiceRespTimeIndicator.java} | 81 +++++-- .../ServiceSlaIndicator.java} | 93 +++++--- ...cator.java => ServiceInstanceCpmIndicator.java} | 99 +++++--- .../serviceinstance/ServiceInstanceDispatcher.java | 13 +- .../ServiceInstanceRespTimeIndicator.java | 78 +++++-- .../InstanceJvmCpuIndicator.java | 76 ++++-- .../ServiceInstanceJVMCPUDispatcher.java | 2 +- ...or.java => InstanceJvmOldGcCountIndicator.java} | 96 +++++--- .../InstanceJvmOldGcTimeIndicator.java} | 92 ++++++-- ....java => InstanceJvmYoungGcCountIndicator.java} | 96 +++++--- .../InstanceJvmYoungGcTimeIndicator.java | 76 ++++-- .../ServiceInstanceJVMGCDispatcher.java | 44 +++- .../InstanceJvmMemoryHeapIndicator.java} | 92 ++++++-- ....java => InstanceJvmMemoryNoheapIndicator.java} | 90 +++++-- .../ServiceInstanceJVMMemoryDispatcher.java | 26 ++- .../ServiceInstanceJVMMemoryPoolDispatcher.java | 12 - .../ServiceInstanceRelationDispatcher.java | 14 -- .../ServiceRelationClientCallSlaIndicator.java} | 93 +++++--- .../ServiceRelationClientCpmIndicator.java} | 97 +++++--- .../ServiceRelationClientRespTimeIndicator.java} | 102 +++++--- .../servicerelation/ServiceRelationDispatcher.java | 71 ++++-- .../ServiceRelationServerCallSlaIndicator.java} | 93 +++++--- .../ServiceRelationServerCpmIndicator.java} | 97 +++++--- ...=> ServiceRelationServerRespTimeIndicator.java} | 99 +++++--- .../{SumIndicator.java => CPMIndicator.java} | 21 +- .../{SumIndicator.java => CountIndicator.java} | 6 +- .../server/core/analysis/indicator/Indicator.java | 82 ++++++- .../core/analysis/indicator/IntKeyLongValue.java | 86 +++++++ .../analysis/indicator/IntKeyLongValueArray.java | 59 +++++ .../core/analysis/indicator/LongAvgIndicator.java | 11 +- .../core/analysis/indicator/P50Indicator.java} | 16 +- .../indicator/P75Indicator.java} | 16 +- .../indicator/P90Indicator.java} | 16 +- .../indicator/P95Indicator.java} | 16 +- .../indicator/P99Indicator.java} | 16 +- .../core/analysis/indicator/PxxIndicator.java | 117 ++++++++++ .../core/analysis/indicator/SumIndicator.java | 15 +- .../analysis/indicator/ThermodynamicIndicator.java | 122 ++++++++++ .../indicator/annotation/Arg.java} | 18 +- .../EndpointCallRelationDispatcher.java} | 43 ++-- .../EndpointRelationClientSideIndicator.java | 151 ++++++++++++ .../EndpointRelationServerSideIndicator.java | 151 ++++++++++++ .../analysis/manual/segment/SegmentDispatcher.java | 45 ++++ .../analysis/manual/segment/SegmentRecord.java | 103 ++++++++ .../manual/service/ServiceComponentIndicator.java | 41 +++- .../manual/service/ServiceMappingIndicator.java | 50 +++- .../ServiceCallRelationDispatcher.java} | 38 +-- .../ServiceRelationClientSideIndicator.java} | 133 ++++++----- .../ServiceRelationServerSideIndicator.java} | 133 ++++++----- .../Indicator.java => record/Record.java} | 13 +- .../record/annotation/RecordType.java} | 11 +- .../record/annotation/RecordTypeListener.java} | 37 ++- .../analysis/worker/IndicatorAggregateWorker.java | 2 +- .../analysis/worker/IndicatorPersistentWorker.java | 56 ++--- .../core/analysis/worker/IndicatorProcess.java | 3 + .../core/analysis/worker/PersistenceWorker.java | 97 ++++++++ .../analysis/worker/RecordPersistentWorker.java | 68 ++++++ .../{IndicatorProcess.java => RecordProcess.java} | 40 ++-- .../server/core/cache/EndpointInventoryCache.java | 17 +- .../core/cache/NetworkAddressInventoryCache.java | 23 +- .../core/cache/ServiceInstanceInventoryCache.java | 30 +-- .../server/core/cache/ServiceInventoryCache.java | 33 ++- .../oap/server/core/query/DurationPoint.java} | 28 ++- .../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} | 35 ++- .../oap/server/core/query/TopologyBuilder.java | 191 +++++++++++++++ .../server/core/query/TopologyQueryService.java | 136 +++++++++++ .../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 | 14 +- .../server/core/query/entity}/ClusterBrief.java | 6 +- .../oap/server/core/query/entity}/Endpoint.java | 6 +- .../oap/server/core/query/entity/IntValues.java} | 9 +- .../oap/server/core/query/entity}/KVInt.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}/Node.java | 8 +- .../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 +- .../oap/server/core/query/entity}/Step.java | 2 +- .../server/core/query/entity}/Thermodynamic.java | 9 +- .../oap/server/core/query/entity}/Topology.java | 10 +- .../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} | 10 +- .../{source/Source.java => query/sql/GroupBy.java} | 11 +- .../Source.java => query/sql/KeyValues.java} | 10 +- .../{source/Source.java => query/sql/Where.java} | 12 +- .../server/core/register/EndpointInventory.java | 10 +- .../core/register/NetworkAddressInventory.java | 16 ++ .../oap/server/core/register/RegisterSource.java | 4 +- .../core/register/ServiceInstanceInventory.java | 24 +- .../oap/server/core/register/ServiceInventory.java | 8 +- .../service/INetworkAddressInventoryRegister.java | 2 + .../service/NetworkAddressInventoryRegister.java | 22 +- .../register/worker/RegisterPersistentWorker.java | 2 +- .../oap/server/core/remote/data/StreamData.java | 2 + .../core/remote/selector/HashCodeSelector.java | 2 +- .../server/core/source/{Service.java => All.java} | 16 +- .../oap/server/core/source/Endpoint.java | 4 + .../oap/server/core/source/EndpointRelation.java | 9 + .../skywalking/oap/server/core/source/Scope.java | 3 +- .../source/{ServiceMapping.java => Segment.java} | 19 +- .../skywalking/oap/server/core/source/Service.java | 4 + .../oap/server/core/source/ServiceComponent.java | 7 + .../oap/server/core/source/ServiceInstance.java | 4 + .../server/core/source/ServiceInstanceJVMCPU.java | 4 + .../server/core/source/ServiceInstanceJVMGC.java | 4 + .../core/source/ServiceInstanceJVMMemory.java | 6 +- .../core/source/ServiceInstanceJVMMemoryPool.java | 4 + .../core/source/ServiceInstanceRelation.java | 5 + .../oap/server/core/source/ServiceMapping.java | 6 + .../oap/server/core/source/ServiceRelation.java | 9 + .../skywalking/oap/server/core/source/Source.java | 2 + .../oap/server/core/source/SourceReceiverImpl.java | 2 +- .../Collection.java => storage/IRecordDAO.java} | 25 +- .../oap/server/core/storage/PersistenceTimer.java | 103 ++++++++ .../oap/server/core/storage/StorageDAO.java | 3 + .../oap/server/core/storage/StorageModule.java | 4 +- .../storage/{StorageDAO.java => TimePyramid.java} | 23 +- ...odule.java => TimePyramidTableNameBuilder.java} | 32 ++- .../oap/server/core/storage/annotation/Column.java | 7 +- .../annotation/{Column.java => IDColumn.java} | 16 +- .../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 +- .../core/storage/query/IMetadataQueryDAO.java | 49 ++++ .../query/IMetricQueryDAO.java} | 21 +- .../core/storage/query/ITopologyQueryDAO.java | 51 ++++ .../{StorageDAO.java => query/ITraceQueryDAO.java} | 16 +- .../type/StorageDataType.java} | 11 +- .../server-core/src/main/proto/RemoteService.proto | 6 + .../src/main/resources/official_analysis.oal | 143 ++++++------ .../analysis/indicator/CountIndicatorTest.java | 89 +++++++ .../core/analysis/indicator/IndicatorTest.java | 121 ++++++++++ .../analysis/indicator/LongAvgIndicatorTest.java | 85 +++++++ .../analysis/indicator/PercentIndicatorTest.java | 100 ++++++++ .../core/analysis/indicator/PxxIndicatorTest.java | 130 +++++++++++ .../indicator/ThermodynamicIndicatorTest.java | 125 ++++++++++ .../server/library/buffer/DataStreamReader.java | 20 +- .../oap/server/library/buffer/OffsetStream.java | 2 +- .../library/buffer/BufferStreamTestCase.java | 3 +- .../client/elasticsearch/ElasticSearchClient.java | 7 + .../oap/server/library/module/Service.java | 1 - .../oap/server/library/util/CollectionUtils.java | 8 + .../oap/query/graphql/GraphQLQueryProvider.java | 23 +- .../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 | 42 +++- .../oap/query/graphql/resolver/TraceQuery.java | 54 ++++- .../query/graphql/type/BatchMetricConditions.java | 9 +- .../oap/query/graphql/type/Duration.java | 1 + .../oap/query/graphql/type/MetricCondition.java | 4 + .../query/graphql/type/TraceQueryCondition.java | 9 +- .../provider/handler/JVMMetricsServiceHandler.java | 2 +- .../trace/provider/TraceModuleProvider.java | 19 +- ...Listener.java => TraceServiceModuleConfig.java} | 18 +- .../handler/TraceSegmentServiceHandler.java | 10 +- .../trace/provider/parser/SegmentParse.java | 23 +- .../provider/parser/decorator/SegmentCoreInfo.java | 70 +----- .../provider/parser/listener/SpanListener.java | 2 +- .../listener/endpoint/MultiScopesSpanListener.java | 1 + .../parser/listener/endpoint/SourceBuilder.java | 13 ++ .../listener/segment/SegmentSpanListener.java | 106 +++++++++ .../SegmentStandardizationWorker.java | 26 +-- .../parser/standardization/SpanIdExchanger.java | 6 +- .../server/receiver/trace/mock/AgentDataMock.java | 76 ++++++ .../server/receiver/trace/mock/ConsumerMock.java | 164 +++++++++++++ .../server/receiver/trace/mock/ProviderMock.java | 112 +++++++++ .../server/receiver/trace/mock/RegisterMock.java | 166 +++++++++++++ .../receiver/trace/mock/UniqueIdBuilder.java} | 19 +- .../src/test/resources/log4j2.xml | 0 oap-server/server-starter/pom.xml | 4 +- .../src/main/resources/application.yml | 4 + .../server-starter/src/main/resources/log4j2.xml | 5 +- .../storage-elasticsearch-plugin/pom.xml | 6 + .../StorageModuleElasticsearchProvider.java | 7 + .../elasticsearch/base/ColumnTypeEsMapping.java | 5 + .../storage/plugin/elasticsearch/base/EsDAO.java | 24 ++ .../plugin/elasticsearch/base/IndicatorEsDAO.java | 15 +- .../elasticsearch/base/MatchCNameBuilder.java} | 14 +- .../base/{IndicatorEsDAO.java => RecordEsDAO.java} | 44 ++-- .../plugin/elasticsearch/base/RegisterEsDAO.java | 2 +- .../plugin/elasticsearch/base/StorageEsDAO.java | 5 + .../elasticsearch/base/StorageEsInstaller.java | 33 ++- .../elasticsearch/query/MetadataQueryEsDAO.java | 224 ++++++++++++++++++ .../elasticsearch/query/MetricQueryEsDAO.java | 131 +++++++++++ .../elasticsearch/query/TopologyQueryEsDAO.java | 233 ++++++++++++++++++ .../elasticsearch/query/TraceQueryEsDAO.java | 141 +++++++++++ .../src/test/resources/log4j2.xml | 0 262 files changed, 10269 insertions(+), 2383 deletions(-) delete mode 100644 docs/ROADMAP.md copy docs/en/concepts-and-designs/{oal.md => scope-definitions.md} (73%) delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/ScopeIDs.java copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/{Collection.java => SWCollection.java} (85%) create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllDispatcher.java copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/{serviceinstancejvmcpu/InstanceJvmCpuIndicator.java => all/AllHeatmapIndicator.java} (50%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/{serviceinstancejvmcpu/InstanceJvmCpuIndicator.java => all/AllP50Indicator.java} (51%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/{serviceinstancejvmcpu/InstanceJvmCpuIndicator.java => all/AllP75Indicator.java} (51%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/{serviceinstancejvmcpu/InstanceJvmCpuIndicator.java => all/AllP90Indicator.java} (51%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/{serviceinstancejvmcpu/InstanceJvmCpuIndicator.java => all/AllP95Indicator.java} (51%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/{serviceinstancejvmcpu/InstanceJvmCpuIndicator.java => all/AllP99Indicator.java} (51%) create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP50Indicator.java create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP75Indicator.java create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP90Indicator.java create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP95Indicator.java create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP99Indicator.java copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/{EndpointPercentIndicator.java => EndpointSlaIndicator.java} (55%) create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationCpmIndicator.java rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/{EndpointRelationAvgIndicator.java => EndpointRelationRespTimeIndicator.java} (51%) delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceCallsSumIndicator.java copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/{ServiceAvgIndicator.java => ServiceCpmIndicator.java} (56%) create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP50Indicator.java create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP75Indicator.java create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP90Indicator.java create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP95Indicator.java create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP99Indicator.java rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/{ServiceAvgIndicator.java => ServiceRespTimeIndicator.java} (58%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/{endpoint/EndpointPercentIndicator.java => service/ServiceSlaIndicator.java} (57%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/{ServiceInstanceRespTimeIndicator.java => ServiceInstanceCpmIndicator.java} (53%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/{InstanceJvmYoungGcTimeIndicator.java => InstanceJvmOldGcCountIndicator.java} (54%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/{serviceinstancejvmmemory/InstanceJvmMemoryMaxIndicator.java => serviceinstancejvmgc/InstanceJvmOldGcTimeIndicator.java} (57%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/{InstanceJvmYoungGcTimeIndicator.java => InstanceJvmYoungGcCountIndicator.java} (54%) rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/{serviceinstancejvmmemorypool/InstanceJvmMemoryPoolMaxIndicator.java => serviceinstancejvmmemory/InstanceJvmMemoryHeapIndicator.java} (56%) rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/{InstanceJvmMemoryMaxIndicator.java => InstanceJvmMemoryNoheapIndicator.java} (56%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/{endpoint/EndpointPercentIndicator.java => servicerelation/ServiceRelationClientCallSlaIndicator.java} (54%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/{serviceinstance/ServiceInstanceRespTimeIndicator.java => servicerelation/ServiceRelationClientCpmIndicator.java} (52%) rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/{serviceinstancerelation/ServiceInstanceRelationAvgIndicator.java => servicerelation/ServiceRelationClientRespTimeIndicator.java} (55%) rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/{endpoint/EndpointPercentIndicator.java => servicerelation/ServiceRelationServerCallSlaIndicator.java} (54%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/{serviceinstance/ServiceInstanceRespTimeIndicator.java => servicerelation/ServiceRelationServerCpmIndicator.java} (52%) rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/{ServiceRelationAvgIndicator.java => ServiceRelationServerRespTimeIndicator.java} (54%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/{SumIndicator.java => CPMIndicator.java} (69%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/{SumIndicator.java => CountIndicator.java} (88%) create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/IntKeyLongValue.java create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/IntKeyLongValueArray.java copy oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/Call.java => server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/P50Indicator.java} (79%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{source/Source.java => analysis/indicator/P75Indicator.java} (79%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{source/Source.java => analysis/indicator/P90Indicator.java} (79%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{source/Source.java => analysis/indicator/P95Indicator.java} (79%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{source/Source.java => analysis/indicator/P99Indicator.java} (79%) create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/PxxIndicator.java create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/ThermodynamicIndicator.java copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{storage/annotation/Column.java => analysis/indicator/annotation/Arg.java} (73%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{generated/service/ServiceDispatcher.java => manual/endpointrelation/EndpointCallRelationDispatcher.java} (51%) create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/endpointrelation/EndpointRelationClientSideIndicator.java create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/endpointrelation/EndpointRelationServerSideIndicator.java create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SegmentDispatcher.java create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SegmentRecord.java copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{generated/serviceinstancerelation/ServiceInstanceRelationDispatcher.java => manual/servicerelation/ServiceCallRelationDispatcher.java} (52%) rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{generated/servicerelation/ServiceRelationClientCallsSumIndicator.java => manual/servicerelation/ServiceRelationClientSideIndicator.java} (51%) rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{generated/servicerelation/ServiceRelationServerCallsSumIndicator.java => manual/servicerelation/ServiceRelationServerSideIndicator.java} (51%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator/Indicator.java => record/Record.java} (72%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{source/Source.java => analysis/record/annotation/RecordType.java} (80%) copy oap-server/{server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/CollectionUtils.java => server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/record/annotation/RecordTypeListener.java} (53%) create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/PersistenceWorker.java create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/RecordPersistentWorker.java copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/{IndicatorProcess.java => RecordProcess.java} (55%) copy oap-server/server-core/src/{test/java/org/apache/skywalking/oap/server/core/analysis/indicator/define/TestLongAvgIndicator.java => main/java/org/apache/skywalking/oap/server/core/query/DurationPoint.java} (60%) create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/DurationUtils.java create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetadataQueryService.java create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetricQueryService.java rename oap-server/server-core/src/{test/java/org/apache/skywalking/oap/server/core/analysis/indicator/define/TestLongAvgIndicator.java => main/java/org/apache/skywalking/oap/server/core/query/PaginationUtils.java} (54%) create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyBuilder.java create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyQueryService.java create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TraceQueryService.java rename oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity}/Attribute.java (93%) rename oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity}/BasicTrace.java (80%) rename oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity}/Call.java (76%) rename oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity}/ClusterBrief.java (91%) rename oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity}/Endpoint.java (90%) rename oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/LinearIntValues.java => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/IntValues.java} (81%) rename oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity}/KVInt.java (90%) copy oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity}/KeyValue.java (90%) rename oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity}/Language.java (93%) create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/LanguageTrans.java rename oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity}/LogEntity.java (83%) rename oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity}/Node.java (88%) rename oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity}/Pagination.java (90%) rename oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity}/QueryOrder.java (93%) rename oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity}/Ref.java (90%) rename oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity}/RefType.java (93%) rename oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity}/Service.java (90%) rename oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity}/ServiceInstance.java (84%) rename oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity}/Span.java (74%) rename oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity}/Step.java (93%) rename oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity}/Thermodynamic.java (83%) rename oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity}/Topology.java (79%) rename oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity}/Trace.java (83%) rename oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity}/TraceBrief.java (83%) rename oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity}/TraceState.java (93%) rename oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/KeyValue.java => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/Function.java} (85%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{source/Source.java => query/sql/GroupBy.java} (83%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{source/Source.java => query/sql/KeyValues.java} (80%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{source/Source.java => query/sql/Where.java} (81%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/{Service.java => All.java} (88%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/{ServiceMapping.java => Segment.java} (65%) rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{analysis/data/Collection.java => storage/IRecordDAO.java} (70%) create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/PersistenceTimer.java copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/{StorageDAO.java => TimePyramid.java} (68%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/{StorageModule.java => TimePyramidTableNameBuilder.java} (51%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/{Column.java => IDColumn.java} (74%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/{Column.java => ValueColumnIds.java} (51%) create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IMetadataQueryDAO.java copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{remote/selector/HashCodeSelector.java => storage/query/IMetricQueryDAO.java} (55%) create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/ITopologyQueryDAO.java copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/{StorageDAO.java => query/ITraceQueryDAO.java} (58%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{source/Source.java => storage/type/StorageDataType.java} (82%) create mode 100644 oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/CountIndicatorTest.java create mode 100644 oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/IndicatorTest.java create mode 100644 oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/LongAvgIndicatorTest.java create mode 100644 oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/PercentIndicatorTest.java create mode 100644 oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/PxxIndicatorTest.java create mode 100644 oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/ThermodynamicIndicatorTest.java copy oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/{parser/listener/SpanListener.java => TraceServiceModuleConfig.java} (70%) create mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/segment/SegmentSpanListener.java create mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/AgentDataMock.java create mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ConsumerMock.java create mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/ProviderMock.java create mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/RegisterMock.java copy oap-server/{server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/EsDAO.java => server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/UniqueIdBuilder.java} (60%) copy oap-server/{server-library/library-buffer => server-receiver-plugin/skywalking-trace-receiver-plugin}/src/test/resources/log4j2.xml (100%) copy oap-server/{server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/SpanListener.java => server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/MatchCNameBuilder.java} (75%) copy oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/{IndicatorEsDAO.java => RecordEsDAO.java} (53%) create mode 100644 oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java create mode 100644 oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetricQueryEsDAO.java create mode 100644 oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopologyQueryEsDAO.java create mode 100644 oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TraceQueryEsDAO.java copy oap-server/{server-library/library-buffer => server-storage-plugin/storage-elasticsearch-plugin}/src/test/resources/log4j2.xml (100%)