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 1afe6c7977df6e61c5d975b72c7de7e59659a1d8
Merge: a3609de e6f0c3e
Author: 吴晟 Wu Sheng <wu.sh...@foxmail.com>
AuthorDate: Fri Feb 9 16:35:05 2018 +0800
Merge pull request #775 from peng-yongsheng/feature/graphql-ui
Feature/graphql ui
.../handler/InstanceDiscoveryServiceHandler.java | 4 +-
.../NetworkAddressRegisterServiceHandler.java | 5 +-
.../NetworkAddressRegisterServletHandler.java | 2 +-
.../src/test/resources/json/dubbox-consumer.json | 52 ++--
.../src/test/resources/json/dubbox-provider.json | 57 +++--
.../resources/json/instance-register-consumer.json | 9 +-
.../resources/json/instance-register-provider.json | 9 +-
.../alarm/provider/worker/AlarmAssertWorker.java | 2 +-
.../jvm/provider/service/MemoryMetricService.java | 2 +-
.../metric/define/graph/MetricGraphIdDefine.java | 3 +-
.../metric/define/graph/MetricWorkerIdDefine.java | 66 ++---
.../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 +-
.../NetworkAddressRegisterSerialWorker.java | 2 +
.../provider/service/NetworkAddressIDService.java | 11 +-
.../standardization/ReferenceIdExchanger.java | 5 +-
.../parser/standardization/SpanIdExchanger.java | 2 +-
.../src/main/resources/application.yml | 22 +-
.../cache/service/ApplicationCacheService.java | 3 +-
.../cache/service/ServiceNameCacheService.java | 6 +-
.../service/ApplicationCacheGuavaService.java | 21 +-
.../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 | 62 +----
.../collector/core/util/TimeBucketUtilsTest.java | 25 --
.../apm/collector/storage/StorageModule.java | 40 +--
.../storage/dao/IInstanceMetricUIDAO.java | 61 -----
...AO.java => ISegmentDurationPersistenceDAO.java} | 4 +-
.../storage/dao/IServiceReferenceUIDAO.java | 30 ---
.../storage/dao/cache/IApplicationCacheDAO.java | 3 +-
.../storage/dao/cache/IServiceNameCacheDAO.java | 3 +-
.../IApplicationComponentUIDAO.java} | 33 ++-
.../IApplicationMappingUIDAO.java} | 45 ++--
.../{ => ui}/IApplicationReferenceMetricUIDAO.java | 15 +-
.../ICpuMetricUIDAO.java} | 10 +-
.../IGCMetricUIDAO.java} | 18 +-
.../storage/dao/{ => ui}/IGlobalTraceUIDAO.java | 2 +-
.../IInstanceMetricUIDAO.java} | 23 +-
.../storage/dao/{ => ui}/IInstanceUIDAO.java | 27 +-
.../storage/dao/ui/IMemoryMetricUIDAO.java | 60 +++++
.../dao/{ => ui}/IMemoryPoolMetricUIDAO.java | 2 +-
.../INetworkAddressUIDAO.java} | 7 +-
.../ISegmentDurationUIDAO.java} | 11 +-
.../storage/dao/{ => ui}/ISegmentUIDAO.java | 2 +-
.../storage/dao/ui/IServiceMetricUIDAO.java | 43 ++++
.../IServiceNameServiceUIDAO.java} | 11 +-
.../IServiceReferenceMetricUIDAO.java} | 26 +-
.../apm/collector/storage/table}/MetricSource.java | 2 +-
.../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 | 9 +
.../table/register/NetworkAddressTable.java | 1 +
.../{SegmentCost.java => SegmentDuration.java} | 37 +--
...entCostTable.java => SegmentDurationTable.java} | 8 +-
.../IGlobalTraceUIDAO.java => ui/alarm/Alarm.java} | 24 +-
.../apm/collector/storage/ui/alarm/AlarmItem.java} | 13 +-
.../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 ++++++++
.../storage/ui/application/ConjecturalNode.java} | 7 +-
.../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} | 15 +-
.../common/Topology.java} | 33 ++-
.../storage/ui/common/VisualUserNode.java} | 7 +-
.../storage/ui/config/AlarmThreshold.java} | 21 +-
.../ui/config/ExistedAlarmThresholdItem.java} | 9 +-
.../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} | 9 +-
.../storage/ui/overview/ClusterBrief.java | 70 ++++++
.../storage/ui/overview/ConjecturalApp.java} | 23 +-
.../overview/ConjecturalAppBrief.java} | 15 +-
.../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 +-
.../collector/storage/es/DataTTLKeeperTimer.java | 14 +-
.../storage/es/StorageModuleEsNamingListener.java | 3 +-
.../storage/es/StorageModuleEsProvider.java | 73 +++---
.../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 | 4 +-
...AbstractApplicationMappingEsPersistenceDAO.java | 4 +-
.../es/dao/cache/ApplicationEsCacheDAO.java | 12 +-
.../es/dao/cache/ServiceNameEsCacheDAO.java | 15 +-
.../es/dao/register/InstanceRegisterEsDAO.java | 7 +-
.../dao/register/NetworkAddressRegisterEsDAO.java | 1 +
.../dao/{ => ui}/ApplicationComponentEsUIDAO.java | 49 ++--
.../es/dao/{ => ui}/ApplicationMappingEsUIDAO.java | 35 +--
.../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}/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 | 49 ++++
.../storage/es/dao/ui/SegmentDurationEsUIDAO.java | 100 ++++++++
.../storage/es/dao/{ => ui}/SegmentEsUIDAO.java | 4 +-
.../storage/es/dao/ui/ServiceMetricEsUIDAO.java | 208 ++++++++++++++++
.../es/dao/ui/ServiceNameServiceEsUIDAO.java | 73 ++++++
.../es/dao/ui/ServiceReferenceEsMetricUIDAO.java | 200 +++++++++++++++
.../es/define/SegmentCostEsTableDefine.java | 49 ----
.../es/define/SegmentDurationEsTableDefine.java | 49 ++++
.../AbstractApplicationComponentEsTableDefine.java | 2 +-
.../AbstractApplicationMappingEsTableDefine.java | 2 +-
.../define/register/ApplicationEsTableDefine.java | 1 +
.../define/register/ServiceNameEsTableDefine.java | 2 +-
.../main/resources/META-INF/defines/storage.define | 2 +-
.../storage/h2/StorageModuleH2Provider.java | 71 +++---
.../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 | 4 +-
...AbstractApplicationMappingH2PersistenceDAO.java | 4 +-
.../h2/dao/cache/ApplicationH2CacheDAO.java | 16 +-
.../h2/dao/cache/ServiceNameH2CacheDAO.java | 17 +-
.../h2/dao/register/InstanceRegisterH2DAO.java | 7 +-
.../dao/register/NetworkAddressRegisterH2DAO.java | 1 +
.../dao/{ => ui}/ApplicationComponentH2UIDAO.java | 43 ++--
.../h2/dao/{ => ui}/ApplicationMappingH2UIDAO.java | 36 +--
.../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}/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} | 42 ++--
.../storage/h2/dao/ui/SegmentDurationH2UIDAO.java | 118 +++++++++
.../storage/h2/dao/{ => ui}/SegmentH2UIDAO.java | 4 +-
.../storage/h2/dao/ui/ServiceMetricH2UIDAO.java | 119 +++++++++
.../h2/dao/ui/ServiceNameServiceH2UIDAO.java | 79 ++++++
.../h2/dao/ui/ServiceReferenceH2MetricUIDAO.java | 57 +++++
.../h2/define/SegmentCostH2TableDefine.java | 45 ----
.../h2/define/SegmentDurationH2TableDefine.java | 46 ++++
.../AbstractApplicationComponentH2TableDefine.java | 2 +-
.../AbstractApplicationMappingH2TableDefine.java | 2 +-
.../define/register/ApplicationH2TableDefine.java | 1 +
.../main/resources/META-INF/defines/storage.define | 4 +-
.../{ => 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} | 21 +-
.../apm/collector/ui/query/ApplicationQuery.java | 86 +++++++
.../apm/collector/ui/query/ConfigQuery.java} | 21 +-
.../apm/collector/ui/query/OverViewLayerQuery.java | 145 +++++++++++
.../apm/collector/ui/query/ServerQuery.java | 96 +++++++
.../apm/collector/ui/query/ServiceQuery.java | 88 +++++++
.../apm/collector/ui/query/TraceQuery.java | 77 ++++++
...meSynchronousService.java => AlarmService.java} | 28 +--
.../collector/ui/service/ApplicationService.java | 40 ++-
.../ui/service/ApplicationTopologyService.java | 129 ++++++++++
.../ui/service/ClusterTopologyService.java | 86 +++++++
.../ui/service/InstanceHealthService.java | 108 ++++----
.../collector/ui/service/InstanceJVMService.java | 27 +-
...nousService.java => NetworkAddressService.java} | 26 +-
.../collector/ui/service/SegmentTopService.java | 44 +---
.../apm/collector/ui/service/ServerService.java | 181 ++++++++++++++
.../collector/ui/service/ServiceNameService.java | 86 +++++++
.../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 +
apm-protocol/apm-ui-protocol/pom.xml | 2 +-
.../src/main/resources/ui-graphql/alarm.graphqls | 1 +
.../ui-graphql/application-layer.graphqls | 12 +-
.../src/main/resources/ui-graphql/common.graphqls | 4 +-
.../resources/ui-graphql/overview-layer.graphqls | 4 +-
.../resources/ui-graphql/server-layer.graphqls | 6 +-
.../resources/ui-graphql/service-layer.graphqls | 12 +-
.../src/main/resources/ui-graphql/trace.graphqls | 3 +-
247 files changed, 6397 insertions(+), 4480 deletions(-)
--
To stop receiving notification emails like this one, please contact
wush...@apache.org.
