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 1e117cf7191a3075fa160d72e6b6290339fbc714 Merge: af2c1b9 f461e1a Author: 吴晟 Wu Sheng <[email protected]> AuthorDate: Tue Jan 9 20:28:35 2018 +0800 Merge pull request #734 from peng-yongsheng/feature/data_refactor Pyramid aggregate. .../agent-grpc/agent-grpc-provider/pom.xml | 5 + .../grpc/provider/AgentModuleGRPCProvider.java | 3 +- .../handler/InstanceDiscoveryServiceHandler.java | 15 +- .../provider/handler/JVMMetricsServiceHandler.java | 8 - .../handler/InstHeartBeatServiceTestCase.java | 40 +++ .../handler/JVMMetricServiceHandlerTestCase.java | 94 +++++++ .../alarm/provider/worker/AlarmAssertWorker.java | 4 +- .../provider/worker/AlarmAssertWorkerProvider.java | 4 +- .../ApplicationMetricAlarmAssertWorker.java | 3 +- .../application/ApplicationMetricAlarmGraph.java | 2 +- ...pplicationMetricAlarmListPersistenceWorker.java | 2 +- .../ApplicationMetricAlarmPersistenceWorker.java | 2 +- .../ApplicationMetricAlarmToListNodeProcessor.java | 3 +- ...pplicationReferenceMetricAlarmAssertWorker.java | 3 +- .../ApplicationReferenceMetricAlarmGraph.java | 2 +- ...nReferenceMetricAlarmListPersistenceWorker.java | 2 +- ...ationReferenceMetricAlarmPersistenceWorker.java | 2 +- ...ionReferenceMetricAlarmToListNodeProcessor.java | 3 +- .../instance/InstanceMetricAlarmAssertWorker.java | 3 +- .../worker/instance/InstanceMetricAlarmGraph.java | 2 +- .../InstanceMetricAlarmListPersistenceWorker.java | 2 +- .../InstanceMetricAlarmPersistenceWorker.java | 2 +- .../InstanceMetricAlarmToListNodeProcessor.java | 3 +- .../InstanceReferenceMetricAlarmAssertWorker.java | 3 +- .../InstanceReferenceMetricAlarmGraph.java | 2 +- ...eReferenceMetricAlarmListPersistenceWorker.java | 2 +- ...tanceReferenceMetricAlarmPersistenceWorker.java | 2 +- ...nceReferenceMetricAlarmToListNodeProcessor.java | 3 +- .../service/ServiceMetricAlarmAssertWorker.java | 3 +- .../worker/service/ServiceMetricAlarmGraph.java | 2 +- .../ServiceMetricAlarmListPersistenceWorker.java | 2 +- .../ServiceMetricAlarmPersistenceWorker.java | 2 +- .../ServiceMetricAlarmToListNodeProcessor.java | 3 +- .../ServiceReferenceMetricAlarmAssertWorker.java | 3 +- .../service/ServiceReferenceMetricAlarmGraph.java | 2 +- ...eReferenceMetricAlarmListPersistenceWorker.java | 2 +- ...rviceReferenceMetricAlarmPersistenceWorker.java | 2 +- ...iceReferenceMetricAlarmToListNodeProcessor.java | 3 +- .../analysis/jvm/define/AnalysisJVMModule.java | 3 +- .../analysis/jvm/define/graph/GraphIdDefine.java | 1 - .../analysis/jvm/define/graph/WorkerIdDefine.java | 48 +++- .../jvm/define/service/IMemoryMetricService.java | 2 +- .../define/service/IMemoryPoolMetricService.java | 2 +- .../jvm/provider/AnalysisJVMModuleProvider.java | 15 +- .../jvm/provider/service/CpuMetricService.java | 8 +- .../jvm/provider/service/GCMetricService.java | 9 +- .../jvm/provider/service/MemoryMetricService.java | 12 +- .../provider/service/MemoryPoolMetricService.java | 12 +- .../CpuDayMetricPersistenceWorker.java} | 20 +- .../CpuDayMetricTransformNode.java} | 31 ++- .../CpuHourMetricPersistenceWorker.java} | 20 +- .../CpuHourMetricTransformNode.java} | 31 ++- .../provider/worker/cpu/CpuMetricBridgeNode.java} | 17 +- .../jvm/provider/worker/cpu/CpuMetricCopy.java} | 18 +- .../{ => cpu}/CpuMetricPersistenceGraph.java | 21 +- .../CpuMinuteMetricPersistenceWorker.java} | 20 +- .../CpuMinuteMetricTransformNode.java} | 31 ++- .../CpuMonthMetricPersistenceWorker.java} | 20 +- .../CpuMonthMetricTransformNode.java} | 31 ++- .../CpuSecondMetricPersistenceWorker.java} | 18 +- .../GCDayMetricPersistenceWorker.java} | 20 +- .../GCDayMetricTransformNode.java} | 31 ++- .../GCHourMetricPersistenceWorker.java} | 20 +- .../GCHourMetricTransformNode.java} | 31 ++- .../provider/worker/gc/GCMetricBridgeNode.java} | 17 +- .../jvm/provider/worker/gc/GCMetricCopy.java} | 20 +- .../worker/{ => gc}/GCMetricPersistenceGraph.java | 21 +- .../GCMinuteMetricPersistenceWorker.java} | 20 +- .../GCMinuteMetricTransformNode.java} | 31 ++- .../GCMonthMetricPersistenceWorker.java} | 20 +- .../GCMonthMetricTransformNode.java} | 31 ++- .../GCSecondMetricPersistenceWorker.java} | 18 +- .../MemoryDayMetricPersistenceWorker.java} | 20 +- .../MemoryDayMetricTransformNode.java} | 31 ++- .../MemoryHourMetricPersistenceWorker.java} | 28 +- .../MemoryHourMetricTransformNode.java} | 31 ++- .../worker/memory/MemoryMetricBridgeNode.java} | 17 +- .../MemoryMetricCopy.java} | 31 ++- .../{ => memory}/MemoryMetricPersistenceGraph.java | 21 +- .../MemoryMinuteMetricPersistenceWorker.java} | 20 +- .../MemoryMinuteMetricTransformNode.java} | 31 ++- .../MemoryMonthMetricPersistenceWorker.java} | 20 +- .../MemoryMonthMetricTransformNode.java} | 31 ++- .../MemorySecondMetricPersistenceWorker.java} | 18 +- .../MemoryPoolDayMetricPersistenceWorker.java} | 20 +- .../MemoryPoolDayMetricTransformNode.java} | 31 ++- .../MemoryPoolHourMetricPersistenceWorker.java} | 20 +- .../MemoryPoolHourMetricTransformNode.java} | 31 ++- .../memorypool/MemoryPoolMetricBridgeNode.java} | 16 +- .../MemoryPoolMetricCopy.java} | 31 ++- .../MemoryPoolMetricPersistenceGraph.java | 21 +- .../MemoryPoolMinuteMetricPersistenceWorker.java} | 20 +- .../MemoryPoolMinuteMetricTransformNode.java} | 31 ++- .../MemoryPoolMonthMetricPersistenceWorker.java} | 20 +- .../MemoryPoolMonthMetricTransformNode.java} | 31 ++- .../MemoryPoolSecondMetricPersistenceWorker.java} | 18 +- .../metric/define/AnalysisMetricModule.java | 3 +- .../metric/define/graph/MetricGraphIdDefine.java | 3 +- .../metric/define/graph/MetricWorkerIdDefine.java | 112 ++++++-- .../define/service/IInstanceHeartBeatService.java | 4 +- .../provider/AnalysisMetricModuleProvider.java | 39 +-- .../provider/service/InstanceHeartBeatService.java | 13 +- .../component/ApplicationComponentCopy.java} | 16 +- .../ApplicationComponentDayPersistenceWorker.java} | 18 +- .../ApplicationComponentDayTransformNode.java | 46 ++++ .../{ => component}/ApplicationComponentGraph.java | 21 +- ...ApplicationComponentHourPersistenceWorker.java} | 18 +- .../ApplicationComponentHourTransformNode.java | 46 ++++ ...plicationComponentMinuteAggregationWorker.java} | 14 +- ...plicationComponentMinutePersistenceWorker.java} | 22 +- .../ApplicationComponentMinuteRemoteWorker.java} | 14 +- ...pplicationComponentMonthPersistenceWorker.java} | 18 +- .../ApplicationComponentMonthTransformNode.java | 46 ++++ .../ApplicationComponentSpanListener.java | 18 +- .../mapping/ApplicationMappingCopy.java} | 16 +- .../ApplicationMappingDayPersistenceWorker.java} | 18 +- .../ApplicationMappingDayTransformNode.java} | 37 +-- .../{ => mapping}/ApplicationMappingGraph.java | 21 +- .../ApplicationMappingHourPersistenceWorker.java} | 18 +- .../ApplicationMappingHourTransformNode.java} | 37 +-- ...ApplicationMappingMinuteAggregationWorker.java} | 14 +- ...ApplicationMappingMinutePersistenceWorker.java} | 18 +- .../ApplicationMappingMinuteRemoteWorker.java} | 14 +- .../ApplicationMappingMonthPersistenceWorker.java} | 18 +- .../ApplicationMappingMonthTransformNode.java} | 37 +-- .../ApplicationMappingSpanListener.java | 11 +- .../ApplicationDayMetricPersistenceWorker.java} | 18 +- .../metric/ApplicationDayMetricTransformNode.java | 46 ++++ .../ApplicationHourMetricPersistenceWorker.java} | 18 +- .../metric/ApplicationHourMetricTransformNode.java | 46 ++++ .../application/metric/ApplicationMetricCopy.java | 59 ++++ .../{ => metric}/ApplicationMetricGraph.java | 22 +- .../ApplicationMinuteMetricAggregationWorker.java} | 25 +- .../ApplicationMinuteMetricPersistenceWorker.java} | 18 +- .../ApplicationMinuteMetricRemoteWorker.java} | 14 +- .../ApplicationMonthMetricPersistenceWorker.java} | 18 +- .../ApplicationMonthMetricTransformNode.java | 46 ++++ ...cationReferenceDayMetricPersistenceWorker.java} | 18 +- ...ApplicationReferenceDayMetricTransformNode.java | 46 ++++ ...ationReferenceHourMetricPersistenceWorker.java} | 18 +- ...pplicationReferenceHourMetricTransformNode.java | 46 ++++ .../refmetric/ApplicationReferenceMetricCopy.java | 60 ++++ .../ApplicationReferenceMetricGraph.java | 22 +- ...ionReferenceMinuteMetricAggregationWorker.java} | 24 +- ...ionReferenceMinuteMetricPersistenceWorker.java} | 18 +- ...licationReferenceMinuteMetricRemoteWorker.java} | 14 +- ...tionReferenceMonthMetricPersistenceWorker.java} | 18 +- ...plicationReferenceMonthMetricTransformNode.java | 46 ++++ .../worker/global/GlobalTraceSpanListener.java | 3 +- .../heartbeat}/InstHeartBeatPersistenceWorker.java | 6 +- .../InstanceHeartBeatPersistenceGraph.java | 6 +- .../instance/mapping/InstanceMappingCopy.java} | 17 +- .../InstanceMappingDayPersistenceWorker.java} | 18 +- .../InstanceMappingDayTransformNode.java} | 36 +-- .../{ => mapping}/InstanceMappingGraph.java | 21 +- .../InstanceMappingHourPersistenceWorker.java} | 18 +- .../InstanceMappingHourTransformNode.java} | 36 +-- .../InstanceMappingMinuteAggregationWorker.java} | 14 +- .../InstanceMappingMinutePersistenceWorker.java} | 18 +- .../InstanceMappingMinuteRemoteWorker.java} | 14 +- .../InstanceMappingMonthPersistenceWorker.java} | 18 +- .../InstanceMappingMonthTransformNode.java} | 36 +-- .../{ => mapping}/InstanceMappingSpanListener.java | 10 +- .../InstanceDayMetricPersistenceWorker.java} | 18 +- .../InstanceDayMetricTransformNode.java} | 38 +-- .../InstanceHourMetricPersistenceWorker.java} | 18 +- .../InstanceHourMetricTransformNode.java} | 38 +-- .../worker/instance/metric/InstanceMetricCopy.java | 55 ++++ .../instance/{ => metric}/InstanceMetricGraph.java | 22 +- .../InstanceMinuteMetricAggregationWorker.java} | 22 +- .../InstanceMinuteMetricPersistenceWorker.java} | 18 +- .../InstanceMinuteMetricRemoteWorker.java} | 14 +- .../InstanceMonthMetricPersistenceWorker.java} | 18 +- .../InstanceMonthMetricTransformNode.java} | 38 +-- ...stanceReferenceDayMetricPersistenceWorker.java} | 18 +- .../InstanceReferenceDayMetricTransformNode.java | 45 +++ ...tanceReferenceHourMetricPersistenceWorker.java} | 18 +- .../InstanceReferenceHourMetricTransformNode.java | 45 +++ .../refmetric/InstanceReferenceMetricCopy.java | 58 ++++ .../InstanceReferenceMetricGraph.java | 22 +- ...nceReferenceMinuteMetricAggregationWorker.java} | 24 +- ...nceReferenceMinuteMetricPersistenceWorker.java} | 18 +- ...InstanceReferenceMinuteMetricRemoteWorker.java} | 14 +- ...anceReferenceMonthMetricPersistenceWorker.java} | 18 +- .../InstanceReferenceMonthMetricTransformNode.java | 45 +++ .../worker/segment/SegmentCostSpanListener.java | 5 +- .../provider/worker/service/ServiceEntryGraph.java | 50 ---- .../worker/service/ServiceEntryRemoteWorker.java | 61 ---- .../worker/service/ServiceEntrySpanListener.java | 96 ------- .../ServiceDayMetricPersistenceWorker.java} | 18 +- .../ServiceDayMetricTransformNode.java} | 38 +-- .../ServiceHourMetricPersistenceWorker.java} | 27 +- .../ServiceHourMetricTransformNode.java} | 38 +-- .../worker/service/metric/ServiceMetricCopy.java | 57 ++++ .../service/{ => metric}/ServiceMetricGraph.java | 22 +- .../ServiceMetricMinuteAggregationWorker.java} | 22 +- .../ServiceMinuteMetricPersistenceWorker.java} | 18 +- .../ServiceMinuteMetricRemoteWorker.java} | 14 +- .../ServiceMonthMetricPersistenceWorker.java} | 18 +- .../ServiceMonthMetricTransformNode.java} | 38 +-- ...erviceReferenceDayMetricPersistenceWorker.java} | 18 +- .../ServiceReferenceDayMetricTransformNode.java} | 37 +-- ...rviceReferenceHourMetricPersistenceWorker.java} | 18 +- .../ServiceReferenceHourMetricTransformNode.java} | 37 +-- .../refmetric/ServiceReferenceMetricCopy.java | 59 ++++ .../ServiceReferenceMetricGraph.java | 21 +- .../ServiceReferenceMetricSpanListener.java | 18 +- ...iceReferenceMinuteMetricAggregationWorker.java} | 14 +- ...iceReferenceMinuteMetricPersistenceWorker.java} | 18 +- .../ServiceReferenceMinuteMetricRemoteWorker.java} | 14 +- ...viceReferenceMonthMetricPersistenceWorker.java} | 18 +- .../ServiceReferenceMonthMetricTransformNode.java} | 37 +-- .../register/ApplicationRegisterSerialWorker.java | 11 +- .../provider/register/IdAutoIncrement.java | 1 - .../register/InstanceRegisterSerialWorker.java | 11 +- .../NetworkAddressRegisterSerialWorker.java | 8 +- .../register/ServiceNameRegisterSerialWorker.java | 11 +- .../provider/service/ApplicationIDService.java | 6 +- .../provider/service/InstanceIDService.java | 11 +- .../provider/service/NetworkAddressIDService.java | 3 +- .../provider/service/ServiceNameService.java | 3 +- .../parser/provider/parser/SegmentParse.java | 3 +- .../standardization/SegmentStandardization.java | 26 +- .../model/base/AbstractLocalAsyncWorker.java | 4 +- .../base/AbstractLocalAsyncWorkerProvider.java | 4 +- .../worker/model/base/AbstractRemoteWorker.java | 4 +- .../model/base/AbstractRemoteWorkerProvider.java | 4 +- .../analysis/worker/model/base/AbstractWorker.java | 5 +- .../worker/model/base/AbstractWorkerProvider.java | 5 +- .../worker/model/base/LocalAsyncWorkerRef.java | 10 +- .../worker/model/base/RemoteWorkerRef.java | 4 +- .../worker/model/base/WorkerCreateListener.java | 2 +- .../analysis/worker/model/base/WorkerRef.java | 2 +- .../worker/model/impl/AggregationWorker.java | 9 +- .../worker/model/impl/PersistenceWorker.java | 4 +- .../model/impl/PersistenceWorkerProvider.java | 4 +- .../analysis/worker/model/impl/data/DataCache.java | 13 +- .../worker/model/impl/data/DataCollection.java | 13 +- .../service/ApplicationCacheGuavaService.java | 2 +- .../guava/service/InstanceCacheGuavaService.java | 2 +- .../service/NetworAddressCacheGuavaService.java | 2 +- .../guava/service/ServiceIdCacheGuavaService.java | 2 +- .../service/ServiceNameCacheGuavaService.java | 4 +- .../apm/collector/core/cache/Window.java | 1 - .../core/data/{Data.java => AbstractData.java} | 56 ++-- .../collector/core/data/AbstractHashMessage.java | 44 --- .../apm/collector/core/data/CommonTable.java | 2 +- .../skywalking/apm/collector/core/data/Data.java | 220 +++------------ .../core/data/{CommonTable.java => QueueData.java} | 12 +- .../apm/collector/core/data/RemoteData.java} | 5 +- .../apm/collector/core/data/StreamData.java | 54 ++++ .../apm/collector/core/data/TableDefine.java | 1 - .../collector/core/data/operator/AddOperation.java | 1 - .../core/data/operator/CoverOperation.java | 1 - .../{AddOperation.java => MaxOperation.java} | 27 +- .../{AddOperation.java => MinOperation.java} | 27 +- .../collector/core/data/operator/NonOperation.java | 1 - .../collector/core/queue/EndOfBatchContext.java} | 20 +- .../apm/collector/core/storage/TimePyramid.java} | 25 +- .../apm/collector/core/util/TimeBucketUtils.java | 29 +- .../core/data/AbstractHashMessageTest.java | 40 --- .../service/CommonRemoteDataRegisterService.java | 9 +- .../apm/collector/remote/service/RemoteClient.java | 5 +- .../remote/service/RemoteDataIDGetter.java | 5 +- .../remote/service/RemoteDataRegisterService.java | 9 +- .../remote/service/RemoteDeserializeService.java | 5 +- .../remote/service/RemoteSenderService.java | 5 +- .../remote/service/RemoteSerializeService.java | 5 +- .../grpc/handler/RemoteCommonServiceHandler.java | 6 +- .../remote/grpc/service/GRPCRemoteClient.java | 5 +- .../grpc/service/GRPCRemoteClientService.java | 1 - .../grpc/service/GRPCRemoteDeserializeService.java | 7 +- .../grpc/service/GRPCRemoteSenderService.java | 21 +- .../grpc/service/GRPCRemoteSerializeService.java | 4 +- .../service/selector/ForeverFirstSelector.java | 5 +- .../grpc/service/selector/HashCodeSelector.java | 7 +- .../service/selector/RemoteClientSelector.java | 5 +- .../grpc/service/selector/RollingSelector.java | 5 +- .../apm/collector/storage/StorageModule.java | 195 +++++++++---- .../storage/base/dao/IPersistenceDAO.java | 12 +- .../storage/dao/IGlobalTracePersistenceDAO.java | 2 +- .../dao/IInstanceHeartBeatPersistenceDAO.java | 2 +- .../collector/storage/dao/IServiceEntryUIDAO.java | 29 -- .../IApplicationComponentDayPersistenceDAO.java} | 4 +- .../IApplicationComponentHourPersistenceDAO.java} | 4 +- ...IApplicationComponentMinutePersistenceDAO.java} | 4 +- .../IApplicationComponentMonthPersistenceDAO.java} | 4 +- .../IApplicationAlarmListPersistenceDAO.java | 2 +- .../IApplicationAlarmPersistenceDAO.java | 2 +- ...pplicationReferenceAlarmListPersistenceDAO.java | 2 +- .../IApplicationReferenceAlarmPersistenceDAO.java | 2 +- .../IInstanceAlarmListPersistenceDAO.java | 2 +- .../{ => alarm}/IInstanceAlarmPersistenceDAO.java | 2 +- .../IInstanceReferenceAlarmListPersistenceDAO.java | 2 +- .../IInstanceReferenceAlarmPersistenceDAO.java | 2 +- .../IServiceAlarmListPersistenceDAO.java | 2 +- .../{ => alarm}/IServiceAlarmPersistenceDAO.java | 2 +- .../IServiceReferenceAlarmListPersistenceDAO.java | 2 +- .../IServiceReferenceAlarmPersistenceDAO.java | 2 +- .../IApplicationDayMetricPersistenceDAO.java} | 4 +- .../IApplicationHourMetricPersistenceDAO.java} | 4 +- .../IApplicationMinuteMetricPersistenceDAO.java} | 4 +- .../IApplicationMonthMetricPersistenceDAO.java} | 4 +- .../IApplicationMappingDayPersistenceDAO.java} | 6 +- .../IApplicationMappingHourPersistenceDAO.java} | 6 +- .../IApplicationMappingMinutePersistenceDAO.java} | 6 +- .../IApplicationMappingMonthPersistenceDAO.java} | 6 +- ...plicationReferenceDayMetricPersistenceDAO.java} | 4 +- ...licationReferenceHourMetricPersistenceDAO.java} | 4 +- ...cationReferenceMinuteMetricPersistenceDAO.java} | 4 +- ...icationReferenceMonthMetricPersistenceDAO.java} | 4 +- .../dao/{ => cache}/IApplicationCacheDAO.java | 2 +- .../storage/dao/{ => cache}/IInstanceCacheDAO.java | 2 +- .../dao/{ => cache}/INetworkAddressCacheDAO.java | 2 +- .../dao/{ => cache}/IServiceNameCacheDAO.java | 2 +- .../ICpuDayMetricPersistenceDAO.java} | 4 +- .../ICpuHourMetricPersistenceDAO.java} | 4 +- .../ICpuMinuteMetricPersistenceDAO.java} | 4 +- .../ICpuMonthMetricPersistenceDAO.java} | 4 +- .../ICpuSecondMetricPersistenceDAO.java} | 4 +- .../IGCDayMetricPersistenceDAO.java} | 4 +- .../IGCHourMetricPersistenceDAO.java} | 4 +- .../IGCMinuteMetricPersistenceDAO.java} | 4 +- .../IGCMonthMetricPersistenceDAO.java} | 4 +- .../IGCSecondMetricPersistenceDAO.java} | 4 +- .../IInstanceDayMetricPersistenceDAO.java} | 4 +- .../IInstanceHourMetricPersistenceDAO.java} | 4 +- .../IInstanceMinuteMetricPersistenceDAO.java} | 4 +- .../IInstanceMonthMetricPersistenceDAO.java} | 4 +- .../IInstanceMappingDayPersistenceDAO.java} | 4 +- .../IInstanceMappingHourPersistenceDAO.java} | 4 +- .../IInstanceMappingMinutePersistenceDAO.java} | 4 +- .../IInstanceMappingMonthPersistenceDAO.java} | 4 +- ...IInstanceReferenceDayMetricPersistenceDAO.java} | 4 +- ...InstanceReferenceHourMetricPersistenceDAO.java} | 4 +- ...stanceReferenceMinuteMetricPersistenceDAO.java} | 4 +- ...nstanceReferenceMonthMetricPersistenceDAO.java} | 4 +- .../IMemoryDayMetricPersistenceDAO.java} | 4 +- .../IMemoryHourMetricPersistenceDAO.java} | 4 +- .../IMemoryMinuteMetricPersistenceDAO.java} | 4 +- .../IMemoryMonthMetricPersistenceDAO.java} | 4 +- .../IMemorySecondMetricPersistenceDAO.java} | 4 +- .../IMemoryPoolDayMetricPersistenceDAO.java} | 4 +- .../IMemoryPoolHourMetricPersistenceDAO.java} | 4 +- .../IMemoryPoolMinuteMetricPersistenceDAO.java} | 4 +- .../IMemoryPoolMonthMetricPersistenceDAO.java} | 4 +- .../IMemoryPoolSecondMetricPersistenceDAO.java} | 4 +- .../{ => register}/IApplicationRegisterDAO.java | 2 +- .../dao/{ => register}/IInstanceRegisterDAO.java | 2 +- .../{ => register}/INetworkAddressRegisterDAO.java | 2 +- .../{ => register}/IServiceNameRegisterDAO.java | 2 +- .../IServiceDayMetricPersistenceDAO.java} | 4 +- .../IServiceHourMetricPersistenceDAO.java} | 6 +- .../IServiceMinuteMetricPersistenceDAO.java} | 4 +- .../IServiceMonthMetricPersistenceDAO.java} | 4 +- .../IServiceReferenceDayMetricPersistenceDAO.java} | 4 +- ...IServiceReferenceHourMetricPersistenceDAO.java} | 4 +- ...erviceReferenceMinuteMetricPersistenceDAO.java} | 4 +- ...ServiceReferenceMonthMetricPersistenceDAO.java} | 4 +- .../storage/table/alarm/ApplicationAlarm.java | 24 +- .../storage/table/alarm/ApplicationAlarmList.java | 24 +- .../table/alarm/ApplicationReferenceAlarm.java | 24 +- .../table/alarm/ApplicationReferenceAlarmList.java | 24 +- .../storage/table/alarm/InstanceAlarm.java | 24 +- .../storage/table/alarm/InstanceAlarmList.java | 24 +- .../table/alarm/InstanceReferenceAlarm.java | 24 +- .../table/alarm/InstanceReferenceAlarmList.java | 24 +- .../storage/table/alarm/ServiceAlarm.java | 24 +- .../storage/table/alarm/ServiceAlarmList.java | 24 +- .../storage/table/alarm/ServiceReferenceAlarm.java | 24 +- .../table/alarm/ServiceReferenceAlarmList.java | 24 +- .../table/application/ApplicationComponent.java | 29 +- .../table/application/ApplicationMapping.java | 29 +- .../table/application/ApplicationMetric.java | 25 +- .../application/ApplicationReferenceMetric.java | 25 +- .../storage/table/global/GlobalTrace.java | 25 +- .../storage/table/instance/InstanceMapping.java | 25 +- .../storage/table/instance/InstanceMetric.java | 26 +- .../table/instance/InstanceReferenceMetric.java | 25 +- .../apm/collector/storage/table/jvm/CpuMetric.java | 39 ++- .../storage/table/jvm/CpuMetricTable.java | 2 +- .../apm/collector/storage/table/jvm/GCMetric.java | 37 ++- .../collector/storage/table/jvm/GCMetricTable.java | 3 +- .../collector/storage/table/jvm/MemoryMetric.java | 52 +++- .../storage/table/jvm/MemoryMetricTable.java | 2 +- .../storage/table/jvm/MemoryPoolMetric.java | 55 +++- .../storage/table/jvm/MemoryPoolMetricTable.java | 2 +- .../storage/table/register/Application.java | 24 +- .../collector/storage/table/register/Instance.java | 22 +- .../storage/table/register/NetworkAddress.java | 22 +- .../storage/table/register/ServiceName.java | 25 +- .../collector/storage/table/segment/Segment.java | 25 +- .../storage/table/segment/SegmentCost.java | 25 +- .../storage/table/service/ServiceEntry.java | 93 ------- .../storage/table/service/ServiceEntryTable.java | 34 --- .../storage/table/service/ServiceMetric.java | 25 +- .../table/service/ServiceReferenceMetric.java | 25 +- .../collector/storage/es/DataTTLKeeperTimer.java | 27 +- .../storage/es/StorageModuleEsProvider.java | 306 +++++++++++++++------ .../storage/es/StorageModuleEsRegistration.java | 3 +- .../es/base/dao/AbstractPersistenceEsDAO.java | 83 ++++++ .../collector/storage/es/base/dao/BatchEsDAO.java | 8 +- .../apm/collector/storage/es/base/dao/EsDAO.java | 9 +- .../dao/ApplicationComponentEsPersistenceDAO.java | 91 ------ .../es/dao/ApplicationComponentEsUIDAO.java | 3 +- .../es/dao/ApplicationMappingEsPersistenceDAO.java | 90 ------ .../es/dao/ApplicationMetricEsPersistenceDAO.java | 147 ---------- ...ApplicationReferenceMetricEsPersistenceDAO.java | 151 ---------- .../storage/es/dao/CpuMetricEsPersistenceDAO.java | 76 ----- .../storage/es/dao/GCMetricEsPersistenceDAO.java | 77 ------ .../collector/storage/es/dao/InstanceEsUIDAO.java | 6 +- .../es/dao/InstanceHeartBeatEsPersistenceDAO.java | 8 +- .../es/dao/InstanceMappingEsPersistenceDAO.java | 94 ------- .../es/dao/InstanceMetricEsPersistenceDAO.java | 144 ---------- .../InstanceReferenceMetricEsPersistenceDAO.java | 150 ---------- .../es/dao/MemoryMetricEsPersistenceDAO.java | 79 ------ .../es/dao/MemoryPoolMetricEsPersistenceDAO.java | 79 ------ .../es/dao/ServiceEntryEsPersistenceDAO.java | 80 ------ .../storage/es/dao/ServiceEntryEsUIDAO.java | 98 ------- .../es/dao/ServiceMetricEsPersistenceDAO.java | 145 ---------- .../ServiceReferenceMetricEsPersistenceDAO.java | 154 ----------- ...stractApplicationComponentEsPersistenceDAO.java | 63 +++++ .../ApplicationComponentDayEsPersistenceDAO.java | 46 ++++ .../ApplicationComponentHourEsPersistenceDAO.java | 42 +++ ...ApplicationComponentMinuteEsPersistenceDAO.java | 42 +++ .../ApplicationComponentMonthEsPersistenceDAO.java | 42 +++ .../ApplicationAlarmEsPersistenceDAO.java | 8 +- .../ApplicationAlarmListEsPersistenceDAO.java | 7 +- .../ApplicationReferenceAlarmEsPersistenceDAO.java | 7 +- ...licationReferenceAlarmListEsPersistenceDAO.java | 7 +- .../{ => alarm}/InstanceAlarmEsPersistenceDAO.java | 7 +- .../InstanceAlarmListEsPersistenceDAO.java | 7 +- .../InstanceReferenceAlarmEsPersistenceDAO.java | 7 +- ...InstanceReferenceAlarmListEsPersistenceDAO.java | 7 +- .../{ => alarm}/ServiceAlarmEsPersistenceDAO.java | 7 +- .../ServiceAlarmListEsPersistenceDAO.java | 7 +- .../ServiceReferenceAlarmEsPersistenceDAO.java | 7 +- .../ServiceReferenceAlarmListEsPersistenceDAO.java | 7 +- .../AbstractApplicationMetricEsPersistenceDAO.java | 102 +++++++ .../amp/ApplicationDayMetricEsPersistenceDAO.java | 42 +++ .../amp/ApplicationHourMetricEsPersistenceDAO.java | 42 +++ .../ApplicationMinuteMetricEsPersistenceDAO.java | 42 +++ .../ApplicationMonthMetricEsPersistenceDAO.java | 42 +++ ...AbstractApplicationMappingEsPersistenceDAO.java | 63 +++++ .../ApplicationMappingDayEsPersistenceDAO.java | 42 +++ .../ApplicationMappingHourEsPersistenceDAO.java | 42 +++ .../ApplicationMappingMinuteEsPersistenceDAO.java | 42 +++ .../ApplicationMappingMonthEsPersistenceDAO.java | 42 +++ ...ApplicationReferenceMetricEsPersistenceDAO.java | 105 +++++++ ...licationReferenceDayMetricEsPersistenceDAO.java | 42 +++ ...icationReferenceHourMetricEsPersistenceDAO.java | 42 +++ ...ationReferenceMinuteMetricEsPersistenceDAO.java | 42 +++ ...cationReferenceMonthMetricEsPersistenceDAO.java | 42 +++ .../es/dao/{ => cache}/ApplicationEsCacheDAO.java | 4 +- .../es/dao/{ => cache}/InstanceEsCacheDAO.java | 4 +- .../dao/{ => cache}/NetworkAddressEsCacheDAO.java | 4 +- .../es/dao/{ => cache}/ServiceNameEsCacheDAO.java | 4 +- .../cpump/AbstractCpuMetricEsPersistenceDAO.java | 67 +++++ .../es/dao/cpump/CpuDayMetricEsPersistenceDAO.java | 42 +++ .../dao/cpump/CpuHourMetricEsPersistenceDAO.java | 42 +++ .../dao/cpump/CpuMinuteMetricEsPersistenceDAO.java | 42 +++ .../dao/cpump/CpuMonthMetricEsPersistenceDAO.java | 42 +++ .../dao/cpump/CpuSecondMetricEsPersistenceDAO.java | 42 +++ .../dao/gcmp/AbstractGCMetricEsPersistenceDAO.java | 70 +++++ .../es/dao/gcmp/GCDayMetricEsPersistenceDAO.java | 42 +++ .../es/dao/gcmp/GCHourMetricEsPersistenceDAO.java | 42 +++ .../dao/gcmp/GCMinuteMetricEsPersistenceDAO.java | 42 +++ .../es/dao/gcmp/GCMonthMetricEsPersistenceDAO.java | 42 +++ .../dao/gcmp/GCSecondMetricEsPersistenceDAO.java | 42 +++ .../AbstractInstanceMetricEsPersistenceDAO.java | 99 +++++++ .../dao/imp/InstanceDayMetricEsPersistenceDAO.java | 42 +++ .../imp/InstanceHourMetricEsPersistenceDAO.java | 42 +++ .../imp/InstanceMinuteMetricEsPersistenceDAO.java | 42 +++ .../imp/InstanceMonthMetricEsPersistenceDAO.java | 42 +++ .../AbstractInstanceMappingEsPersistenceDAO.java | 65 +++++ .../impp/InstanceMappingDayEsPersistenceDAO.java | 42 +++ .../impp/InstanceMappingHourEsPersistenceDAO.java | 42 +++ .../InstanceMappingMinuteEsPersistenceDAO.java | 42 +++ .../impp/InstanceMappingMonthEsPersistenceDAO.java | 42 +++ ...actInstanceReferenceMetricEsPersistenceDAO.java | 101 +++++++ ...InstanceReferenceDayMetricEsPersistenceDAO.java | 46 ++++ ...nstanceReferenceHourMetricEsPersistenceDAO.java | 46 ++++ ...tanceReferenceMinuteMetricEsPersistenceDAO.java | 42 +++ ...stanceReferenceMonthMetricEsPersistenceDAO.java | 46 ++++ .../AbstractMemoryMetricEsPersistenceDAO.java | 75 +++++ .../memorymp/MemoryDayMetricEsPersistenceDAO.java | 42 +++ .../memorymp/MemoryHourMetricEsPersistenceDAO.java | 42 +++ .../MemoryMinuteMetricEsPersistenceDAO.java | 42 +++ .../MemoryMonthMetricEsPersistenceDAO.java | 42 +++ .../MemorySecondMetricEsPersistenceDAO.java | 42 +++ .../AbstractMemoryPoolMetricEsPersistenceDAO.java | 75 +++++ .../MemoryPoolDayMetricEsPersistenceDAO.java | 42 +++ .../MemoryPoolHourMetricEsPersistenceDAO.java | 42 +++ .../MemoryPoolMinuteMetricEsPersistenceDAO.java | 42 +++ .../MemoryPoolMonthMetricEsPersistenceDAO.java | 42 +++ .../MemoryPoolSecondMetricEsPersistenceDAO.java | 42 +++ .../{ => register}/ApplicationEsRegisterDAO.java | 4 +- .../dao/{ => register}/InstanceEsRegisterDAO.java | 4 +- .../NetworkAddressRegisterEsDAO.java | 4 +- .../{ => register}/ServiceNameEsRegisterDAO.java | 4 +- .../smp/AbstractServiceMetricEsPersistenceDAO.java | 99 +++++++ .../dao/smp/ServiceDayMetricEsPersistenceDAO.java | 42 +++ .../dao/smp/ServiceHourMetricEsPersistenceDAO.java | 42 +++ .../smp/ServiceMinuteMetricEsPersistenceDAO.java | 42 +++ .../smp/ServiceMonthMetricEsPersistenceDAO.java | 42 +++ ...ractServiceReferenceMetricEsPersistenceDAO.java | 105 +++++++ .../ServiceReferenceDayMetricEsPersistenceDAO.java | 42 +++ ...ServiceReferenceHourMetricEsPersistenceDAO.java | 42 +++ ...rviceReferenceMinuteMetricEsPersistenceDAO.java | 42 +++ ...erviceReferenceMonthMetricEsPersistenceDAO.java | 42 +++ .../es/define/GlobalTraceEsTableDefine.java | 1 - .../storage/es/define/SegmentEsTableDefine.java | 3 +- .../es/define/ServiceEntryEsTableDefine.java | 46 ---- .../{ => alarm}/ApplicationAlarmEsTableDefine.java | 2 +- .../ApplicationAlarmListEsTableDefine.java | 2 +- .../ApplicationReferenceAlarmEsTableDefine.java | 2 +- ...ApplicationReferenceAlarmListEsTableDefine.java | 2 +- .../{ => alarm}/InstanceAlarmEsTableDefine.java | 2 +- .../InstanceAlarmListEsTableDefine.java | 2 +- .../InstanceReferenceAlarmEsTableDefine.java | 2 +- .../InstanceReferenceAlarmListEsTableDefine.java | 2 +- .../{ => alarm}/ServiceAlarmEsTableDefine.java | 2 +- .../{ => alarm}/ServiceAlarmListEsTableDefine.java | 2 +- .../ServiceReferenceAlarmEsTableDefine.java | 2 +- .../ServiceReferenceAlarmListEsTableDefine.java | 2 +- .../AbstractApplicationMetricEsTableDefine.java} | 18 +- .../amp/ApplicationDayMetricEsTableDefine.java} | 20 +- .../amp/ApplicationHourMetricEsTableDefine.java} | 20 +- .../amp/ApplicationMinuteMetricEsTableDefine.java} | 20 +- .../amp/ApplicationMonthMetricEsTableDefine.java} | 20 +- ...AbstractApplicationComponentEsTableDefine.java} | 18 +- .../ApplicationComponentDayEsTableDefine.java} | 20 +- .../ApplicationComponentHourEsTableDefine.java} | 20 +- .../ApplicationComponentMinuteEsTableDefine.java} | 20 +- .../ApplicationComponentMonthEsTableDefine.java} | 20 +- .../AbstractApplicationMappingEsTableDefine.java} | 18 +- .../ApplicationMappingDayEsTableDefine.java} | 20 +- .../ApplicationMappingHourEsTableDefine.java} | 20 +- .../ApplicationMappingMinuteEsTableDefine.java} | 20 +- .../ApplicationMappingMonthEsTableDefine.java} | 20 +- ...ctApplicationReferenceMetricEsTableDefine.java} | 18 +- ...pplicationReferenceDayMetricEsTableDefine.java} | 20 +- ...plicationReferenceHourMetricEsTableDefine.java} | 20 +- ...icationReferenceMinuteMetricEsTableDefine.java} | 20 +- ...licationReferenceMonthMetricEsTableDefine.java} | 20 +- .../AbstractCpuMetricEsTableDefine.java} | 18 +- .../es/define/cpu/CpuDayMetricEsTableDefine.java} | 17 +- .../es/define/cpu/CpuHourMetricEsTableDefine.java} | 17 +- .../define/cpu/CpuMinuteMetricEsTableDefine.java} | 17 +- .../define/cpu/CpuMonthMetricEsTableDefine.java} | 17 +- .../define/cpu/CpuSecondMetricEsTableDefine.java} | 17 +- .../AbstractGCMetricEsTableDefine.java} | 21 +- .../es/define/gc/GCDayMetricEsTableDefine.java} | 22 +- .../es/define/gc/GCHourMetricEsTableDefine.java} | 17 +- .../es/define/gc/GCMinuteMetricEsTableDefine.java} | 17 +- .../es/define/gc/GCMonthMetricEsTableDefine.java} | 17 +- .../es/define/gc/GCSecondMetricEsTableDefine.java} | 17 +- .../AbstractInstanceMetricEsTableDefine.java} | 17 +- .../imp/InstanceDayMetricEsTableDefine.java} | 17 +- .../imp/InstanceHourMetricEsTableDefine.java} | 17 +- .../imp/InstanceMinuteMetricEsTableDefine.java} | 17 +- .../imp/InstanceMonthMetricEsTableDefine.java} | 17 +- .../AbstractInstanceMappingEsTableDefine.java} | 16 +- .../InstanceMappingDayEsTableDefine.java} | 17 +- .../InstanceMappingHourEsTableDefine.java} | 17 +- .../InstanceMappingMinuteEsTableDefine.java} | 20 +- .../InstanceMappingMonthEsTableDefine.java} | 20 +- ...tractInstanceReferenceMetricEsTableDefine.java} | 17 +- .../InstanceReferenceDayMetricEsTableDefine.java} | 20 +- .../InstanceReferenceHourMetricEsTableDefine.java} | 20 +- ...nstanceReferenceMinuteMetricEsTableDefine.java} | 20 +- ...InstanceReferenceMonthMetricEsTableDefine.java} | 20 +- .../AbstractMemoryMetricEsTableDefine.java} | 19 +- .../memory/MemoryDayMetricEsTableDefine.java} | 17 +- .../memory/MemoryHourMetricEsTableDefine.java} | 17 +- .../memory/MemoryMinuteMetricEsTableDefine.java} | 17 +- .../memory/MemoryMonthMetricEsTableDefine.java} | 17 +- .../memory/MemorySecondMetricEsTableDefine.java} | 17 +- .../AbstractMemoryPoolMetricEsTableDefine.java} | 14 +- .../mpool/MemoryPoolDayMetricEsTableDefine.java} | 17 +- .../mpool/MemoryPoolHourMetricEsTableDefine.java} | 17 +- .../MemoryPoolMinuteMetricEsTableDefine.java} | 17 +- .../mpool/MemoryPoolMonthMetricEsTableDefine.java} | 17 +- .../MemoryPoolSecondMetricEsTableDefine.java} | 17 +- .../{ => register}/ApplicationEsTableDefine.java | 2 +- .../{ => register}/InstanceEsTableDefine.java | 2 +- .../NetworkAddressEsTableDefine.java | 2 +- .../{ => register}/ServiceNameEsTableDefine.java | 3 +- .../AbstractServiceMetricEsTableDefine.java} | 18 +- .../define/smp/ServiceDayMetricEsTableDefine.java} | 17 +- .../smp/ServiceHourMetricEsTableDefine.java} | 17 +- .../smp/ServiceMinuteMetricEsTableDefine.java} | 17 +- .../smp/ServiceMonthMetricEsTableDefine.java} | 17 +- ...stractServiceReferenceMetricEsTableDefine.java} | 14 +- .../ServiceReferenceDayMetricEsTableDefine.java} | 20 +- .../ServiceReferenceHourMetricEsTableDefine.java} | 20 +- ...ServiceReferenceMinuteMetricEsTableDefine.java} | 20 +- .../ServiceReferenceMonthMetricEsTableDefine.java} | 20 +- .../main/resources/META-INF/defines/storage.define | 119 +++++--- .../storage/h2/StorageModuleH2Provider.java | 120 ++++---- .../h2/dao/ApplicationAlarmH2PersistenceDAO.java | 2 +- .../dao/ApplicationAlarmListH2PersistenceDAO.java | 2 +- ...pplicationComponentH2MinutePersistenceDAO.java} | 16 +- .../storage/h2/dao/ApplicationH2CacheDAO.java | 2 +- .../storage/h2/dao/ApplicationH2RegisterDAO.java | 2 +- ... ApplicationMappingH2MinutePersistenceDAO.java} | 14 +- ...> ApplicationMinuteMetricH2PersistenceDAO.java} | 14 +- .../ApplicationReferenceAlarmH2PersistenceDAO.java | 2 +- ...licationReferenceAlarmListH2PersistenceDAO.java | 2 +- ...tionReferenceMinuteMetricH2PersistenceDAO.java} | 18 +- ...O.java => CpuSecondMetricH2PersistenceDAO.java} | 8 +- ...AO.java => GCSecondMetricH2PersistenceDAO.java} | 7 +- .../h2/dao/InstanceAlarmH2PersistenceDAO.java | 2 +- .../h2/dao/InstanceAlarmListH2PersistenceDAO.java | 2 +- .../storage/h2/dao/InstanceH2CacheDAO.java | 2 +- .../storage/h2/dao/InstanceH2RegisterDAO.java | 2 +- .../collector/storage/h2/dao/InstanceH2UIDAO.java | 13 +- .../h2/dao/InstanceHeartBeatH2PersistenceDAO.java | 6 +- ... => InstanceMappingH2MinutePersistenceDAO.java} | 11 +- ...a => InstanceMinuteMetricH2PersistenceDAO.java} | 18 +- .../InstanceReferenceAlarmH2PersistenceDAO.java | 2 +- ...InstanceReferenceAlarmListH2PersistenceDAO.java | 2 +- .../InstanceReferenceMetricH2PersistenceDAO.java | 7 +- ...=> MemoryPoolSecondMetricH2PersistenceDAO.java} | 6 +- ...ava => MemorySecondMetricH2PersistenceDAO.java} | 6 +- .../storage/h2/dao/NetworkAddressH2CacheDAO.java | 2 +- .../h2/dao/NetworkAddressRegisterH2DAO.java | 2 +- .../h2/dao/ServiceAlarmH2PersistenceDAO.java | 2 +- .../h2/dao/ServiceAlarmListH2PersistenceDAO.java | 2 +- .../h2/dao/ServiceEntryH2PersistenceDAO.java | 104 ------- .../storage/h2/dao/ServiceEntryH2UIDAO.java | 102 ------- ...va => ServiceMinuteMetricH2PersistenceDAO.java} | 18 +- .../storage/h2/dao/ServiceNameH2CacheDAO.java | 2 +- .../storage/h2/dao/ServiceNameH2RegisterDAO.java | 2 +- .../dao/ServiceReferenceAlarmH2PersistenceDAO.java | 2 +- .../ServiceReferenceAlarmListH2PersistenceDAO.java | 2 +- .../ServiceReferenceMetricH2PersistenceDAO.java | 7 +- .../storage/h2/define/GCMetricH2TableDefine.java | 2 +- .../h2/define/ServiceEntryH2TableDefine.java | 43 --- .../main/resources/META-INF/defines/storage.define | 1 - .../collector/ui/jetty/UIModuleJettyProvider.java | 5 +- .../servicetree/EntryServiceGetHandler.java | 104 ------- .../collector/ui/service/ServiceTreeService.java | 24 +- 643 files changed, 9065 insertions(+), 5805 deletions(-) -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
