This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch doc/roadmap in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from beaa168 Update ROADMAP.md add 06f675a Changed dependency graphql-java from 6.0 to 7.0. add 1152135 initialize collector ui graphql module. add 6b3aa98 Initialize the java class entity for mapping graphql protocol. add 9619712 Provide GraphQL jetty servlet do get method. add 843e709 Provide GraphQL jetty servlet do post method. add a25e353 Implement the method named getAllApplication in application layer graphql protocol. add e755bba Move the entity into storage module. add 9a6520f Provide the application topology query, but only completed es storage. add 953cfbb no message add 04ef598 Merge branch 'feature/graphql-ui' of https://github.com/peng-yongsheng/incubator-skywalking into feature/graphql-ui add 3909a5b Merge branch 'master' into feature/graphql-ui add a4891dd Merge branch 'feature/graphql-ui' of https://github.com/peng-yongsheng/incubator-skywalking into feature/graphql-ui add 3438071 Catch the exception in doPost and doGet method, make this two method do not throw exception. add 1510f70 Change the data type from int to long which attributes named responseTimePerSec and callsPerSec. add f177ebd Provide the search server query, but only completed es storage and non tps. add 0ee4b1c Provide the getAllServer query, but only completed es storage and non tps. add 4a933e1 Provide the getResponseTimeTrend query. add 703a591 Move DurationUtilsTestCase to ui provider module. add 86e05bc Provide the getServerTPSTrend query. add 8585e42 Provide the getCPUTrend query. add 06d5b88 Provide the getGCTrend query. add 474e47c Provide the getMemoryTrend query. add c70b132 Add variables parse add cff4871 Convert the type of data node from String to JsonObject add 297a282 Merge remote-tracking branch 'sw/master' into feature/graphql-ui add 7925c7b Provide the getClusterBrief query. add 7a17557 Move ui dao to ui package. add 8cfadaa Merge branch 'feature/graphql-ui' of https://github.com/peng-yongsheng/incubator-skywalking into feature/graphql-ui add 77f615a Provide the queryBasicTraces query. add 1d625d2 Provide the queryTrace query. add b513024 Provide the searchService query. add cccba2e Provide the getServiceResponseTimeTrend query. add 2c6b03b Provide the getServiceSLATrend query. add 62477a5 Provide the getServiceTopology query. add 505f6a0 Merge branch 'master' into feature/graphql-ui add 90c820d Merge branch 'feature/graphql-ui' of https://github.com/peng-yongsheng/incubator-skywalking into feature/graphql-ui add 5c44dd9 bugfix:no data collected after application started 20+seconds add c7c1901 Modify GRPC support version add a3df0cf [Agent] fix kafka plugin don't works add daf3c25 Merge branch 'master' into fix/kafka-plugin-issue add 32922de Merge pull request #792 from ascrutae/fix/kafka-plugin-issue add 57e809d Merge branch 'master' into feature/update-docs add b00b588 Merge pull request #793 from ascrutae/feature/update-docs add efd27dd Merge branch 'master' into master add 75be8c8 Merge pull request #794 from carlvine500/master add ca11058 Add a new field for operation register. add ddd1d80 Merge pull request #797 from apache/add-component-for-operation-name add 87ebf65 Merge branch 'master' into feature/graphql-ui add 8cd6b5b Merge branch 'feature/graphql-ui' of https://github.com/peng-yongsheng/incubator-skywalking into feature/graphql-ui add a817197 Provide the getSlowService query. add 7b2cb2e Merge branch 'feature/graphql-ui' of https://github.com/peng-yongsheng/incubator-skywalking into feature/graphql-ui add 425324e Provide the overview/getTopNSlowService query. add 59c512f CI fail fixed. add 87d246d Fixed the bug: service/searchService #104 add f0c2be4 Merge branch 'feature/graphql-ui' of https://github.com/peng-yongsheng/incubator-skywalking into feature/graphql-ui add af6d91d Refactor alarm schema add 1bc0d84 Provide the getTopNServerThroughput query. add 87ee4f2 Merge remote-tracking branch 'origin/feature/graphql-ui' into feature/graphql-ui add 93c4ef9 Fix the docker version is out of date add 43fa3c0 Merge pull request #800 from ascrutae/fix/docker-compose-version add bb0552a Create SImpleDateFormat everytime. add a3609de Merge pull request #801 from apache/fix/dateformat-concurrency add cbe5227 Merge branch 'master' into feature/graphql-ui add e6f0c3e Fixed CI fail. add 1afe6c7 Merge pull request #775 from peng-yongsheng/feature/graphql-ui add a736c01 Fix protocol mistakes. add 59ae085 Merge pull request #802 from apache/fix/query add 7127546 Provide the getTopNApplicationThroughput query. add da0a8b8 Provide the getServerThroughput query. add e09c243 Merge pull request #803 from peng-yongsheng/feature/getTopNApplicationThroughput add 1864380 Merge branch 'master' into feature/getServerThroughput add 4419bca Merge pull request #804 from peng-yongsheng/feature/getServerThroughput add 0c9686e Provide the getServiceTPSTrend query. add 6fc4579 Merge pull request #805 from peng-yongsheng/feature/getServiceTPSTrend add c9aadf2 Change the elasticsearch analyzer type to stop that can tokenizer the sentence such as “ org.apache.skywalking” to “org” “apache” “skywalking” add eda2d81 Update span layer and server type by address id when those not equals to the values in cache. add 508b11d Provide the getConjecturalApps query. add ed82e49 Merge pull request #806 from peng-yongsheng/feature/servertype add 2e3666c Merge branch 'master' into feature/getConjecturalApps add f84961d Merge pull request #807 from peng-yongsheng/feature/getConjecturalApps add d2eb0b8 Merge branch 'master' into feature/searchService add 778731f Merge pull request #808 from peng-yongsheng/feature/searchService add 7ab59cb Split application alarm list entity to minute, hour, day, month. add 52c1139 Application metric alarm list graph. add cb2ea6b Merge pull request #809 from peng-yongsheng/feature/applicationalarm add 47e1db5 Provide the loadAlarmList query. add 2397567 Provide the getAlarmTrend query. add 1b499f0 Add [Agent] ServiceComb Plugin #437 add 9ff2093 fix collector/start.sh tip. add 94dcf96 Modify catalog add f561b6a Merge branch 'master' into servicecomb add d2a3a28 Modify catalog add 7ccdcbc Merge branch 'servicecomb' of https://github.com/lytscu/incubator-skywalking into servicecomb add 5e8bc00 Modify operationName to invocation.getInvocationQualifiedName add 1a8fb0f Modify operationName to invocation.getMicroserviceQualifiedName() add a3985d7 Merge branch 'master' into servicecomb add 48f8fce Modify ComponentId =28 add 5fce5dc Update servicecomb-java-chassis-0.x-plugin add 49a99a5 Merge branch 'master' into servicecomb add 6793deb Merge branch 'master' into servicecomb add b5ec187 Update servicecomb-java-chassis-0.x-plugin/pom.xml add cbb2eca Merge branch 'master' into servicecomb add e233b7b Merge branch 'master' into servicecomb add 2e95e7f Update exception status add 61f8d3e Update afterMethod exception status add 098251c Update consumer register add 4fa19f8 Merge branch 'master' into servicecomb add 59380c4 Merge branch 'master' into servicecomb add 3eeacb1 Update comments add 6e56c7f Update /org/apache/skywalking/apm/collector/storage/table/register/ServerTypeDefine.java add 7cbed1b Merge pull request #810 from peng-yongsheng/feature/loadAlarmList add e4e6940 Merge branch 'master' into servicecomb add e53b50e Merge pull request #771 from lytscu/servicecomb add cf04f03 Update Supported-list.md add 1bef96d Merge pull request #811 from apache/update-supported-list add 58365eb Merge branch 'master' into feature/getAlarmTrend add cc0f6f5 Merge branch 'master' into feature/getAlarmTrend add fb1c99d Merge branch 'feature/getAlarmTrend' of https://github.com/peng-yongsheng/incubator-skywalking into feature/getAlarmTrend add 4032e95 Merge pull request #812 from peng-yongsheng/feature/getAlarmTrend add 56d9b27 Mock trace segment data which sniffer from Dubbo framework. add 724b9c5 Application, Instance, Service register tested with elastic search. add 8276eac Merge pull request #814 from peng-yongsheng/feature/mock add 5445058 Merge branch 'master' into feature/register_test add add26b8 Sleeping when id not get. add abb3515 Merge pull request #816 from peng-yongsheng/feature/register_test add ede4260 Merge branch 'master' into feature/heartbeat_test add a14207e Instance heart beat tested with elastic search. OK. add 2cef97a Merge pull request #817 from peng-yongsheng/feature/heartbeat_test add 1435cbb Trace segment metric aggregate and alarm metric aggregate tested. add 37a5287 JVM metric aggregate tested. add ab3615e Merge pull request #818 from peng-yongsheng/feature/metric_check add 4836883 Change the data type of sla and apdex attributes from Float to Int. add 4544d99 Update logback version in application logback toolkit, based on #813 , where I explained that the logback library is not really used, just for compiling the bridge. But anyway, no harm to fix the risk add efcc8e8 Merge branch 'master' into update/logbck-version add d42458f Merge pull request #815 from apache/update/logbck-version add 47e2990 Merge branch 'master' into feature/graphql_protocol add 787f262 Merge pull request #819 from peng-yongsheng/feature/graphql_protocol add c96077e Update assembly.xml add 3298c38 Merge pull request #820 from sdanzo/master add edffdf6 Add links to resources catalog in https://github.com/OpenSkywalking/Community add c8b2110 add UI as a submodule add 3b3a20e Add submodule links for protocol add 8435871 Merge pull request #822 from apache/submodule add 9486fbf Merge branch 'master' into document/community-links add 8a1f443 Update submodule. add 0c47dac Merge pull request #823 from apache/proto-update add 65dc377 Merge branch 'master' into document/community-links add 98256a8 Merge pull request #821 from apache/document/community-links add 711c1aa Merge branch 'master' into doc/roadmap No new revisions were added by this update. Summary of changes: .gitmodules | 6 + .../apm-toolkit-logback-1.x/pom.xml | 2 +- .../handler/InstanceDiscoveryServiceHandler.java | 6 +- .../NetworkAddressRegisterServiceHandler.java | 5 +- .../ApplicationRegisterServiceHandlerTestCase.java | 46 ---- .../handler/JVMMetricServiceHandlerTestCase.java | 94 ------- .../AgentDataMock.java} | 30 ++- .../grpc/provider/handler/mock/ConsumerMock.java | 84 +++++++ .../grpc/provider/handler/mock/JVMMetricMock.java | 159 ++++++++++++ .../grpc/provider/handler/mock/ProviderMock.java | 101 ++++++++ .../grpc/provider/handler/mock/RegisterMock.java | 176 +++++++++++++ .../grpc/provider/handler/mock/TimeBuilder.java | 104 ++++++++ .../provider/handler/mock/TraceSegmentMock.java | 71 ++++++ .../provider/handler/mock/UniqueIdBuilder.java} | 23 +- .../src/test}/resources/log4j2.xml | 0 .../NetworkAddressRegisterServletHandler.java | 2 +- .../src/test/resources/json/dubbox-consumer.json | 54 ++-- .../src/test/resources/json/dubbox-provider.json | 57 +++-- .../resources/json/instance-register-consumer.json | 9 +- .../resources/json/instance-register-provider.json | 9 +- .../alarm/define/graph/AlarmWorkerIdDefine.java | 79 +++--- .../alarm/provider/worker/AlarmAssertWorker.java | 31 ++- .../application/ApplicationMetricAlarmGraph.java | 15 +- .../ApplicationMetricAlarmListCopy.java} | 17 +- ...cationMetricAlarmListDayPersistenceWorker.java} | 16 +- ...pplicationMetricAlarmListDayTransformNode.java} | 25 +- ...ationMetricAlarmListHourPersistenceWorker.java} | 16 +- ...plicationMetricAlarmListHourTransformNode.java} | 25 +- ...ionMetricAlarmListMinutePersistenceWorker.java} | 16 +- ...tionMetricAlarmListMonthPersistenceWorker.java} | 16 +- ...licationMetricAlarmListMonthTransformNode.java} | 25 +- .../ApplicationMetricAlarmToListNodeProcessor.java | 5 +- .../jvm/provider/service/MemoryMetricService.java | 2 +- .../metric/define/graph/MetricGraphIdDefine.java | 3 +- .../metric/define/graph/MetricWorkerIdDefine.java | 56 ++--- .../provider/AnalysisMetricModuleProvider.java | 10 +- .../component/ApplicationComponentCopy.java | 2 +- .../ApplicationComponentSpanListener.java | 17 +- .../mapping/ApplicationMappingCopy.java | 2 +- .../mapping/ApplicationMappingSpanListener.java | 16 +- ...entCostGraph.java => SegmentDurationGraph.java} | 10 +- ....java => SegmentDurationPersistenceWorker.java} | 20 +- ...tener.java => SegmentDurationSpanListener.java} | 46 ++-- .../ServiceReferenceMetricSpanListener.java | 2 +- .../define/service/INetworkAddressIDService.java | 4 + .../register/ApplicationRegisterSerialWorker.java | 9 +- .../register/InstanceRegisterSerialWorker.java | 9 +- .../NetworkAddressRegisterSerialWorker.java | 42 ++-- .../provider/service/InstanceIDService.java | 4 +- .../provider/service/NetworkAddressIDService.java | 27 +- .../provider/buffer/SegmentBufferManager.java | 2 +- .../standardization/ReferenceIdExchanger.java | 4 +- .../parser/standardization/SpanIdExchanger.java | 5 + .../src/main/assembly/assembly.xml | 2 +- .../src/main/resources/application.yml | 22 +- .../src/main/resources/log4j2.xml | 4 +- .../cache/service/ApplicationCacheService.java | 3 +- .../cache/service/NetworkAddressCacheService.java | 2 + .../cache/service/ServiceNameCacheService.java | 6 +- .../cache/guava/CacheModuleGuavaProvider.java | 4 +- .../service/ApplicationCacheGuavaService.java | 21 +- ...e.java => NetworkAddressCacheGuavaService.java} | 42 +++- .../service/ServiceNameCacheGuavaService.java | 35 +-- .../apm/collector/server/jetty/JettyHandler.java | 31 ++- apm-collector/apm-collector-core/pom.xml | 5 + .../apm/collector/core/util/BooleanUtils.java | 12 +- .../apm/collector/core/util/TimeBucketUtils.java | 82 +----- .../collector/core/util/TimeBucketUtilsTest.java | 25 -- .../apm/collector/storage/StorageModule.java | 62 +++-- .../storage/dao/IInstanceMetricUIDAO.java | 61 ----- ...AO.java => ISegmentDurationPersistenceDAO.java} | 4 +- .../storage/dao/IServiceReferenceUIDAO.java | 30 --- ...=> IApplicationAlarmListDayPersistenceDAO.java} | 2 +- ...> IApplicationAlarmListHourPersistenceDAO.java} | 2 +- ...IApplicationAlarmListMinutePersistenceDAO.java} | 2 +- ... IApplicationAlarmListMonthPersistenceDAO.java} | 2 +- .../storage/dao/cache/IApplicationCacheDAO.java | 3 +- .../storage/dao/cache/INetworkAddressCacheDAO.java | 5 +- .../storage/dao/cache/IServiceNameCacheDAO.java | 3 +- .../dao/register/INetworkAddressRegisterDAO.java | 2 + .../IApplicationAlarmListUIDAO.java} | 10 +- .../IApplicationAlarmUIDAO.java} | 10 +- .../IApplicationComponentUIDAO.java} | 33 ++- .../IApplicationMappingUIDAO.java} | 45 ++-- .../IApplicationMetricUIDAO.java} | 12 +- .../{ => ui}/IApplicationReferenceMetricUIDAO.java | 15 +- .../ICpuMetricUIDAO.java} | 10 +- .../IGCMetricUIDAO.java} | 18 +- .../storage/dao/{ => ui}/IGlobalTraceUIDAO.java | 2 +- .../IInstanceAlarmUIDAO.java} | 10 +- .../IInstanceMetricUIDAO.java} | 23 +- .../storage/dao/{ => ui}/IInstanceUIDAO.java | 27 +- .../storage/dao/ui/IMemoryMetricUIDAO.java | 60 +++++ .../dao/{ => ui}/IMemoryPoolMetricUIDAO.java | 2 +- .../INetworkAddressUIDAO.java} | 9 +- .../ISegmentDurationUIDAO.java} | 11 +- .../storage/dao/{ => ui}/ISegmentUIDAO.java | 2 +- .../IServiceAlarmUIDAO.java} | 10 +- .../storage/dao/ui/IServiceMetricUIDAO.java | 45 ++++ .../IServiceNameServiceUIDAO.java} | 9 +- .../IServiceReferenceMetricUIDAO.java} | 26 +- .../apm/collector/storage/table}/MetricSource.java | 2 +- .../storage/table/alarm/ApplicationAlarmList.java | 21 +- .../table/application/ApplicationComponent.java | 8 +- .../application/ApplicationComponentTable.java | 3 +- .../table/application/ApplicationMapping.java | 8 +- .../table/application/ApplicationMappingTable.java | 3 +- .../storage/table/register/Application.java | 17 +- .../storage/table/register/ApplicationTable.java | 1 + .../storage/table/register/NetworkAddress.java | 19 ++ .../table/register/NetworkAddressTable.java | 2 + .../{NetworkAddressTable.java => ServerType.java} | 28 ++- .../storage/table/register/ServerTypeDefine.java | 83 +++++++ .../{SegmentCost.java => SegmentDuration.java} | 37 +-- ...entCostTable.java => SegmentDurationTable.java} | 8 +- .../ISegmentCostUIDAO.java => ui/alarm/Alarm.java} | 31 ++- .../apm/collector/storage/ui/alarm/AlarmItem.java | 79 ++++++ .../apm/collector/storage/ui/alarm/AlarmType.java} | 10 +- .../apm/collector/storage/ui/alarm/CauseType.java} | 9 +- .../storage/ui/application/Application.java} | 31 ++- .../storage/ui/application/ApplicationNode.java | 100 ++++++++ .../application/ConjecturalNode.java} | 8 +- .../apm/collector/storage/ui/common/Call.java | 115 +++++++++ .../common/Duration.java} | 38 ++- .../ISegmentCostUIDAO.java => ui/common/Node.java} | 37 ++- .../collector/storage/ui/common/Pagination.java} | 31 ++- .../common/ResponseTimeTrend.java} | 15 +- .../common/SLATrend.java} | 15 +- .../apm/collector/storage/ui/common/Step.java} | 12 +- .../common/ThroughputTrend.java} | 20 +- .../common/Topology.java} | 33 ++- .../storage/ui/common/VisualUserNode.java} | 7 +- .../storage/ui/config/AlarmThreshold.java} | 13 +- .../config/ExistedAlarmThresholdItem.java} | 10 +- .../storage/ui/config/ExistedAlarmThresholds.java} | 8 +- .../storage/ui/config/ExistedTTLConfigs.java} | 8 +- .../apm/collector/storage/ui/config/TTL.java} | 9 +- .../storage/ui/config/TTLConfigItem.java} | 9 +- .../overview/AlarmTrend.java} | 21 +- .../storage/ui/overview/ApplicationTPS.java} | 31 ++- .../storage/ui/overview/ClusterBrief.java | 70 ++++++ .../overview/ConjecturalApp.java} | 37 ++- .../overview/ConjecturalAppBrief.java} | 20 +- .../collector/storage/ui/server/AppServerInfo.java | 108 ++++++++ .../apm/collector/storage/ui/server/CPUTrend.java} | 18 +- .../server/GCTrend.java} | 24 +- .../server/MemoryTrend.java} | 44 +++- .../collector/storage/ui/service/ServiceInfo.java} | 23 +- .../storage/ui/service/ServiceMetric.java} | 40 ++- .../collector/storage/ui/service/ServiceNode.java | 63 +++++ .../apm/collector/storage/ui/trace/BasicTrace.java | 70 ++++++ .../apm/collector/storage/ui/trace/KeyValue.java} | 21 +- .../trace/LogEntity.java} | 31 ++- .../apm/collector/storage/ui/trace/Ref.java} | 40 ++- .../apm/collector/storage/ui/trace/RefType.java} | 9 +- .../apm/collector/storage/ui/trace/Segment.java} | 11 +- .../apm/collector/storage/ui/trace/Span.java | 205 +++++++++++++++ .../IGlobalTraceUIDAO.java => ui/trace/Trace.java} | 21 +- .../trace/TraceBrief.java} | 31 ++- .../storage/ui/trace/TraceQueryCondition.java | 91 +++++++ .../collector/storage/utils/DurationPoint.java} | 20 +- .../storage/utils/TimePyramidTableNameBuilder.java | 50 ++++ ...che.skywalking.apm.collector.core.module.Module | 3 +- .../table/register/ServerTypeDefineTestCase.java} | 24 +- .../collector/storage/es/DataTTLKeeperTimer.java | 14 +- .../storage/es/StorageModuleEsNamingListener.java | 3 +- .../storage/es/StorageModuleEsProvider.java | 106 +++++--- .../es/base/dao/AbstractPersistenceEsDAO.java | 4 +- .../collector/storage/es/base/dao/BatchEsDAO.java | 4 + .../base/define/ElasticSearchStorageInstaller.java | 13 +- .../es/dao/ApplicationReferenceMetricEsUIDAO.java | 99 -------- .../collector/storage/es/dao/GCMetricEsUIDAO.java | 155 ------------ .../storage/es/dao/InstanceMetricEsUIDAO.java | 143 ----------- .../storage/es/dao/MemoryMetricEsUIDAO.java | 89 ------- .../storage/es/dao/SegmentCostEsUIDAO.java | 122 --------- ...O.java => SegmentDurationEsPersistenceDAO.java} | 42 ++-- .../storage/es/dao/ServiceReferenceEsUIDAO.java | 115 --------- ...stractApplicationComponentEsPersistenceDAO.java | 6 +- ...tractApplicationAlarmListEsPersistenceDAO.java} | 43 ++-- .../ApplicationAlarmListEsDayPersistenceDAO.java | 42 ++++ .../ApplicationAlarmListEsHourPersistenceDAO.java | 42 ++++ ...ApplicationAlarmListEsMinutePersistenceDAO.java | 42 ++++ .../ApplicationAlarmListEsMonthPersistenceDAO.java | 42 ++++ .../ApplicationAlarmListEsPersistenceDAO.java | 104 -------- .../AbstractApplicationMetricEsPersistenceDAO.java | 2 - ...AbstractApplicationMappingEsPersistenceDAO.java | 6 +- ...ApplicationReferenceMetricEsPersistenceDAO.java | 2 - .../es/dao/cache/ApplicationEsCacheDAO.java | 16 +- .../storage/es/dao/cache/InstanceEsCacheDAO.java | 4 +- .../es/dao/cache/NetworkAddressEsCacheDAO.java | 24 +- .../es/dao/cache/ServiceNameEsCacheDAO.java | 15 +- .../cpump/AbstractCpuMetricEsPersistenceDAO.java | 2 - .../dao/gcmp/AbstractGCMetricEsPersistenceDAO.java | 2 - .../AbstractInstanceMetricEsPersistenceDAO.java | 2 - .../AbstractInstanceMappingEsPersistenceDAO.java | 2 - ...actInstanceReferenceMetricEsPersistenceDAO.java | 2 - .../AbstractMemoryMetricEsPersistenceDAO.java | 2 - .../AbstractMemoryPoolMetricEsPersistenceDAO.java | 2 - .../es/dao/register/InstanceRegisterEsDAO.java | 7 +- .../dao/register/NetworkAddressRegisterEsDAO.java | 11 + .../smp/AbstractServiceMetricEsPersistenceDAO.java | 2 - ...ractServiceReferenceMetricEsPersistenceDAO.java | 2 - .../storage/es/dao/ui/ApplicationAlarmEsUIDAO.java | 90 +++++++ .../es/dao/ui/ApplicationAlarmListEsUIDAO.java | 69 ++++++ .../dao/{ => ui}/ApplicationComponentEsUIDAO.java | 49 ++-- .../es/dao/{ => ui}/ApplicationMappingEsUIDAO.java | 35 +-- .../es/dao/ui/ApplicationMetricEsUIDAO.java | 104 ++++++++ .../dao/ui/ApplicationReferenceMetricEsUIDAO.java | 177 +++++++++++++ .../storage/es/dao/{ => ui}/CpuMetricEsUIDAO.java | 45 ++-- .../storage/es/dao/ui/GCMetricEsUIDAO.java | 76 ++++++ .../es/dao/{ => ui}/GlobalTraceEsUIDAO.java | 4 +- .../storage/es/dao/ui/InstanceAlarmEsUIDAO.java | 90 +++++++ .../storage/es/dao/{ => ui}/InstanceEsUIDAO.java | 76 ++++-- .../storage/es/dao/ui/InstanceMetricEsUIDAO.java | 159 ++++++++++++ .../storage/es/dao/ui/MemoryMetricEsUIDAO.java | 79 ++++++ .../es/dao/{ => ui}/MemoryPoolMetricEsUIDAO.java | 7 +- .../storage/es/dao/ui/NetworkAddressEsUIDAO.java | 83 +++++++ .../storage/es/dao/ui/SegmentDurationEsUIDAO.java | 100 ++++++++ .../storage/es/dao/{ => ui}/SegmentEsUIDAO.java | 4 +- .../storage/es/dao/ui/ServiceAlarmEsUIDAO.java | 90 +++++++ .../storage/es/dao/ui/ServiceMetricEsUIDAO.java | 231 +++++++++++++++++ .../es/dao/ui/ServiceNameServiceEsUIDAO.java | 73 ++++++ .../es/dao/ui/ServiceReferenceEsMetricUIDAO.java | 200 +++++++++++++++ .../es/define/SegmentCostEsTableDefine.java | 49 ---- .../es/define/SegmentDurationEsTableDefine.java | 49 ++++ ...AbstractApplicationAlarmListEsTableDefine.java} | 16 +- .../ApplicationAlarmListDayEsTableDefine.java} | 17 +- .../ApplicationAlarmListHourEsTableDefine.java} | 17 +- .../ApplicationAlarmListMinuteEsTableDefine.java} | 17 +- .../ApplicationAlarmListMonthEsTableDefine.java} | 17 +- .../AbstractApplicationComponentEsTableDefine.java | 2 +- .../AbstractApplicationMappingEsTableDefine.java | 2 +- .../define/register/ApplicationEsTableDefine.java | 1 + .../register/NetworkAddressEsTableDefine.java | 2 + .../define/register/ServiceNameEsTableDefine.java | 2 +- .../main/resources/META-INF/defines/storage.define | 9 +- .../storage/h2/StorageModuleH2Provider.java | 104 +++++--- .../collector/storage/h2/dao/GCMetricH2UIDAO.java | 161 ------------ .../storage/h2/dao/InstanceMetricH2UIDAO.java | 169 ------------- .../storage/h2/dao/MemoryMetricH2UIDAO.java | 107 -------- .../storage/h2/dao/SegmentCostH2UIDAO.java | 155 ------------ ...O.java => SegmentDurationH2PersistenceDAO.java} | 38 +-- .../storage/h2/dao/ServiceReferenceH2UIDAO.java | 103 -------- ...stractApplicationComponentH2PersistenceDAO.java | 5 +- ...tractApplicationAlarmListH2PersistenceDAO.java} | 17 +- .../ApplicationAlarmListH2DayPersistenceDAO.java | 41 +++ .../ApplicationAlarmListH2HourPersistenceDAO.java | 41 +++ ...ApplicationAlarmListH2MinutePersistenceDAO.java | 41 +++ .../ApplicationAlarmListH2MonthPersistenceDAO.java | 41 +++ .../AbstractApplicationMetricH2PersistenceDAO.java | 1 + ...AbstractApplicationMappingH2PersistenceDAO.java | 5 +- ...ApplicationReferenceMetricH2PersistenceDAO.java | 1 + .../h2/dao/cache/ApplicationH2CacheDAO.java | 16 +- .../h2/dao/cache/NetworkAddressH2CacheDAO.java | 29 ++- .../h2/dao/cache/ServiceNameH2CacheDAO.java | 17 +- .../cpump/AbstractCpuMetricH2PersistenceDAO.java | 1 + .../dao/gcmp/AbstractGCMetricH2PersistenceDAO.java | 1 + .../AbstractInstanceMetricH2PersistenceDAO.java | 3 +- .../AbstractInstanceMappingH2PersistenceDAO.java | 1 + ...actInstanceReferenceMetricH2PersistenceDAO.java | 1 + .../AbstractMemoryMetricH2PersistenceDAO.java | 1 + .../AbstractMemoryPoolMetricH2PersistenceDAO.java | 1 + .../h2/dao/register/InstanceRegisterH2DAO.java | 7 +- .../dao/register/NetworkAddressRegisterH2DAO.java | 20 ++ .../smp/AbstractServiceMetricH2PersistenceDAO.java | 1 + ...ractServiceReferenceMetricH2PersistenceDAO.java | 1 + .../h2/dao/ui/ApplicationAlarmH2UIDAO.java} | 22 +- .../h2/dao/ui/ApplicationAlarmListH2UIDAO.java} | 20 +- .../dao/{ => ui}/ApplicationComponentH2UIDAO.java | 43 ++-- .../h2/dao/{ => ui}/ApplicationMappingH2UIDAO.java | 36 +-- .../h2/dao/ui/ApplicationMetricH2UIDAO.java | 47 ++++ .../ApplicationReferenceMetricH2UIDAO.java | 23 +- .../storage/h2/dao/{ => ui}/CpuMetricH2UIDAO.java | 58 ++--- .../storage/h2/dao/ui/GCMetricH2UIDAO.java | 83 +++++++ .../h2/dao/{ => ui}/GlobalTraceH2UIDAO.java | 4 +- .../storage/h2/dao/ui/InstanceAlarmH2UIDAO.java} | 20 +- .../storage/h2/dao/{ => ui}/InstanceH2UIDAO.java | 57 +++-- .../storage/h2/dao/ui/InstanceMetricH2UIDAO.java | 106 ++++++++ .../storage/h2/dao/ui/MemoryMetricH2UIDAO.java | 86 +++++++ .../h2/dao/{ => ui}/MemoryPoolMetricH2UIDAO.java | 12 +- .../NetworkAddressH2UIDAO.java} | 46 ++-- .../storage/h2/dao/ui/SegmentDurationH2UIDAO.java | 118 +++++++++ .../storage/h2/dao/{ => ui}/SegmentH2UIDAO.java | 4 +- .../storage/h2/dao/ui/ServiceAlarmH2UIDAO.java} | 20 +- .../storage/h2/dao/ui/ServiceMetricH2UIDAO.java | 123 +++++++++ .../h2/dao/ui/ServiceNameServiceH2UIDAO.java | 79 ++++++ .../h2/dao/ui/ServiceReferenceH2MetricUIDAO.java | 57 +++++ .../h2/define/SegmentCostH2TableDefine.java | 45 ---- .../h2/define/SegmentDurationH2TableDefine.java | 46 ++++ ...AbstractApplicationAlarmListH2TableDefine.java} | 6 +- .../ApplicationAlarmListDayH2TableDefine.java} | 13 +- .../ApplicationAlarmListHourH2TableDefine.java} | 13 +- .../ApplicationAlarmListMinuteH2TableDefine.java} | 13 +- .../ApplicationAlarmListMonthH2TableDefine.java} | 13 +- .../AbstractApplicationComponentH2TableDefine.java | 2 +- .../AbstractApplicationMappingH2TableDefine.java | 2 +- .../define/register/ApplicationH2TableDefine.java | 1 + .../register/NetworkAddressH2TableDefine.java | 2 + .../main/resources/META-INF/defines/storage.define | 11 +- .../{ => collector-ui-graphql}/pom.xml | 17 +- .../apm/collector/ui/graphql/Mutation.java} | 7 +- .../apm/collector/ui/graphql/Query.java} | 7 +- .../apm/collector/ui/graphql/VersionMutation.java} | 8 +- .../apm/collector/ui/graphql/VersionQuery.java} | 8 +- .../collector-ui-jetty-provider/pom.xml | 5 + .../collector/ui/jetty/UIModuleJettyProvider.java | 26 +- .../collector/ui/jetty/handler/GraphQLHandler.java | 156 ++++++++++++ .../ui/jetty/handler/SegmentTopGetHandler.java | 141 ----------- .../collector/ui/jetty/handler/SpanGetHandler.java | 66 ----- .../ui/jetty/handler/TraceDagGetHandler.java | 77 ------ .../ui/jetty/handler/TraceStackGetHandler.java | 58 ----- .../application/ApplicationsGetHandler.java | 77 ------ .../instancehealth/InstanceHealthGetHandler.java | 85 ------- .../InstanceMetricGetOneTimeBucketHandler.java | 86 ------- .../InstanceMetricGetRangeTimeBucketHandler.java | 94 ------- .../instancemetric/InstanceOsInfoGetHandler.java | 65 ----- .../servicetree/ServiceTreeGetByIdHandler.java | 85 ------- .../time/AllInstanceLastTimeGetHandler.java | 71 ------ .../time/OneInstanceLastTimeGetHandler.java | 70 ------ .../apm/collector/ui/mutation/ConfigMutation.java} | 19 +- .../apm/collector/ui/query/AlarmQuery.java | 70 ++++++ .../apm/collector/ui/query/ApplicationQuery.java | 100 ++++++++ .../apm/collector/ui/query/ConfigQuery.java} | 21 +- .../apm/collector/ui/query/OverViewLayerQuery.java | 142 +++++++++++ .../apm/collector/ui/query/ServerQuery.java | 96 +++++++ .../apm/collector/ui/query/ServiceQuery.java | 91 +++++++ .../apm/collector/ui/query/TraceQuery.java | 77 ++++++ .../apm/collector/ui/service/AlarmService.java | 87 +++++++ .../collector/ui/service/ApplicationService.java | 74 +++++- .../ui/service/ApplicationTopologyService.java | 129 ++++++++++ .../ui/service/ClusterTopologyService.java | 86 +++++++ .../ui/service/InstanceHealthService.java | 114 --------- .../collector/ui/service/InstanceJVMService.java | 144 ----------- ...nousService.java => NetworkAddressService.java} | 26 +- .../collector/ui/service/SegmentTopService.java | 44 +--- .../apm/collector/ui/service/ServerService.java | 184 ++++++++++++++ .../collector/ui/service/ServiceNameService.java | 98 ++++++++ .../ui/service/ServiceTopologyService.java | 93 +++++++ .../collector/ui/service/ServiceTreeService.java | 123 --------- .../apm/collector/ui/service/SpanService.java | 15 +- .../ui/service/TimeSynchronousService.java | 2 +- .../apm/collector/ui/service/TopologyBuilder.java | 155 ++++++++++++ .../collector/ui/service/TraceDagDataBuilder.java | 153 ------------ .../apm/collector/ui/service/TraceDagService.java | 64 ----- .../collector/ui/service/TraceStackService.java | 276 ++++++++++----------- .../apm/collector/ui/utils/DurationUtils.java | 186 ++++++++++++++ .../ui/query/ApplicationQueryTestCase.java | 139 +++++++++++ .../collector/ui/utils/DurationUtilsTestCase.java | 112 +++++++++ apm-collector/apm-collector-ui/pom.xml | 1 + .../network/trace/component/ComponentsDefine.java | 5 +- apm-protocol/apm-network/src/main/proto | 1 + .../main/proto/ApplicationRegisterService.proto | 20 -- .../src/main/proto/DiscoveryService.proto | 70 ------ .../apm-network/src/main/proto/Downstream.proto | 8 - .../src/main/proto/JVMMetricsService.proto | 64 ----- .../src/main/proto/KeyWithIntegerValue.proto | 9 - .../src/main/proto/KeyWithStringValue.proto | 9 - .../main/proto/NetworkAddressRegisterService.proto | 19 -- .../src/main/proto/TraceSegmentService.proto | 87 ------- apm-protocol/apm-ui-protocol/pom.xml | 2 +- .../src/main/resources/ui-graphql/alarm.graphqls | 1 + .../ui-graphql/application-layer.graphqls | 26 +- .../src/main/resources/ui-graphql/common.graphqls | 4 +- .../resources/ui-graphql/overview-layer.graphqls | 10 +- .../resources/ui-graphql/server-layer.graphqls | 6 +- .../resources/ui-graphql/service-layer.graphqls | 12 +- .../src/main/resources/ui-graphql/trace.graphqls | 3 +- .../apm/agent/core/boot/ServiceManager.java | 7 +- .../apm/agent/core/context/TracingContext.java | 2 +- .../core/context/trace/StackBasedTracingSpan.java | 3 +- .../core/dictionary/OperationNameDictionary.java | 35 ++- .../core/remote/CollectorDiscoveryService.java | 6 +- .../kafka/v1/define/CallbackInstrumentation.java | 2 +- .../v1/define/KafkaConsumerInstrumentation.java | 7 +- .../v1/define/KafkaProducerInstrumentation.java | 4 +- .../v1/define/ProducerRecordInstrumentation.java | 2 +- apm-sniffer/apm-sdk-plugin/pom.xml | 1 + .../apm-sdk-plugin/servicecomb-plugin/pom.xml | 26 ++ .../servicecomb-java-chassis-0.x-plugin/pom.xml | 46 ++++ .../ProducerOperationHandlerInterceptor.java | 80 ++++++ .../TransportClientHandlerInterceptor.java | 104 ++++++++ .../ProducerOperationHandlerInstrumentation.java} | 45 ++-- .../TransportClientHandlerInstrumentation.java} | 47 ++-- .../src/main/resources/skywalking-plugin.def | 2 + .../ProducerOperationHandlerInterceptorTest.java | 133 ++++++++++ .../TransportClientHandlerInterceptorTest.java | 128 ++++++++++ docker-compose.yml | 4 +- docs/README.md | 4 + docs/README_ZH.md | 4 + docs/Supported-list.md | 3 +- skywalking-ui | 1 + 391 files changed, 9730 insertions(+), 5682 deletions(-) create mode 100644 .gitmodules delete mode 100644 apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandlerTestCase.java delete mode 100644 apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/JVMMetricServiceHandlerTestCase.java rename apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/{InstHeartBeatServiceTestCase.java => mock/AgentDataMock.java} (60%) create mode 100644 apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/ConsumerMock.java create mode 100644 apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/JVMMetricMock.java create mode 100644 apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/ProviderMock.java create mode 100644 apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/RegisterMock.java create mode 100644 apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/TimeBuilder.java create mode 100644 apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/TraceSegmentMock.java copy apm-collector/{apm-collector-analysis/analysis-metric/metric-define/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/define/MetricSource.java => apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/UniqueIdBuilder.java} (60%) copy apm-collector/{apm-collector-boot/src/main => apm-collector-agent/agent-grpc/agent-grpc-provider/src/test}/resources/log4j2.xml (100%) copy apm-collector/{apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/alarm/IApplicationAlarmListPersistenceDAO.java => apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/ApplicationMetricAlarmListCopy.java} (51%) copy apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/{ApplicationMetricAlarmListPersistenceWorker.java => ApplicationMetricAlarmListDayPersistenceWorker.java} (79%) copy apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/{ApplicationMetricAlarmToListNodeProcessor.java => ApplicationMetricAlarmListDayTransformNode.java} (52%) copy apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/{ApplicationMetricAlarmListPersistenceWorker.java => ApplicationMetricAlarmListHourPersistenceWorker.java} (78%) copy apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/{ApplicationMetricAlarmToListNodeProcessor.java => ApplicationMetricAlarmListHourTransformNode.java} (52%) copy apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/{ApplicationMetricAlarmListPersistenceWorker.java => ApplicationMetricAlarmListMinutePersistenceWorker.java} (78%) rename apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/{ApplicationMetricAlarmListPersistenceWorker.java => ApplicationMetricAlarmListMonthPersistenceWorker.java} (78%) copy apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/{ApplicationMetricAlarmToListNodeProcessor.java => ApplicationMetricAlarmListMonthTransformNode.java} (52%) rename apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/segment/{SegmentCostGraph.java => SegmentDurationGraph.java} (83%) rename apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/segment/{SegmentCostPersistenceWorker.java => SegmentDurationPersistenceWorker.java} (74%) rename apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/segment/{SegmentCostSpanListener.java => SegmentDurationSpanListener.java} (71%) rename apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/java/org/apache/skywalking/apm/collector/cache/guava/service/{NetworAddressCacheGuavaService.java => NetworkAddressCacheGuavaService.java} (70%) delete mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/IInstanceMetricUIDAO.java rename apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{ISegmentCostPersistenceDAO.java => ISegmentDurationPersistenceDAO.java} (86%) delete mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/IServiceReferenceUIDAO.java copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/alarm/{IApplicationAlarmListPersistenceDAO.java => IApplicationAlarmListDayPersistenceDAO.java} (86%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/alarm/{IApplicationAlarmListPersistenceDAO.java => IApplicationAlarmListHourPersistenceDAO.java} (86%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/alarm/{IApplicationAlarmListPersistenceDAO.java => IApplicationAlarmListMinutePersistenceDAO.java} (86%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/alarm/{IApplicationAlarmListPersistenceDAO.java => IApplicationAlarmListMonthPersistenceDAO.java} (86%) rename apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{ICpuMetricUIDAO.java => ui/IApplicationAlarmListUIDAO.java} (76%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{IGlobalTraceUIDAO.java => ui/IApplicationAlarmUIDAO.java} (73%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{IInstanceUIDAO.java => ui/IApplicationComponentUIDAO.java} (59%) rename apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{IGCMetricUIDAO.java => ui/IApplicationMappingUIDAO.java} (53%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{IGlobalTraceUIDAO.java => ui/IApplicationMetricUIDAO.java} (65%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{ => ui}/IApplicationReferenceMetricUIDAO.java (59%) rename apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{IApplicationReferenceMetricUIDAO.java => ui/ICpuMetricUIDAO.java} (71%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{ISegmentCostUIDAO.java => ui/IGCMetricUIDAO.java} (68%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{ => ui}/IGlobalTraceUIDAO.java (94%) rename apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{IMemoryMetricUIDAO.java => ui/IInstanceAlarmUIDAO.java} (74%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{ISegmentCostUIDAO.java => ui/IInstanceMetricUIDAO.java} (54%) rename apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{ => ui}/IInstanceUIDAO.java (65%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ui/IMemoryMetricUIDAO.java rename apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{ => ui}/IMemoryPoolMetricUIDAO.java (95%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{IGlobalTraceUIDAO.java => ui/INetworkAddressUIDAO.java} (76%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{IGlobalTraceUIDAO.java => ui/ISegmentDurationUIDAO.java} (71%) rename apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{ => ui}/ISegmentUIDAO.java (94%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{IGlobalTraceUIDAO.java => ui/IServiceAlarmUIDAO.java} (74%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ui/IServiceMetricUIDAO.java copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{IGlobalTraceUIDAO.java => ui/IServiceNameServiceUIDAO.java} (77%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{ISegmentCostUIDAO.java => ui/IServiceReferenceMetricUIDAO.java} (51%) copy apm-collector/{apm-collector-analysis/analysis-metric/metric-define/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/define => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table}/MetricSource.java (93%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/register/{NetworkAddressTable.java => ServerType.java} (67%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/register/ServerTypeDefine.java rename apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/segment/{SegmentCost.java => SegmentDuration.java} (73%) rename apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/segment/{SegmentCostTable.java => SegmentDurationTable.java} (85%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/ISegmentCostUIDAO.java => ui/alarm/Alarm.java} (63%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/alarm/AlarmItem.java copy apm-collector/{apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/service/INetworkAddressIDService.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/alarm/AlarmType.java} (77%) copy apm-collector/{apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/service/INetworkAddressIDService.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/alarm/CauseType.java} (77%) copy apm-collector/apm-collector-storage/{collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/StorageModuleEsNamingListener.java => collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/application/Application.java} (60%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/application/ApplicationNode.java rename apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/IApplicationMappingUIDAO.java => ui/application/ConjecturalNode.java} (76%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/common/Call.java copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/ISegmentCostUIDAO.java => ui/common/Duration.java} (61%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/ISegmentCostUIDAO.java => ui/common/Node.java} (62%) copy apm-collector/apm-collector-storage/{collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/StorageModuleEsNamingListener.java => collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/common/Pagination.java} (58%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/IGlobalTraceUIDAO.java => ui/common/ResponseTimeTrend.java} (74%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/IGlobalTraceUIDAO.java => ui/common/SLATrend.java} (74%) copy apm-collector/{apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/service/INetworkAddressIDService.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/common/Step.java} (77%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/IGlobalTraceUIDAO.java => ui/common/ThroughputTrend.java} (67%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/ISegmentCostUIDAO.java => ui/common/Topology.java} (61%) copy apm-collector/{apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/service/INetworkAddressIDService.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/common/VisualUserNode.java} (77%) copy apm-collector/{apm-collector-cache/collector-cache-define/src/main/java/org/apache/skywalking/apm/collector/cache/service/NetworkAddressCacheService.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/config/AlarmThreshold.java} (72%) rename apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/IApplicationComponentUIDAO.java => ui/config/ExistedAlarmThresholdItem.java} (76%) copy apm-collector/{apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/service/INetworkAddressIDService.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/config/ExistedAlarmThresholds.java} (77%) copy apm-collector/{apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/service/INetworkAddressIDService.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/config/ExistedTTLConfigs.java} (77%) copy apm-collector/{apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/service/INetworkAddressIDService.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/config/TTL.java} (77%) copy apm-collector/{apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/service/INetworkAddressIDService.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/config/TTLConfigItem.java} (77%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/IGlobalTraceUIDAO.java => ui/overview/AlarmTrend.java} (65%) copy apm-collector/apm-collector-storage/{collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/StorageModuleEsNamingListener.java => collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/overview/ApplicationTPS.java} (57%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/overview/ClusterBrief.java copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/ISegmentCostUIDAO.java => ui/overview/ConjecturalApp.java} (62%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/IGlobalTraceUIDAO.java => ui/overview/ConjecturalAppBrief.java} (68%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/server/AppServerInfo.java copy apm-collector/{apm-collector-analysis/analysis-metric/metric-define/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/define/MetricSource.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/server/CPUTrend.java} (75%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/IGlobalTraceUIDAO.java => ui/server/GCTrend.java} (65%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/ISegmentCostUIDAO.java => ui/server/MemoryTrend.java} (50%) copy apm-collector/{apm-collector-analysis/analysis-metric/metric-define/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/define/MetricSource.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/service/ServiceInfo.java} (70%) copy apm-collector/apm-collector-storage/{collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/StorageModuleEsNamingListener.java => collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/service/ServiceMetric.java} (54%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/service/ServiceNode.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/BasicTrace.java copy apm-collector/{apm-collector-analysis/analysis-metric/metric-define/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/define/MetricSource.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/KeyValue.java} (73%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/ISegmentCostUIDAO.java => ui/trace/LogEntity.java} (63%) copy apm-collector/apm-collector-storage/{collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/StorageModuleEsNamingListener.java => collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/Ref.java} (50%) copy apm-collector/{apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/service/INetworkAddressIDService.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/RefType.java} (77%) copy apm-collector/{apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/service/INetworkAddressIDService.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/Segment.java} (77%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/Span.java rename apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/IGlobalTraceUIDAO.java => ui/trace/Trace.java} (71%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/ISegmentCostUIDAO.java => ui/trace/TraceBrief.java} (62%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/TraceQueryCondition.java copy apm-collector/{apm-collector-analysis/analysis-metric/metric-define/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/define/MetricSource.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/utils/DurationPoint.java} (67%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/utils/TimePyramidTableNameBuilder.java copy apm-collector/apm-collector-storage/collector-storage-define/src/{main/java/org/apache/skywalking/apm/collector/storage/table/register/ApplicationTable.java => test/java/org/apache/skywalking/apm/collector/storage/table/register/ServerTypeDefineTestCase.java} (56%) delete mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ApplicationReferenceMetricEsUIDAO.java delete mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/GCMetricEsUIDAO.java delete mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/InstanceMetricEsUIDAO.java delete mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/MemoryMetricEsUIDAO.java delete mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/SegmentCostEsUIDAO.java rename apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/{SegmentCostEsPersistenceDAO.java => SegmentDurationEsPersistenceDAO.java} (63%) delete mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ServiceReferenceEsUIDAO.java copy apm-collector/apm-collector-storage/{collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/alarm/ApplicationAlarmListH2PersistenceDAO.java => collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/AbstractApplicationAlarmListEsPersistenceDAO.java} (51%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/ApplicationAlarmListEsDayPersistenceDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/ApplicationAlarmListEsHourPersistenceDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/ApplicationAlarmListEsMinutePersistenceDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/ApplicationAlarmListEsMonthPersistenceDAO.java delete mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/ApplicationAlarmListEsPersistenceDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ApplicationAlarmEsUIDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ApplicationAlarmListEsUIDAO.java rename apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/{ => ui}/ApplicationComponentEsUIDAO.java (65%) rename apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/{ => ui}/ApplicationMappingEsUIDAO.java (72%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ApplicationMetricEsUIDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ApplicationReferenceMetricEsUIDAO.java rename apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/{ => ui}/CpuMetricEsUIDAO.java (59%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/GCMetricEsUIDAO.java rename apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/{ => ui}/GlobalTraceEsUIDAO.java (96%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/InstanceAlarmEsUIDAO.java rename apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/{ => ui}/InstanceEsUIDAO.java (69%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/InstanceMetricEsUIDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/MemoryMetricEsUIDAO.java rename apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/{ => ui}/MemoryPoolMetricEsUIDAO.java (91%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/NetworkAddressEsUIDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/SegmentDurationEsUIDAO.java rename apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/{ => ui}/SegmentEsUIDAO.java (94%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ServiceAlarmEsUIDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ServiceMetricEsUIDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ServiceNameServiceEsUIDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ServiceReferenceEsMetricUIDAO.java delete mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/SegmentCostEsTableDefine.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/SegmentDurationEsTableDefine.java rename apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/alarm/{ApplicationAlarmListEsTableDefine.java => AbstractApplicationAlarmListEsTableDefine.java} (85%) copy apm-collector/apm-collector-storage/{collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/alarm/IApplicationAlarmListPersistenceDAO.java => collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/alarm/ApplicationAlarmListDayEsTableDefine.java} (62%) copy apm-collector/apm-collector-storage/{collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/alarm/IApplicationAlarmListPersistenceDAO.java => collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/alarm/ApplicationAlarmListHourEsTableDefine.java} (62%) copy apm-collector/apm-collector-storage/{collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/alarm/IApplicationAlarmListPersistenceDAO.java => collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/alarm/ApplicationAlarmListMinuteEsTableDefine.java} (61%) copy apm-collector/apm-collector-storage/{collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/alarm/IApplicationAlarmListPersistenceDAO.java => collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/alarm/ApplicationAlarmListMonthEsTableDefine.java} (62%) delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/GCMetricH2UIDAO.java delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/InstanceMetricH2UIDAO.java delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/MemoryMetricH2UIDAO.java delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/SegmentCostH2UIDAO.java rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{SegmentCostH2PersistenceDAO.java => SegmentDurationH2PersistenceDAO.java} (59%) delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ServiceReferenceH2UIDAO.java rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/alarm/{ApplicationAlarmListH2PersistenceDAO.java => AbstractApplicationAlarmListH2PersistenceDAO.java} (78%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/alarm/ApplicationAlarmListH2DayPersistenceDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/alarm/ApplicationAlarmListH2HourPersistenceDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/alarm/ApplicationAlarmListH2MinutePersistenceDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/alarm/ApplicationAlarmListH2MonthPersistenceDAO.java copy apm-collector/{apm-collector-analysis/analysis-metric/metric-define/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/define/MetricSource.java => apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/ApplicationAlarmH2UIDAO.java} (55%) copy apm-collector/apm-collector-storage/{collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ISegmentCostUIDAO.java => collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/ApplicationAlarmListH2UIDAO.java} (57%) rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ => ui}/ApplicationComponentH2UIDAO.java (65%) rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ => ui}/ApplicationMappingH2UIDAO.java (68%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/ApplicationMetricH2UIDAO.java rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ => ui}/ApplicationReferenceMetricH2UIDAO.java (83%) rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ => ui}/CpuMetricH2UIDAO.java (55%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/GCMetricH2UIDAO.java rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ => ui}/GlobalTraceH2UIDAO.java (96%) copy apm-collector/{apm-collector-analysis/analysis-metric/metric-define/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/define/MetricSource.java => apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/InstanceAlarmH2UIDAO.java} (58%) rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ => ui}/InstanceH2UIDAO.java (71%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/InstanceMetricH2UIDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/MemoryMetricH2UIDAO.java rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ => ui}/MemoryPoolMetricH2UIDAO.java (92%) copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{SegmentH2UIDAO.java => ui/NetworkAddressH2UIDAO.java} (51%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/SegmentDurationH2UIDAO.java rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ => ui}/SegmentH2UIDAO.java (95%) rename apm-collector/{apm-collector-analysis/analysis-metric/metric-define/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/define/MetricSource.java => apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/ServiceAlarmH2UIDAO.java} (58%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/ServiceMetricH2UIDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/ServiceNameServiceH2UIDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/ServiceReferenceH2MetricUIDAO.java delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/SegmentCostH2TableDefine.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/SegmentDurationH2TableDefine.java rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/alarm/{ApplicationAlarmListH2TableDefine.java => AbstractApplicationAlarmListH2TableDefine.java} (91%) copy apm-collector/apm-collector-storage/{collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/alarm/IApplicationAlarmListPersistenceDAO.java => collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/alarm/ApplicationAlarmListDayH2TableDefine.java} (65%) copy apm-collector/apm-collector-storage/{collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/alarm/IApplicationAlarmListPersistenceDAO.java => collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/alarm/ApplicationAlarmListHourH2TableDefine.java} (65%) copy apm-collector/apm-collector-storage/{collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/alarm/IApplicationAlarmListPersistenceDAO.java => collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/alarm/ApplicationAlarmListMinuteH2TableDefine.java} (65%) rename apm-collector/apm-collector-storage/{collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/alarm/IApplicationAlarmListPersistenceDAO.java => collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/alarm/ApplicationAlarmListMonthH2TableDefine.java} (65%) copy apm-collector/apm-collector-ui/{ => collector-ui-graphql}/pom.xml (79%) copy apm-collector/{apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/service/INetworkAddressIDService.java => apm-collector-ui/collector-ui-graphql/src/main/java/org/apache/skywalking/apm/collector/ui/graphql/Mutation.java} (77%) copy apm-collector/{apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/service/INetworkAddressIDService.java => apm-collector-ui/collector-ui-graphql/src/main/java/org/apache/skywalking/apm/collector/ui/graphql/Query.java} (77%) copy apm-collector/{apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/service/INetworkAddressIDService.java => apm-collector-ui/collector-ui-graphql/src/main/java/org/apache/skywalking/apm/collector/ui/graphql/VersionMutation.java} (77%) copy apm-collector/{apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/service/INetworkAddressIDService.java => apm-collector-ui/collector-ui-graphql/src/main/java/org/apache/skywalking/apm/collector/ui/graphql/VersionQuery.java} (77%) create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/handler/GraphQLHandler.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/handler/SegmentTopGetHandler.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/handler/SpanGetHandler.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/handler/TraceDagGetHandler.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/handler/TraceStackGetHandler.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/handler/application/ApplicationsGetHandler.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/handler/instancehealth/InstanceHealthGetHandler.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceMetricGetOneTimeBucketHandler.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceMetricGetRangeTimeBucketHandler.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceOsInfoGetHandler.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/handler/servicetree/ServiceTreeGetByIdHandler.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/handler/time/AllInstanceLastTimeGetHandler.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/handler/time/OneInstanceLastTimeGetHandler.java copy apm-collector/{apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ISegmentCostUIDAO.java => apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/mutation/ConfigMutation.java} (63%) create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/AlarmQuery.java create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/ApplicationQuery.java rename apm-collector/{apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ISegmentCostUIDAO.java => apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/ConfigQuery.java} (60%) create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/OverViewLayerQuery.java create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/ServerQuery.java create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/ServiceQuery.java create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/TraceQuery.java create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/AlarmService.java create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ApplicationTopologyService.java create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ClusterTopologyService.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/InstanceHealthService.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/InstanceJVMService.java copy apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/{TimeSynchronousService.java => NetworkAddressService.java} (58%) create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ServerService.java create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ServiceNameService.java create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ServiceTopologyService.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ServiceTreeService.java create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/TopologyBuilder.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/TraceDagDataBuilder.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/TraceDagService.java create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/utils/DurationUtils.java create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/query/ApplicationQueryTestCase.java create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/utils/DurationUtilsTestCase.java create mode 160000 apm-protocol/apm-network/src/main/proto delete mode 100644 apm-protocol/apm-network/src/main/proto/ApplicationRegisterService.proto delete mode 100644 apm-protocol/apm-network/src/main/proto/DiscoveryService.proto delete mode 100644 apm-protocol/apm-network/src/main/proto/Downstream.proto delete mode 100644 apm-protocol/apm-network/src/main/proto/JVMMetricsService.proto delete mode 100644 apm-protocol/apm-network/src/main/proto/KeyWithIntegerValue.proto delete mode 100644 apm-protocol/apm-network/src/main/proto/KeyWithStringValue.proto delete mode 100644 apm-protocol/apm-network/src/main/proto/NetworkAddressRegisterService.proto delete mode 100644 apm-protocol/apm-network/src/main/proto/TraceSegmentService.proto create mode 100644 apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml create mode 100644 apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/pom.xml create mode 100644 apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/ProducerOperationHandlerInterceptor.java create mode 100644 apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/TransportClientHandlerInterceptor.java copy apm-sniffer/apm-sdk-plugin/{kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/CallbackInstrumentation.java => servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/define/ProducerOperationHandlerInstrumentation.java} (55%) copy apm-sniffer/apm-sdk-plugin/{kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/CallbackInstrumentation.java => servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/define/TransportClientHandlerInstrumentation.java} (55%) create mode 100644 apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/resources/skywalking-plugin.def create mode 100644 apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/ProducerOperationHandlerInterceptorTest.java create mode 100644 apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/TransportClientHandlerInterceptorTest.java create mode 160000 skywalking-ui -- To stop receiving notification emails like this one, please contact wush...@apache.org.