This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch ui/license
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit e88750d7edb9fc780776052f5bb63fe1b84b9a78
Merge: 3cd6fa5 b35eaac
Author: 吴晟 Wu Sheng <wu.sh...@foxmail.com>
AuthorDate: Mon Jun 25 22:32:25 2018 +0800
Merge branch 'master' into ui/license
.../handler/ApplicationRegisterServiceHandler.java | 4 +-
.../provider/handler/JVMMetricsServiceHandler.java | 21 ++--
.../NetworkAddressRegisterServiceHandler.java | 5 +-
.../handler/TraceSegmentServiceHandler.java | 5 +-
.../NetworkAddressRegisterServletHandler.java | 19 ++--
.../handler/TraceSegmentServletHandler.java | 20 ++--
.../jvm/provider/service/GCMetricService.java | 6 +-
.../provider/service/InstanceHeartBeatService.java | 4 +-
.../ApplicationComponentSpanListener.java | 2 +-
.../mapping/ApplicationMappingSpanListener.java | 15 ++-
.../worker/global/GlobalTraceSpanListener.java | 10 +-
.../mapping/InstanceMappingSpanListener.java | 15 ++-
.../segment/SegmentDurationSpanListener.java | 6 +-
.../heartbeat/ServiceNameAggregationWorker.java | 2 +-
.../ServiceNameHeartBeatPersistenceWorker.java | 2 +-
.../service/heartbeat/ServiceNameSpanListener.java | 2 +-
.../ServiceReferenceMetricSpanListener.java | 10 +-
.../register/ApplicationRegisterRemoteWorker.java | 17 ++-
.../register/ApplicationRegisterSerialWorker.java | 16 ++-
.../register/InstanceRegisterRemoteWorker.java | 16 ++-
.../register/InstanceRegisterSerialWorker.java | 16 ++-
.../NetworkAddressRegisterRemoteWorker.java | 17 ++-
.../NetworkAddressRegisterSerialWorker.java | 14 +--
.../register/ServiceNameRegisterSerialWorker.java | 5 +-
.../provider/service/InstanceIDService.java | 10 +-
.../provider/buffer/SegmentBufferManager.java | 5 +-
.../provider/buffer/SegmentBufferReader.java | 11 +-
.../parser/provider/parser/SegmentParse.java | 20 ++--
.../provider/parser/SegmentPersistenceWorker.java | 2 +-
.../parser/standardization/SpanIdExchanger.java | 12 ++-
.../provider/service/SegmentBase64Printer.java | 2 +-
.../base/AbstractLocalAsyncWorkerProvider.java | 2 +-
.../analysis/worker/model/base/AbstractWorker.java | 2 +-
.../worker/model/base/LocalAsyncWorkerRef.java | 8 +-
.../worker/model/base/RemoteWorkerRef.java | 2 +-
.../worker/model/impl/AggregationWorker.java | 21 ++--
.../worker/model/impl/MergePersistenceWorker.java | 14 ++-
.../model/impl/NonMergePersistenceWorker.java | 4 +-
.../worker/model/impl/PersistenceWorker.java | 2 +-
.../analysis/worker/timer/PersistenceTimer.java | 25 +++--
.../src/main/resources/application.yml | 8 +-
.../guava/service/ServiceIdCacheGuavaService.java | 2 +-
.../service/ServiceNameCacheGuavaService.java | 13 ++-
.../client/elasticsearch/ElasticSearchClient.java | 22 ++--
.../apm/collector/core/cache/Window.java | 2 +-
.../apm/collector/core/data/StreamData.java | 16 ++-
.../core/data/operator/NonMergeOperation.java | 1 +
.../apm/collector/instrument/MetricTree.java | 12 +--
.../collector/instrument/ServiceMetricTracing.java | 10 +-
.../instrument/tools/ReportFormatter.java | 27 ++---
.../service/selector/ForeverFirstSelector.java | 4 +-
.../storage/base/dao/IPersistenceDAO.java | 5 +-
.../storage/table/alarm/ApplicationAlarm.java | 5 +-
.../storage/table/alarm/ApplicationAlarmList.java | 5 +-
.../table/alarm/ApplicationReferenceAlarm.java | 5 +-
.../table/alarm/ApplicationReferenceAlarmList.java | 5 +-
.../storage/table/alarm/InstanceAlarm.java | 5 +-
.../storage/table/alarm/InstanceAlarmList.java | 5 +-
.../table/alarm/InstanceReferenceAlarm.java | 5 +-
.../table/alarm/InstanceReferenceAlarmList.java | 5 +-
.../storage/table/alarm/ServiceAlarm.java | 5 +-
.../storage/table/alarm/ServiceAlarmList.java | 5 +-
.../storage/table/alarm/ServiceReferenceAlarm.java | 5 +-
.../table/alarm/ServiceReferenceAlarmList.java | 5 +-
.../table/application/ApplicationComponent.java | 5 +-
.../table/application/ApplicationMapping.java | 5 +-
.../table/application/ApplicationMetric.java | 5 +-
.../application/ApplicationReferenceMetric.java | 5 +-
.../storage/table/global/GlobalTrace.java | 8 +-
.../table/global/ResponseTimeDistribution.java | 5 +-
.../storage/table/instance/InstanceMapping.java | 5 +-
.../storage/table/instance/InstanceMetric.java | 5 +-
.../table/instance/InstanceReferenceMetric.java | 5 +-
.../apm/collector/storage/table/jvm/GCMetric.java | 5 +-
.../collector/storage/table/jvm/MemoryMetric.java | 5 +-
.../storage/table/jvm/MemoryPoolMetric.java | 5 +-
.../storage/table/register/Application.java | 8 +-
.../collector/storage/table/register/Instance.java | 5 +-
.../storage/table/register/NetworkAddress.java | 9 +-
.../storage/table/register/ServiceName.java | 5 +-
.../collector/storage/table/segment/Segment.java | 8 +-
.../storage/table/service/ServiceMetric.java | 5 +-
.../table/service/ServiceReferenceMetric.java | 6 +-
.../collector/storage/es/MetricTransformUtil.java | 41 +++----
.../storage/es/StorageModuleEsConfig.java | 36 +++++++
.../storage/es/StorageModuleEsProvider.java | 4 +-
.../es/base/dao/AbstractPersistenceEsDAO.java | 12 ++-
.../collector/storage/es/base/dao/BatchEsDAO.java | 72 -------------
.../storage/es/base/dao/BatchProcessEsDAO.java | 120 +++++++++++++++++++++
.../es/dao/GlobalTraceEsPersistenceDAO.java | 17 +--
.../es/dao/InstanceHeartBeatEsPersistenceDAO.java | 12 ++-
.../es/dao/SegmentDurationEsPersistenceDAO.java | 30 +++---
.../storage/es/dao/SegmentEsPersistenceDAO.java | 12 ++-
.../dao/ServiceNameHeartBeatEsPersistenceDAO.java | 30 ++++--
...stractApplicationComponentEsPersistenceDAO.java | 21 ++--
...stractApplicationAlarmListEsPersistenceDAO.java | 24 ++---
.../alarm/ApplicationAlarmEsPersistenceDAO.java | 22 ++--
.../ApplicationReferenceAlarmEsPersistenceDAO.java | 24 ++---
...licationReferenceAlarmListEsPersistenceDAO.java | 25 ++---
.../dao/alarm/InstanceAlarmEsPersistenceDAO.java | 24 ++---
.../alarm/InstanceAlarmListEsPersistenceDAO.java | 24 ++---
.../InstanceReferenceAlarmEsPersistenceDAO.java | 28 ++---
...InstanceReferenceAlarmListEsPersistenceDAO.java | 28 ++---
.../es/dao/alarm/ServiceAlarmEsPersistenceDAO.java | 26 ++---
.../alarm/ServiceAlarmListEsPersistenceDAO.java | 26 ++---
.../ServiceReferenceAlarmEsPersistenceDAO.java | 32 +++---
.../ServiceReferenceAlarmListEsPersistenceDAO.java | 32 +++---
.../AbstractApplicationMetricEsPersistenceDAO.java | 25 ++---
...AbstractApplicationMappingEsPersistenceDAO.java | 21 ++--
...ApplicationReferenceMetricEsPersistenceDAO.java | 26 ++---
.../dao/cpu/AbstractCpuMetricEsPersistenceDAO.java | 23 ++--
.../dao/gc/AbstractGCMetricEsPersistenceDAO.java | 25 ++---
.../AbstractInstanceMetricEsPersistenceDAO.java | 17 +--
.../AbstractInstanceMappingEsPersistenceDAO.java | 23 ++--
...actInstanceReferenceMetricEsPersistenceDAO.java | 23 ++--
.../AbstractMemoryMetricEsPersistenceDAO.java | 31 +++---
.../AbstractMemoryPoolMetricEsPersistenceDAO.java | 32 +++---
...ctResponseTimeDistributionEsPersistenceDAO.java | 26 ++---
.../smp/AbstractServiceMetricEsPersistenceDAO.java | 19 ++--
...ractServiceReferenceMetricEsPersistenceDAO.java | 27 ++---
.../es/dao/ui/ApplicationComponentEsUIDAO.java | 2 +-
.../es/dao/ui/ApplicationMappingEsUIDAO.java | 2 +-
.../es/dao/ui/ApplicationMetricEsUIDAO.java | 2 +-
.../dao/ui/ApplicationReferenceMetricEsUIDAO.java | 2 +-
.../storage/es/dao/ui/InstanceEsUIDAO.java | 6 +-
.../collector/storage/h2/base/dao/BatchH2DAO.java | 12 ++-
.../collector/ui/jetty/handler/GraphQLHandler.java | 53 +++------
.../ui/service/ApplicationTopologyService.java | 2 +-
.../ui/service/ClusterTopologyService.java | 2 +-
.../apm/collector/ui/service/TopologyBuilder.java | 50 +++++----
.../collector/ui/service/TopologyBuilderTest.java | 3 +-
131 files changed, 1063 insertions(+), 795 deletions(-)
