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/01/04 04:38:23 UTC
[incubator-skywalking] 01/01: Merge pull request #724 from
peng-yongsheng/feature/alarm
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 1fbb28d26b59d382b5ea2420212fefaa85b5045f
Merge: 8cf42e7 dde58ef
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Thu Jan 4 12:38:18 2018 +0800
Merge pull request #724 from peng-yongsheng/feature/alarm
A big change in collector.
apm-collector/apm-collector-agent-jetty/pom.xml | 44 -----
.../collector/agent/stream/AgentStreamModule.java | 69 --------
.../graph/ApplicationGraphNodeIdDefine.java | 29 ----
.../service/graph/InstanceGraphNodeIdDefine.java | 29 ----
.../service/graph/JvmMetricStreamGraphDefine.java | 31 ----
.../service/graph/ServiceGraphNodeIdDefine.java | 29 ----
.../agent/stream/AgentStreamBootStartup.java | 81 ---------
.../agent/stream/AgentStreamModuleProvider.java | 98 -----------
.../agent/stream/graph/JvmMetricStreamGraph.java | 92 ----------
.../agent/stream/graph/RegisterStreamGraph.java | 86 ----------
.../agent/stream/graph/TraceStreamGraph.java | 191 ---------------------
.../worker/AgentStreamRemoteDataRegister.java | 54 ------
.../ApplicationReferenceMetricSpanListener.java | 138 ---------------
.../trace/instance/InstanceMetricSpanListener.java | 78 ---------
.../service/ServiceMetricAggregationWorker.java | 72 --------
apm-collector/apm-collector-agent-stream/pom.xml | 44 -----
.../agent-grpc/agent-grpc-define}/pom.xml | 7 +-
.../agent/grpc/define}/AgentGRPCModule.java | 2 +-
...che.skywalking.apm.collector.core.module.Module | 3 +-
.../agent-grpc/agent-grpc-provider}/pom.xml | 25 ++-
.../grpc/provider}/AgentModuleGRPCProvider.java | 30 ++--
.../provider}/AgentModuleGRPCRegistration.java | 2 +-
.../handler/ApplicationRegisterServiceHandler.java | 11 +-
.../handler/InstanceDiscoveryServiceHandler.java | 11 +-
.../handler/JVMMetricsServiceHandler.java | 25 ++-
.../NetworkAddressRegisterServiceHandler.java | 65 +++++++
.../ServiceNameDiscoveryServiceHandler.java | 9 +-
.../handler/TraceSegmentServiceHandler.java | 13 +-
.../handler/naming/AgentGRPCNamingHandler.java | 2 +-
.../handler/naming/AgentGRPCNamingListener.java | 7 +-
...alking.apm.collector.core.module.ModuleProvider | 3 +-
.../ApplicationRegisterServiceHandlerTestCase.java | 3 +-
.../agent-grpc}/pom.xml | 12 +-
.../agent-jetty/agent-jetty-define}/pom.xml | 6 +-
.../agent/jetty/define}/AgentJettyModule.java | 3 +-
...che.skywalking.apm.collector.core.module.Module | 3 +-
.../agent-jetty/agent-jetty-provider}/pom.xml | 21 ++-
.../jetty/provider}/AgentModuleJettyProvider.java | 29 ++--
.../provider}/AgentModuleJettyRegistration.java | 3 +-
.../handler/ApplicationRegisterServletHandler.java | 11 +-
.../handler/InstanceDiscoveryServletHandler.java | 11 +-
.../NetworkAddressRegisterServletHandler.java} | 36 ++--
.../ServiceNameDiscoveryServiceHandler.java | 9 +-
.../handler/TraceSegmentServletHandler.java | 17 +-
.../handler/naming/AgentJettyNamingHandler.java | 2 +-
.../handler/naming/AgentJettyNamingListener.java | 7 +-
.../reader/KeyWithStringValueJsonReader.java | 2 +-
.../provider}/handler/reader/LogJsonReader.java | 2 +-
.../handler/reader/ReferenceJsonReader.java | 21 ++-
.../handler/reader/SegmentJsonReader.java | 2 +-
.../provider}/handler/reader/SpanJsonReader.java | 2 +-
.../provider}/handler/reader/StreamJsonReader.java | 2 +-
.../provider}/handler/reader/TraceSegment.java | 2 +-
.../handler/reader/TraceSegmentJsonReader.java | 2 +-
.../handler/reader/UniqueIdJsonReader.java | 2 +-
...alking.apm.collector.core.module.ModuleProvider | 3 +-
.../jetty/provider}/ApplicationRegisterPost.java | 3 +-
.../agent/jetty/provider}/HttpClientTools.java | 3 +-
.../jetty/provider}/InstanceRegisterPost.java | 3 +-
.../agent/jetty/provider}/JsonFileReader.java | 3 +-
.../agent/jetty/provider}/SegmentPost.java | 3 +-
.../jetty/provider}/ServiceNameRegisterPost.java | 3 +-
.../json/application-register-consumer.json | 0
.../json/application-register-provider.json | 0
.../src/test/resources/json/dubbox-consumer.json | 2 +-
.../src/test/resources/json/dubbox-provider.json | 18 +-
.../resources/json/instance-register-consumer.json | 0
.../resources/json/instance-register-provider.json | 0
.../json/servicename-register-consumer.json | 0
.../json/servicename-register-provider.json | 0
.../agent-jetty}/pom.xml | 11 +-
.../pom.xml | 8 +-
.../collector/alerting/AlertingModuleProvider.java | 57 ------
.../worker/AlertingListPersistenceWorker.java | 67 --------
.../analysis-alarm/alarm-define}/pom.xml | 6 +-
.../alarm/define/AnalysisAlarmModule.java} | 7 +-
.../alarm/define/graph/AlarmGraphIdDefine.java} | 14 +-
.../alarm/define/graph/AlarmWorkerIdDefine.java | 66 +++++++
...che.skywalking.apm.collector.core.module.Module | 3 +-
.../analysis-alarm/alarm-provider}/pom.xml | 16 +-
.../provider/AnalysisAlarmModuleProvider.java | 88 ++++++++++
.../alarm/provider/worker/AlarmAssertWorker.java | 123 +++++++++++++
.../worker/AlarmAssertWorkerProvider.java} | 22 +--
.../ApplicationMetricAlarmAssertWorker.java | 84 +++++++++
.../application/ApplicationMetricAlarmGraph.java | 79 +++++++++
...plicationMetricAlarmListPersistenceWorker.java} | 37 ++--
.../ApplicationMetricAlarmPersistenceWorker.java} | 39 ++---
.../ApplicationMetricAlarmRemoteWorker.java} | 35 ++--
.../ApplicationMetricAlarmToListNodeProcessor.java | 50 ++++++
...pplicationReferenceMetricAlarmAssertWorker.java | 85 +++++++++
.../ApplicationReferenceMetricAlarmGraph.java | 80 +++++++++
...nReferenceMetricAlarmListPersistenceWorker.java | 67 ++++++++
...tionReferenceMetricAlarmPersistenceWorker.java} | 35 ++--
...plicationReferenceMetricAlarmRemoteWorker.java} | 34 ++--
...ionReferenceMetricAlarmToListNodeProcessor.java | 53 ++++++
.../instance/InstanceMetricAlarmAssertWorker.java | 85 +++++++++
.../worker/instance/InstanceMetricAlarmGraph.java | 79 +++++++++
.../InstanceMetricAlarmListPersistenceWorker.java} | 36 ++--
.../InstanceMetricAlarmPersistenceWorker.java} | 39 ++---
.../instance/InstanceMetricAlarmRemoteWorker.java} | 36 ++--
.../InstanceMetricAlarmToListNodeProcessor.java | 51 ++++++
.../InstanceReferenceMetricAlarmAssertWorker.java | 87 ++++++++++
.../InstanceReferenceMetricAlarmGraph.java | 79 +++++++++
...ReferenceMetricAlarmListPersistenceWorker.java} | 37 ++--
...anceReferenceMetricAlarmPersistenceWorker.java} | 37 ++--
.../InstanceReferenceMetricAlarmRemoteWorker.java} | 31 ++--
...nceReferenceMetricAlarmToListNodeProcessor.java | 55 ++++++
.../service/ServiceMetricAlarmAssertWorker.java | 86 ++++++++++
.../worker/service/ServiceMetricAlarmGraph.java | 79 +++++++++
.../ServiceMetricAlarmListPersistenceWorker.java} | 37 ++--
.../ServiceMetricAlarmPersistenceWorker.java} | 37 ++--
.../service/ServiceMetricAlarmRemoteWorker.java} | 33 ++--
.../ServiceMetricAlarmToListNodeProcessor.java | 52 ++++++
.../ServiceReferenceMetricAlarmAssertWorker.java | 93 ++++++++++
.../service/ServiceReferenceMetricAlarmGraph.java | 79 +++++++++
...eReferenceMetricAlarmListPersistenceWorker.java | 66 +++++++
...viceReferenceMetricAlarmPersistenceWorker.java} | 36 ++--
.../ServiceReferenceMetricAlarmRemoteWorker.java} | 33 ++--
...iceReferenceMetricAlarmToListNodeProcessor.java | 56 ++++++
...alking.apm.collector.core.module.ModuleProvider | 3 +-
.../analysis-alarm}/pom.xml | 11 +-
.../baseline-computing-define}/pom.xml | 6 +-
.../define/AnalysisBaselineComputingModule.java} | 12 +-
...che.skywalking.apm.collector.core.module.Module | 3 +-
.../baseline-computing-provider}/pom.xml | 8 +-
.../AnalysisBaselineComputingModuleProvider.java} | 15 +-
...alking.apm.collector.core.module.ModuleProvider | 2 +-
.../analysis-baseline}/pom.xml | 11 +-
.../analysis-jvm/jvm-define}/pom.xml | 6 +-
.../analysis/jvm/define/AnalysisJVMModule.java} | 17 +-
.../analysis/jvm/define/graph/GraphIdDefine.java} | 19 +-
.../analysis/jvm/define/graph/WorkerIdDefine.java} | 22 +--
.../jvm/define/service}/ICpuMetricService.java | 3 +-
.../jvm/define/service}/IGCMetricService.java | 3 +-
.../define/service}/IInstanceHeartBeatService.java | 3 +-
.../jvm/define/service}/IMemoryMetricService.java | 3 +-
.../define/service}/IMemoryPoolMetricService.java | 3 +-
...che.skywalking.apm.collector.core.module.Module | 3 +-
.../analysis-jvm/jvm-provider}/pom.xml | 19 +-
.../jvm/provider/AnalysisJVMModuleProvider.java | 102 +++++++++++
.../jvm/provider/service}/CpuMetricService.java | 9 +-
.../jvm/provider/service}/GCMetricService.java | 9 +-
.../service}/InstanceHeartBeatService.java | 11 +-
.../jvm/provider/service}/MemoryMetricService.java | 11 +-
.../provider/service}/MemoryPoolMetricService.java | 9 +-
.../worker/CpuMetricPersistenceGraph.java} | 22 +--
.../worker}/CpuMetricPersistenceWorker.java | 22 +--
.../provider/worker/GCMetricPersistenceGraph.java} | 22 +--
.../worker}/GCMetricPersistenceWorker.java | 24 +--
.../worker}/InstHeartBeatPersistenceWorker.java | 24 +--
.../worker/InstanceHeartBeatPersistenceGraph.java} | 22 +--
.../worker/MemoryMetricPersistenceGraph.java} | 22 +--
.../worker}/MemoryMetricPersistenceWorker.java | 24 +--
.../worker/MemoryPoolMetricPersistenceGraph.java} | 22 +--
.../worker}/MemoryPoolMetricPersistenceWorker.java | 24 +--
...alking.apm.collector.core.module.ModuleProvider | 3 +-
.../analysis-jvm}/pom.xml | 11 +-
.../analysis-metric/metric-define}/pom.xml | 6 +-
.../metric/define/AnalysisMetricModule.java} | 10 +-
.../analysis/metric/define}/MetricSource.java | 15 +-
.../metric/define/graph/MetricGraphIdDefine.java | 39 +++++
.../metric/define/graph/MetricWorkerIdDefine.java | 73 ++++++++
...che.skywalking.apm.collector.core.module.Module | 3 +-
.../analysis-metric/metric-provider}/pom.xml | 19 +-
.../provider/AnalysisMetricModuleProvider.java | 135 +++++++++++++++
.../ApplicationComponentAggregationWorker.java | 15 +-
.../application/ApplicationComponentGraph.java | 50 ++++++
.../ApplicationComponentPersistenceWorker.java | 22 +--
.../ApplicationComponentRemoteWorker.java | 14 +-
.../ApplicationComponentSpanListener.java | 43 ++---
.../ApplicationMappingAggregationWorker.java | 15 +-
.../application/ApplicationMappingGraph.java | 50 ++++++
.../ApplicationMappingPersistenceWorker.java | 24 +--
.../ApplicationMappingRemoteWorker.java | 14 +-
.../ApplicationMappingSpanListener.java | 42 +++--
.../ApplicationMetricAggregationWorker.java | 45 +++--
.../worker/application/ApplicationMetricGraph.java | 74 ++++++++
.../ApplicationMetricPersistenceWorker.java | 24 +--
.../application/ApplicationMetricRemoteWorker.java | 12 +-
...pplicationReferenceMetricAggregationWorker.java | 45 +++--
.../ApplicationReferenceMetricGraph.java | 72 ++++++++
...pplicationReferenceMetricPersistenceWorker.java | 24 ++-
.../ApplicationReferenceMetricRemoteWorker.java | 13 +-
.../provider/worker/global/GlobalTraceGraph.java} | 22 +--
.../global/GlobalTracePersistenceWorker.java | 22 +--
.../worker}/global/GlobalTraceSpanListener.java | 24 ++-
.../InstanceMappingAggregationWorker.java} | 27 ++-
.../worker/instance/InstanceMappingGraph.java | 50 ++++++
.../InstanceMappingPersistenceWorker.java} | 36 ++--
.../instance/InstanceMappingRemoteWorker.java} | 36 ++--
.../instance/InstanceMappingSpanListener.java | 85 +++++++++
.../instance/InstanceMetricAggregationWorker.java | 84 +++++++++
.../worker/instance/InstanceMetricGraph.java | 74 ++++++++
.../instance/InstanceMetricPersistenceWorker.java | 24 +--
.../instance/InstanceMetricRemoteWorker.java} | 31 ++--
.../InstanceReferenceMetricAggregationWorker.java | 28 +--
.../instance/InstanceReferenceMetricGraph.java | 72 ++++++++
.../InstanceReferenceMetricRemoteWorker.java | 17 +-
.../InstanceReferencePersistenceWorker.java | 27 ++-
.../provider/worker/segment/SegmentCostGraph.java} | 22 +--
.../segment/SegmentCostPersistenceWorker.java | 24 +--
.../worker}/segment/SegmentCostSpanListener.java | 25 ++-
.../service/ServiceEntryAggregationWorker.java | 15 +-
.../provider/worker/service/ServiceEntryGraph.java | 50 ++++++
.../service/ServiceEntryPersistenceWorker.java | 24 +--
.../worker}/service/ServiceEntryRemoteWorker.java | 14 +-
.../worker}/service/ServiceEntrySpanListener.java | 21 ++-
.../service/ServiceMetricAggregationWorker.java | 89 ++++++++++
.../worker/service/ServiceMetricGraph.java | 72 ++++++++
.../service/ServiceMetricPersistenceWorker.java | 24 +--
.../worker}/service/ServiceMetricRemoteWorker.java | 14 +-
.../ServiceReferenceMetricAggregationWorker.java | 16 +-
.../service/ServiceReferenceMetricGraph.java | 50 ++++++
.../ServiceReferenceMetricPersistenceWorker.java | 25 ++-
.../ServiceReferenceMetricRemoteWorker.java | 15 +-
.../ServiceReferenceMetricSpanListener.java | 117 +++++++------
...alking.apm.collector.core.module.ModuleProvider | 3 +-
.../analysis-metric}/pom.xml | 11 +-
.../analysis-register}/pom.xml | 11 +-
.../analysis-register/register-define}/pom.xml | 6 +-
.../register/define/AnalysisRegisterModule.java} | 13 +-
.../register/define/graph/GraphIdDefine.java} | 6 +-
.../register/define/graph/WorkerIdDefine.java} | 25 ++-
.../define/service}/IApplicationIDService.java | 7 +-
.../define/service}/IInstanceIDService.java | 7 +-
.../define/service/INetworkAddressIDService.java} | 7 +-
.../define/service}/IServiceNameService.java | 2 +-
...che.skywalking.apm.collector.core.module.Module | 3 +-
.../analysis-register/register-provider}/pom.xml | 12 +-
.../provider/AnalysisRegisterModuleProvider.java | 96 +++++++++++
.../register/ApplicationRegisterGraph.java | 49 ++++++
.../register/ApplicationRegisterRemoteWorker.java | 14 +-
.../register/ApplicationRegisterSerialWorker.java | 34 ++--
.../provider/register}/IdAutoIncrement.java | 2 +-
.../provider/register/InstanceRegisterGraph.java | 49 ++++++
.../register/InstanceRegisterRemoteWorker.java | 12 +-
.../register/InstanceRegisterSerialWorker.java | 39 +++--
.../register/NetworkAddressRegisterGraph.java | 49 ++++++
.../NetworkAddressRegisterRemoteWorker.java} | 30 ++--
.../NetworkAddressRegisterSerialWorker.java | 91 ++++++++++
.../register/ServiceNameRegisterGraph.java | 49 ++++++
.../register/ServiceNameRegisterRemoteWorker.java | 12 +-
.../register/ServiceNameRegisterSerialWorker.java | 20 +--
.../provider/service}/ApplicationIDService.java | 42 ++++-
.../provider/service}/InstanceIDService.java | 42 +++--
.../provider/service/NetworkAddressIDService.java | 104 +++++++++++
.../provider/service}/ServiceNameService.java | 11 +-
...alking.apm.collector.core.module.ModuleProvider | 3 +-
.../analysis-segment-parser}/pom.xml | 13 +-
.../segment-parser-define}/pom.xml | 6 +-
.../define/AnalysisSegmentParserModule.java} | 11 +-
.../define/decorator}/ReferenceDecorator.java | 2 +-
.../parser/define/decorator}/SegmentDecorator.java | 17 +-
.../parser/define/decorator}/SpanDecorator.java | 20 ++-
.../parser/define/decorator}/StandardBuilder.java | 2 +-
.../parser/define/graph/GraphIdDefine.java} | 13 +-
.../parser/define/graph/WorkerIdDefine.java} | 9 +-
.../parser/define/listener}/EntrySpanListener.java | 7 +-
.../parser/define/listener}/ExitSpanListener.java | 5 +-
.../parser/define/listener}/FirstSpanListener.java | 5 +-
.../define/listener}/GlobalTraceIdsListener.java | 3 +-
.../parser/define/listener}/LocalSpanListener.java | 5 +-
.../parser/define/listener}/SpanListener.java | 3 +-
.../define/listener/SpanListenerFactory.java} | 12 +-
.../define/service/ISegmentParseService.java} | 11 +-
.../service/ISegmentParserListenerRegister.java} | 8 +-
...che.skywalking.apm.collector.core.module.Module | 3 +-
.../segment-parser-provider}/pom.xml | 16 +-
.../AnalysisSegmentParserModuleProvider.java | 92 ++++++++++
.../parser/provider}/buffer/BufferFileConfig.java | 2 +-
.../segment/parser/provider}/buffer/Offset.java | 2 +-
.../parser/provider}/buffer/OffsetManager.java | 5 +-
.../provider}/buffer/SegmentBufferManager.java | 2 +-
.../provider}/buffer/SegmentBufferReader.java | 16 +-
.../parser/provider}/parser/SegmentParse.java | 66 ++++---
.../parser/SegmentParserListenerManager.java} | 23 ++-
.../provider/parser/SegmentPersistenceGraph.java} | 22 +--
.../provider/parser}/SegmentPersistenceWorker.java | 22 +--
.../parser/standardization/IdExchanger.java | 3 +-
.../standardization/ReferenceIdExchanger.java | 34 ++--
.../standardization/SegmentStandardization.java | 2 +-
.../SegmentStandardizationGraph.java} | 21 +--
.../SegmentStandardizationWorker.java | 19 +-
.../parser/standardization/SpanIdExchanger.java | 20 ++-
.../provider/service/SegmentParseService.java} | 20 ++-
.../service/SegmentParserListenerRegister.java} | 21 ++-
...alking.apm.collector.core.module.ModuleProvider | 3 +-
.../analysis-worker-model}/pom.xml | 13 +-
.../model}/base/AbstractLocalAsyncWorker.java | 6 +-
.../base/AbstractLocalAsyncWorkerProvider.java | 22 +--
.../worker/model}/base/AbstractRemoteWorker.java | 3 +-
.../model}/base/AbstractRemoteWorkerProvider.java | 5 +-
.../worker/model}/base/AbstractWorker.java | 6 +-
.../worker/model}/base/AbstractWorkerProvider.java | 6 +-
.../worker/model/base/LocalAsyncWorkerRef.java | 78 +++++++++
.../analysis/worker/model}/base/Provider.java | 3 +-
.../model}/base/ProviderNotFoundException.java | 3 +-
.../worker/model}/base/RemoteWorkerRef.java | 3 +-
.../worker/model}/base/WorkerCreateListener.java | 5 +-
.../worker/model}/base/WorkerException.java | 3 +-
.../analysis/worker/model}/base/WorkerRef.java | 3 +-
.../worker/model}/impl/AggregationWorker.java | 13 +-
.../worker/model}/impl/FlushAndSwitch.java | 3 +-
.../analysis/worker/model/impl}/MessageHolder.java | 2 +-
.../worker/model}/impl/PersistenceWorker.java | 38 ++--
.../model/impl/PersistenceWorkerProvider.java} | 13 +-
.../worker/model}/impl/data/DataCache.java | 2 +-
.../worker/model}/impl/data/DataCollection.java | 2 +-
.../analysis/worker}/timer/PersistenceTimer.java | 15 +-
.../pom.xml | 13 +-
...org.skywalking.apm.collector.core.module.Module | 2 -
apm-collector/apm-collector-baseline/pom.xml | 45 -----
apm-collector/apm-collector-boot/docker/log4j2.xml | 4 +-
apm-collector/apm-collector-boot/pom.xml | 53 +++---
.../src/main/assembly/log4j2.xml | 4 +-
.../apm/collector/boot/CollectorBootStartUp.java | 14 +-
.../src/main/resources/application.yml | 17 +-
.../src/main/resources/log4j2.xml | 4 +-
.../apm/collector/cache/CacheModule.java | 4 +-
.../cache/service/ApplicationCacheService.java | 7 +-
.../cache/service/InstanceCacheService.java | 7 +-
...ervice.java => NetworkAddressCacheService.java} | 7 +-
.../cache/guava/CacheModuleGuavaProvider.java | 10 +-
.../service/ApplicationCacheGuavaService.java | 28 ++-
.../guava/service/InstanceCacheGuavaService.java | 45 +++--
.../service/NetworAddressCacheGuavaService.java | 91 ++++++++++
.../configuration/ConfigurationModule.java | 12 +-
.../service/IApplicationAlarmRuleConfig.java} | 13 +-
.../IApplicationReferenceAlarmRuleConfig.java} | 13 +-
.../service/IInstanceAlarmRuleConfig.java} | 13 +-
.../IInstanceReferenceAlarmRuleConfig.java} | 13 +-
.../service/IServiceAlarmRuleConfig.java} | 13 +-
.../service/IServiceReferenceAlarmRuleConfig.java} | 13 +-
.../configuration/ConfigurationModuleProvider.java | 41 ++++-
.../service/ApdexThresholdService.java | 9 +-
...ervice.java => ApplicationAlarmRuleConfig.java} | 35 ++--
...va => ApplicationReferenceAlarmRuleConfig.java} | 35 ++--
...ldService.java => InstanceAlarmRuleConfig.java} | 35 ++--
....java => InstanceReferenceAlarmRuleConfig.java} | 35 ++--
...oldService.java => ServiceAlarmRuleConfig.java} | 35 ++--
...e.java => ServiceReferenceAlarmRuleConfig.java} | 35 ++--
.../apm/collector/core/graph/GraphManager.java | 5 +-
.../apm/collector/core/graph/GraphNodeFinder.java | 20 ++-
.../apm/collector/core/module/BootstrapFlow.java | 7 +-
.../skywalking/apm/collector/core/util/Const.java | 6 +-
.../apm/collector/core}/util/FileUtils.java | 3 +-
.../collector/core/util/NumberFormatUtils.java} | 17 +-
.../src/main/resources/application-default.yml | 21 ++-
.../apm/collector/core/graph/GraphManagerTest.java | 5 +-
.../core/util/NumberFormatUtilsTest.java} | 35 ++--
.../grpc/manager/GRPCManagerProvider.java | 2 +-
.../jetty/manager/JettyManagerProvider.java | 2 +-
.../QueueModuleDataCarrierProvider.java | 58 -------
.../service/DataCarrierQueueCreatorService.java | 34 ----
...alking.apm.collector.core.module.ModuleProvider | 20 ---
.../collector/queue/base/DaemonThreadFactory.java | 36 ----
.../apm/collector/queue/base/QueueCreator.java | 27 ---
.../collector/queue/base/QueueEventHandler.java | 27 ---
.../apm/collector/queue/base/QueueExecutor.java | 28 ---
.../queue/service/QueueCreatorService.java | 31 ----
...che.skywalking.apm.collector.core.module.Module | 20 ---
.../disruptor/QueueModuleDisruptorProvider.java | 58 -------
.../disruptor/base/DisruptorEventHandler.java | 76 --------
.../disruptor/base/DisruptorQueueCreator.java | 72 --------
.../service/DisruptorQueueCreatorService.java | 41 -----
...alking.apm.collector.core.module.ModuleProvider | 20 ---
apm-collector/apm-collector-queue/pom.xml | 45 -----
.../src/main/proto/RemoteCommonService.proto | 1 -
.../apm/collector/storage/StorageModule.java | 52 ++++--
...va => IApplicationAlarmListPersistenceDAO.java} | 5 +-
...O.java => IApplicationAlarmPersistenceDAO.java} | 5 +-
.../storage/dao/IApplicationCacheDAO.java | 5 +-
.../dao/IApplicationComponentPersistenceDAO.java | 5 +-
.../storage/dao/IApplicationComponentUIDAO.java | 1 -
.../dao/IApplicationMappingPersistenceDAO.java | 5 +-
.../storage/dao/IApplicationMappingUIDAO.java | 1 -
.../dao/IApplicationMetricPersistenceDAO.java | 5 +-
...plicationReferenceAlarmListPersistenceDAO.java} | 5 +-
... IApplicationReferenceAlarmPersistenceDAO.java} | 5 +-
.../IApplicationReferenceMetricPersistenceDAO.java | 5 +-
.../dao/IApplicationReferenceMetricUIDAO.java | 1 -
.../storage/dao/IApplicationRegisterDAO.java | 1 -
.../storage/dao/ICpuMetricPersistenceDAO.java | 5 +-
.../apm/collector/storage/dao/ICpuMetricUIDAO.java | 1 -
.../storage/dao/IGCMetricPersistenceDAO.java | 5 +-
.../apm/collector/storage/dao/IGCMetricUIDAO.java | 1 -
.../storage/dao/IGlobalTracePersistenceDAO.java | 5 +-
.../collector/storage/dao/IGlobalTraceUIDAO.java | 1 -
....java => IInstanceAlarmListPersistenceDAO.java} | 5 +-
...eDAO.java => IInstanceAlarmPersistenceDAO.java} | 5 +-
.../collector/storage/dao/IInstanceCacheDAO.java | 5 +-
.../dao/IInstanceHeartBeatPersistenceDAO.java | 5 +-
...AO.java => IInstanceMappingPersistenceDAO.java} | 5 +-
.../storage/dao/IInstanceMetricPersistenceDAO.java | 5 +-
.../storage/dao/IInstanceMetricUIDAO.java | 1 -
...IInstanceReferenceAlarmListPersistenceDAO.java} | 5 +-
... => IInstanceReferenceAlarmPersistenceDAO.java} | 5 +-
.../IInstanceReferenceMetricPersistenceDAO.java | 5 +-
.../storage/dao/IInstanceRegisterDAO.java | 1 -
.../apm/collector/storage/dao/IInstanceUIDAO.java | 1 -
.../storage/dao/IMemoryMetricPersistenceDAO.java | 5 +-
.../collector/storage/dao/IMemoryMetricUIDAO.java | 1 -
.../dao/IMemoryPoolMetricPersistenceDAO.java | 5 +-
.../storage/dao/IMemoryPoolMetricUIDAO.java | 1 -
...pingUIDAO.java => INetworkAddressCacheDAO.java} | 8 +-
...terDAO.java => INetworkAddressRegisterDAO.java} | 11 +-
.../storage/dao/ISegmentCostPersistenceDAO.java | 5 +-
.../collector/storage/dao/ISegmentCostUIDAO.java | 1 -
.../storage/dao/ISegmentPersistenceDAO.java | 5 +-
.../apm/collector/storage/dao/ISegmentUIDAO.java | 1 -
...O.java => IServiceAlarmListPersistenceDAO.java} | 5 +-
...ceDAO.java => IServiceAlarmPersistenceDAO.java} | 5 +-
.../storage/dao/IServiceEntryPersistenceDAO.java | 5 +-
.../collector/storage/dao/IServiceEntryUIDAO.java | 1 -
.../storage/dao/IServiceMetricPersistenceDAO.java | 5 +-
.../storage/dao/IServiceNameCacheDAO.java | 1 -
.../storage/dao/IServiceNameRegisterDAO.java | 1 -
... IServiceReferenceAlarmListPersistenceDAO.java} | 5 +-
...a => IServiceReferenceAlarmPersistenceDAO.java} | 5 +-
.../dao/IServiceReferenceMetricPersistenceDAO.java | 5 +-
.../storage/dao/IServiceReferenceUIDAO.java | 1 -
.../collector/storage/table/CommonMetricTable.java | 4 +-
.../apm/collector/storage/table/Metric.java | 81 +++++++++
.../apm/collector/storage/table/alarm/Alarm.java} | 27 +--
.../alarm/AlarmType.java} | 19 +-
.../Instance.java => alarm/ApplicationAlarm.java} | 83 +++++----
.../ApplicationAlarmList.java} | 75 ++++----
.../ApplicationAlarmListTable.java} | 10 +-
.../ApplicationAlarmTable.java} | 11 +-
.../ApplicationReferenceAlarm.java} | 78 ++++-----
.../ApplicationReferenceAlarmList.java} | 76 ++++----
.../ApplicationReferenceAlarmListTable.java} | 12 +-
.../ApplicationReferenceAlarmTable.java} | 19 +-
.../AlertingList.java => alarm/InstanceAlarm.java} | 78 ++++-----
.../Instance.java => alarm/InstanceAlarmList.java} | 74 ++++----
.../InstanceAlarmListTable.java} | 10 +-
.../InstanceAlarmTable.java} | 11 +-
.../table/alarm/InstanceReferenceAlarm.java | 130 ++++++++++++++
.../table/alarm/InstanceReferenceAlarmList.java | 122 +++++++++++++
.../InstanceReferenceAlarmListTable.java} | 14 +-
.../InstanceReferenceAlarmTable.java} | 15 +-
.../AlertingList.java => alarm/ServiceAlarm.java} | 79 +++++----
.../Instance.java => alarm/ServiceAlarmList.java} | 83 +++++----
.../ServiceAlarmListTable.java} | 10 +-
.../ServiceAlarmTable.java} | 11 +-
.../storage/table/alarm/ServiceReferenceAlarm.java | 148 ++++++++++++++++
.../table/alarm/ServiceReferenceAlarmList.java | 140 +++++++++++++++
.../ServiceReferenceAlarmListTable.java} | 15 +-
.../ServiceReferenceAlarmTable.java} | 16 +-
.../table/application/ApplicationMetric.java | 50 +++++-
.../application/ApplicationReferenceMetric.java | 80 ++++++---
.../ApplicationReferenceMetricTable.java | 3 +-
.../InstanceMapping.java} | 53 ++++--
.../InstanceMappingTable.java} | 10 +-
.../storage/table/instance/InstanceMetric.java | 49 +++++-
.../table/instance/InstanceReferenceMetric.java | 72 ++++++--
.../instance/InstanceReferenceMetricTable.java | 3 +-
.../storage/table/register/Application.java | 25 ++-
.../storage/table/register/ApplicationTable.java | 3 +-
.../collector/storage/table/register/Instance.java | 27 ++-
.../storage/table/register/InstanceTable.java | 3 +-
.../{Application.java => NetworkAddress.java} | 34 ++--
...licationTable.java => NetworkAddressTable.java} | 9 +-
.../storage/table/service/ServiceMetric.java | 65 ++++++-
.../storage/table/service/ServiceMetricTable.java | 2 -
.../table/service/ServiceReferenceMetric.java | 69 +++++---
.../table/service/ServiceReferenceMetricTable.java | 5 +-
.../collector/storage/es/DataTTLKeeperTimer.java | 21 +--
.../storage/es/StorageModuleEsProvider.java | 69 ++++++--
.../es/dao/AlertingListEsPersistenceDAO.java | 104 -----------
....java => ApplicationAlarmEsPersistenceDAO.java} | 71 ++++----
...a => ApplicationAlarmListEsPersistenceDAO.java} | 71 ++++----
.../dao/ApplicationComponentEsPersistenceDAO.java | 11 +-
.../es/dao/ApplicationComponentEsUIDAO.java | 3 +-
.../storage/es/dao/ApplicationEsCacheDAO.java | 43 ++++-
.../storage/es/dao/ApplicationEsRegisterDAO.java | 3 +-
.../es/dao/ApplicationMappingEsPersistenceDAO.java | 5 +-
.../storage/es/dao/ApplicationMappingEsUIDAO.java | 3 +-
.../es/dao/ApplicationMetricEsPersistenceDAO.java | 10 +-
.../ApplicationReferenceAlarmEsPersistenceDAO.java | 106 ++++++++++++
...licationReferenceAlarmListEsPersistenceDAO.java | 106 ++++++++++++
...ApplicationReferenceMetricEsPersistenceDAO.java | 8 +-
.../es/dao/ApplicationReferenceMetricEsUIDAO.java | 7 +-
.../storage/es/dao/CpuMetricEsPersistenceDAO.java | 11 +-
.../collector/storage/es/dao/CpuMetricEsUIDAO.java | 9 +-
.../storage/es/dao/GCMetricEsPersistenceDAO.java | 5 +-
.../collector/storage/es/dao/GCMetricEsUIDAO.java | 9 +-
.../es/dao/GlobalTraceEsPersistenceDAO.java | 5 +-
.../storage/es/dao/GlobalTraceEsUIDAO.java | 3 +-
.../es/dao/InstanceAlarmEsPersistenceDAO.java | 106 ++++++++++++
.../es/dao/InstanceAlarmListEsPersistenceDAO.java | 106 ++++++++++++
.../storage/es/dao/InstanceEsCacheDAO.java | 25 ++-
.../storage/es/dao/InstanceEsRegisterDAO.java | 3 +-
.../collector/storage/es/dao/InstanceEsUIDAO.java | 5 +-
.../es/dao/InstanceHeartBeatEsPersistenceDAO.java | 1 -
.../es/dao/InstanceMappingEsPersistenceDAO.java | 94 ++++++++++
.../es/dao/InstanceMetricEsPersistenceDAO.java | 8 +-
.../storage/es/dao/InstanceMetricEsUIDAO.java | 7 +-
.../InstanceReferenceAlarmEsPersistenceDAO.java | 112 ++++++++++++
...InstanceReferenceAlarmListEsPersistenceDAO.java | 112 ++++++++++++
.../InstanceReferenceMetricEsPersistenceDAO.java | 150 ++++++++++++++++
.../es/dao/MemoryMetricEsPersistenceDAO.java | 5 +-
.../storage/es/dao/MemoryMetricEsUIDAO.java | 5 +-
.../es/dao/MemoryPoolMetricEsPersistenceDAO.java | 5 +-
.../storage/es/dao/MemoryPoolMetricEsUIDAO.java | 7 +-
...CacheDAO.java => NetworkAddressEsCacheDAO.java} | 33 ++--
...erDAO.java => NetworkAddressRegisterEsDAO.java} | 33 ++--
.../es/dao/SegmentCostEsPersistenceDAO.java | 5 +-
.../storage/es/dao/SegmentCostEsUIDAO.java | 11 +-
.../storage/es/dao/SegmentEsPersistenceDAO.java | 9 +-
.../collector/storage/es/dao/SegmentEsUIDAO.java | 5 +-
.../es/dao/ServiceAlarmEsPersistenceDAO.java | 109 ++++++++++++
.../es/dao/ServiceAlarmListEsPersistenceDAO.java | 109 ++++++++++++
.../es/dao/ServiceEntryEsPersistenceDAO.java | 3 +-
.../storage/es/dao/ServiceEntryEsUIDAO.java | 7 +-
.../es/dao/ServiceMetricEsPersistenceDAO.java | 12 +-
.../storage/es/dao/ServiceNameEsCacheDAO.java | 1 -
.../storage/es/dao/ServiceNameEsRegisterDAO.java | 3 +-
.../dao/ServiceReferenceAlarmEsPersistenceDAO.java | 118 +++++++++++++
.../ServiceReferenceAlarmListEsPersistenceDAO.java | 118 +++++++++++++
.../storage/es/dao/ServiceReferenceEsUIDAO.java | 6 +-
.../ServiceReferenceMetricEsPersistenceDAO.java | 18 +-
...ine.java => ApplicationAlarmEsTableDefine.java} | 19 +-
...java => ApplicationAlarmListEsTableDefine.java} | 19 +-
.../es/define/ApplicationEsTableDefine.java | 3 +-
.../es/define/ApplicationMetricEsTableDefine.java | 63 +++++++
...=> ApplicationReferenceAlarmEsTableDefine.java} | 25 +--
...ApplicationReferenceAlarmListEsTableDefine.java | 49 ++++++
...Define.java => InstanceAlarmEsTableDefine.java} | 20 ++-
...ne.java => InstanceAlarmListEsTableDefine.java} | 20 ++-
.../storage/es/define/InstanceEsTableDefine.java | 5 +-
...fine.java => InstanceMappingEsTableDefine.java} | 15 +-
.../es/define/InstanceMetricEsTableDefine.java | 1 -
.../InstanceReferenceAlarmEsTableDefine.java | 51 ++++++
.../InstanceReferenceAlarmListEsTableDefine.java | 51 ++++++
.../InstanceReferenceMetricEsTableDefine.java | 59 +++++++
...efine.java => NetworkAddressEsTableDefine.java} | 15 +-
...eDefine.java => ServiceAlarmEsTableDefine.java} | 26 +--
...ine.java => ServiceAlarmListEsTableDefine.java} | 26 +--
.../define/ServiceReferenceAlarmEsTableDefine.java | 53 ++++++
.../ServiceReferenceAlarmListEsTableDefine.java | 53 ++++++
.../ServiceReferenceMetricEsTableDefine.java | 4 +-
.../main/resources/META-INF/defines/storage.define | 21 ++-
.../storage/h2/StorageModuleH2Provider.java | 76 ++++++--
.../h2/dao/AlertingListH2PersistenceDAO.java | 113 ------------
.../h2/dao/ApplicationAlarmH2PersistenceDAO.java | 55 ++++++
.../dao/ApplicationAlarmListH2PersistenceDAO.java | 55 ++++++
.../storage/h2/dao/ApplicationH2CacheDAO.java | 33 +++-
.../storage/h2/dao/ApplicationH2RegisterDAO.java | 5 +-
.../ApplicationReferenceAlarmH2PersistenceDAO.java | 55 ++++++
...licationReferenceAlarmListH2PersistenceDAO.java | 55 ++++++
.../h2/dao/InstanceAlarmH2PersistenceDAO.java | 55 ++++++
.../h2/dao/InstanceAlarmListH2PersistenceDAO.java | 55 ++++++
.../storage/h2/dao/InstanceH2CacheDAO.java | 29 +++-
.../storage/h2/dao/InstanceH2RegisterDAO.java | 8 +-
.../h2/dao/InstanceMappingH2PersistenceDAO.java | 101 +++++++++++
.../InstanceReferenceAlarmH2PersistenceDAO.java | 55 ++++++
...InstanceReferenceAlarmListH2PersistenceDAO.java | 55 ++++++
.../InstanceReferenceMetricH2PersistenceDAO.java | 145 ++++++++++++++++
...CacheDAO.java => NetworkAddressH2CacheDAO.java} | 32 ++--
...erDAO.java => NetworkAddressRegisterH2DAO.java} | 34 ++--
.../h2/dao/ServiceAlarmH2PersistenceDAO.java | 55 ++++++
.../h2/dao/ServiceAlarmListH2PersistenceDAO.java | 55 ++++++
.../dao/ServiceReferenceAlarmH2PersistenceDAO.java | 55 ++++++
.../ServiceReferenceAlarmListH2PersistenceDAO.java | 55 ++++++
.../storage/h2/dao/ServiceReferenceH2UIDAO.java | 7 +-
.../ServiceReferenceMetricH2PersistenceDAO.java | 6 +-
.../h2/define/AlertingListH2TableDefine.java | 47 -----
.../h2/define/ApplicationH2TableDefine.java | 5 +-
.../storage/h2/define/InstanceH2TableDefine.java | 5 +-
...fine.java => InstanceMappingH2TableDefine.java} | 19 +-
.../InstanceReferenceMetricH2TableDefine.java | 56 ++++++
...efine.java => NetworkAddressH2TableDefine.java} | 17 +-
.../ServiceReferenceMetricH2TableDefine.java | 1 -
.../main/resources/META-INF/defines/storage.define | 4 +-
.../stream/worker/base/LocalAsyncWorkerRef.java | 53 ------
.../stream/worker/base/UsedRoleNameException.java | 26 ---
.../stream/worker/base/WorkerInvokeException.java | 37 ----
.../application/ApplicationsGetHandler.java | 2 +-
.../instancehealth/InstanceHealthGetHandler.java | 2 +-
.../InstanceMetricGetOneTimeBucketHandler.java | 2 +-
.../InstanceMetricGetRangeTimeBucketHandler.java | 2 +-
.../instancemetric/InstanceOsInfoGetHandler.java | 2 +-
.../servicetree/EntryServiceGetHandler.java | 2 +-
.../servicetree/ServiceTreeGetByIdHandler.java | 2 +-
.../collector/ui/service/ApplicationService.java | 2 +-
.../ui/service/InstanceHealthService.java | 2 +-
.../collector/ui/service/ServiceTreeService.java | 2 +-
.../apm/collector/ui/service/SpanService.java | 2 +-
.../collector/ui/service/TraceDagDataBuilder.java | 10 +-
.../collector/ui/service/TraceStackService.java | 6 +-
apm-collector/pom.xml | 9 +-
592 files changed, 11053 insertions(+), 5378 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@skywalking.apache.org" <co...@skywalking.apache.org>.