You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by pe...@apache.org on 2018/04/21 05:01:26 UTC
[incubator-skywalking] branch protocol/ui-beta updated (c98f50d ->
35b82d8)
This is an automated email from the ASF dual-hosted git repository.
pengys pushed a change to branch protocol/ui-beta
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from c98f50d `nodes` should not be null.
add 5101421 Update README.md (#1063)
add 564239f Update README.md (#1066)
add 5ea5471 add ContextManager.isActive() (#1070)
add 8612f80 add jdk-cross-thread-plugin (#845)
add daceca2 add doc for TraceCrossThread (#1067)
add b4ded22 add some basic testcase(apm-util and partial collector-ui-jetty-provider) (#1072)
add 9aa615d Feature/1032 (#1073)
add 9feede7 update skywalking-ui commit (#1075)
add c591984 Update Trace-Data-Protocol.md (#1076)
add f62381c apm collector ui module testcase completed (#1079)
add 0178acc jacoco_exclude_graphql (#1085)
add bd1286a Refactor ServerTypeDefine and ComponentsDefine to be more extendable (#1081)
add 59c945a Fix document error (#1087)
add d9e60e3 Update user cases (#1089)
add b0d6231 Replaced ObjectUtils for Objects methods (#1094)
add 4ce798c Update README and supported list (#1096)
add fc322e1 Feature/1064 (#1093)
add 35b82d8 Merge branch 'master' into protocol/ui-beta
No new revisions were added by this update.
Summary of changes:
README.md | 7 +
README_ZH.md | 7 +
.../{ActiveSpan.java => CallableWrapper.java} | 30 +--
.../apm/toolkit/trace/TraceCrossThread.java | 14 +-
.../grpc/provider/handler/mock/AgentDataMock.java | 33 +++-
.../provider/handler/mock/TraceSegmentMock.java | 60 +++---
.../provider/AnalysisAlarmModuleProvider.java | 3 +-
.../jvm/provider/AnalysisJVMModuleProvider.java | 3 +-
.../jvm/provider/service/CpuMetricService.java | 5 +-
.../jvm/provider/service/GCMetricService.java | 5 +-
.../jvm/provider/service/MemoryMetricService.java | 5 +-
.../provider/service/MemoryPoolMetricService.java | 5 +-
.../provider/AnalysisMetricModuleProvider.java | 3 +-
.../provider/service/InstanceHeartBeatService.java | 5 +-
...ServiceReferenceDayMetricPersistenceWorker.java | 4 +-
...erviceReferenceHourMetricPersistenceWorker.java | 4 +-
.../ServiceReferenceMetricSpanListener.java | 16 +-
...viceReferenceMinuteMetricPersistenceWorker.java | 4 +-
...rviceReferenceMonthMetricPersistenceWorker.java | 4 +-
.../define/service/INetworkAddressIDService.java | 2 +-
.../provider/AnalysisRegisterModuleProvider.java | 3 +-
.../NetworkAddressRegisterSerialWorker.java | 6 +-
.../provider/service/ApplicationIDService.java | 9 +-
.../provider/service/InstanceIDService.java | 9 +-
.../provider/service/NetworkAddressIDService.java | 22 +--
.../provider/service/ServiceNameService.java | 7 +-
.../segment-parser-define/pom.xml | 7 +-
.../parser/define/decorator/SegmentDecorator.java | 5 +-
.../parser/define/decorator/SpanDecorator.java | 19 +-
.../segment-parser-provider/pom.xml | 7 +-
.../AnalysisSegmentParserModuleProvider.java | 6 +-
.../parser/standardization/SpanIdExchanger.java | 20 +-
.../worker/model/base/WorkerCreateListener.java | 4 +-
.../worker/model/impl/PersistenceWorker.java | 20 +-
.../worker/model/impl/data/DataCollection.java | 4 +-
.../analysis/worker/timer/PersistenceTimer.java | 40 ++--
.../src/main/assembly/assembly.xml | 8 +-
.../apm/collector/boot/CollectorBootStartUp.java | 1 +
.../src/main/resources/application.yml | 1 +
.../src/main/resources/component-libraries.yml | 130 +++++++++++++
.../service/ApplicationCacheCaffeineService.java | 13 +-
.../service/InstanceCacheCaffeineService.java | 8 +-
.../NetworkAddressCacheCaffeineService.java | 10 +-
.../service/ServiceIdCacheCaffeineService.java | 8 +-
.../service/ServiceNameCacheCaffeineService.java | 13 +-
.../service/ApplicationCacheGuavaService.java | 10 +-
.../guava/service/InstanceCacheGuavaService.java | 5 +-
.../service/NetworkAddressCacheGuavaService.java | 7 +-
.../guava/service/ServiceIdCacheGuavaService.java | 5 +-
.../service/ServiceNameCacheGuavaService.java | 10 +-
.../apm/collector/server/jetty/JettyHandler.java | 24 ++-
.../configuration/ConfigurationModule.java | 4 +-
...g.java => IComponentLibraryCatalogService.java} | 12 +-
.../service/InitialComponentCatalogException.java} | 7 +-
.../collector-configuration-provider/pom.xml | 5 +
.../configuration/ConfigurationModuleProvider.java | 3 +
.../service/ComponentLibraryCatalogService.java | 113 +++++++++++
.../ComponentLibraryCatalogServiceTest.java} | 29 ++-
.../src/test/resources/component-libraries.yml | 134 +++++++++++++
.../apm/collector/core/data/AbstractData.java | 10 +-
.../skywalking/apm/collector/core/data/Column.java | 14 +-
.../apm/collector/core/data/ColumnDefine.java | 13 +-
.../data/{ColumnDefine.java => ColumnName.java} | 22 +--
.../apm/collector/core/data/CommonTable.java | 17 +-
.../apm/collector/core/util/ObjectUtils.java | 33 ----
.../grpc/service/GRPCRemoteSenderService.java | 5 +-
.../apm/collector/storage/StorageModule.java | 2 -
.../storage/dao/ui/IApplicationAlarmListUIDAO.java | 17 ++
.../storage/dao/ui/IApplicationAlarmUIDAO.java | 21 +-
.../storage/dao/ui/IApplicationComponentUIDAO.java | 19 ++
.../storage/dao/ui/IApplicationMappingUIDAO.java | 24 +++
.../storage/dao/ui/IApplicationMetricUIDAO.java | 49 +++++
.../dao/ui/IApplicationReferenceMetricUIDAO.java | 27 +++
.../collector/storage/dao/ui/ICpuMetricUIDAO.java | 27 +++
.../collector/storage/dao/ui/IGCMetricUIDAO.java | 49 +++++
.../storage/dao/ui/IGlobalTraceUIDAO.java | 22 +++
.../storage/dao/ui/IInstanceAlarmUIDAO.java | 21 +-
.../storage/dao/ui/IInstanceMetricUIDAO.java | 62 ++++++
.../collector/storage/dao/ui/IInstanceUIDAO.java | 81 +++++++-
.../storage/dao/ui/IMemoryMetricUIDAO.java | 57 +++++-
.../storage/dao/ui/IMemoryPoolMetricUIDAO.java | 31 ---
.../storage/dao/ui/INetworkAddressUIDAO.java | 24 ++-
.../storage/dao/ui/ISegmentDurationUIDAO.java | 29 +++
.../collector/storage/dao/ui/ISegmentUIDAO.java | 13 ++
.../storage/dao/ui/IServiceAlarmUIDAO.java | 21 +-
.../storage/dao/ui/IServiceMetricUIDAO.java | 98 +++++++++-
.../storage/dao/ui/IServiceNameServiceUIDAO.java | 25 +++
.../dao/ui/IServiceReferenceMetricUIDAO.java | 49 +++++
.../collector/storage/table/CommonMetricTable.java | 46 -----
.../apm/collector/storage/table/MetricColumns.java | 64 +++++++
.../{MetricSource.java => ReferenceColumns.java} | 20 +-
.../table/alarm/{Alarm.java => AlarmColumns.java} | 21 +-
.../collector/storage/table/alarm/AlarmType.java | 2 +-
.../storage/table/alarm/ApplicationAlarm.java | 12 +-
.../storage/table/alarm/ApplicationAlarmList.java | 14 +-
.../table/alarm/ApplicationAlarmListTable.java | 8 +-
.../storage/table/alarm/ApplicationAlarmTable.java | 9 +-
.../table/alarm/ApplicationReferenceAlarm.java | 14 +-
.../table/alarm/ApplicationReferenceAlarmList.java | 14 +-
.../alarm/ApplicationReferenceAlarmListTable.java | 11 +-
.../alarm/ApplicationReferenceAlarmTable.java | 12 +-
.../storage/table/alarm/InstanceAlarm.java | 14 +-
.../storage/table/alarm/InstanceAlarmList.java | 14 +-
.../table/alarm/InstanceAlarmListTable.java | 8 +-
.../storage/table/alarm/InstanceAlarmTable.java | 9 +-
.../table/alarm/InstanceReferenceAlarm.java | 18 +-
.../table/alarm/InstanceReferenceAlarmList.java | 18 +-
.../alarm/InstanceReferenceAlarmListTable.java | 12 +-
.../table/alarm/InstanceReferenceAlarmTable.java | 13 +-
.../storage/table/alarm/ServiceAlarm.java | 16 +-
.../storage/table/alarm/ServiceAlarmList.java | 16 +-
.../storage/table/alarm/ServiceAlarmListTable.java | 8 +-
.../storage/table/alarm/ServiceAlarmTable.java | 9 +-
.../storage/table/alarm/ServiceReferenceAlarm.java | 22 +--
.../table/alarm/ServiceReferenceAlarmList.java | 22 +--
.../alarm/ServiceReferenceAlarmListTable.java | 14 +-
.../table/alarm/ServiceReferenceAlarmTable.java | 15 +-
.../table/application/ApplicationComponent.java | 10 +-
.../application/ApplicationComponentTable.java | 10 +-
.../table/application/ApplicationMapping.java | 10 +-
.../table/application/ApplicationMappingTable.java | 10 +-
.../table/application/ApplicationMetric.java | 48 ++---
.../table/application/ApplicationMetricTable.java | 12 +-
.../application/ApplicationReferenceMetric.java | 53 ++---
.../ApplicationReferenceMetricTable.java | 12 +-
.../storage/table/global/GlobalTrace.java | 8 +-
.../storage/table/global/GlobalTraceTable.java | 11 +-
.../storage/table/instance/InstanceMapping.java | 12 +-
.../table/instance/InstanceMappingTable.java | 8 +-
.../storage/table/instance/InstanceMetric.java | 44 ++---
.../table/instance/InstanceMetricTable.java | 10 +-
.../table/instance/InstanceReferenceMetric.java | 48 ++---
.../instance/InstanceReferenceMetricTable.java | 11 +-
.../apm/collector/storage/table/jvm/CpuMetric.java | 12 +-
.../storage/table/jvm/CpuMetricTable.java | 12 +-
.../apm/collector/storage/table/jvm/GCMetric.java | 14 +-
.../collector/storage/table/jvm/GCMetricTable.java | 15 +-
.../collector/storage/table/jvm/MemoryMetric.java | 20 +-
.../storage/table/jvm/MemoryMetricTable.java | 24 ++-
.../storage/table/jvm/MemoryPoolMetric.java | 20 +-
.../storage/table/jvm/MemoryPoolMetricTable.java | 24 ++-
.../storage/table/register/Application.java | 27 +--
.../storage/table/register/ApplicationTable.java | 14 +-
.../collector/storage/table/register/Instance.java | 20 +-
.../storage/table/register/InstanceTable.java | 26 +--
.../storage/table/register/NetworkAddress.java | 16 +-
.../table/register/NetworkAddressTable.java | 15 +-
.../{ServerType.java => RegisterColumns.java} | 26 +--
.../storage/table/register/ServerTypeDefine.java | 84 --------
.../storage/table/register/ServiceName.java | 10 +-
.../storage/table/register/ServiceNameTable.java | 16 +-
.../collector/storage/table/segment/Segment.java | 6 +-
.../storage/table/segment/SegmentDuration.java | 20 +-
.../table/segment/SegmentDurationTable.java | 23 ++-
.../storage/table/segment/SegmentTable.java | 11 +-
.../storage/table/service/ServiceMetric.java | 46 ++---
.../storage/table/service/ServiceMetricTable.java | 8 +-
.../table/service/ServiceReferenceMetric.java | 52 ++---
.../table/service/ServiceReferenceMetricTable.java | 13 +-
.../table/register/ServerTypeDefineTestCase.java | 42 ----
.../collector/storage/es/MetricTransformUtil.java | 76 ++++++++
.../storage/es/StorageModuleEsConfig.java | 27 ++-
.../storage/es/StorageModuleEsProvider.java | 5 +-
.../collector/storage/es/base/dao/BatchEsDAO.java | 8 +-
.../es/base/define/ElasticSearchColumnDefine.java | 6 +-
.../base/define/ElasticSearchStorageInstaller.java | 13 +-
.../es/dao/GlobalTraceEsPersistenceDAO.java | 14 +-
.../es/dao/InstanceHeartBeatEsPersistenceDAO.java | 6 +-
.../es/dao/SegmentDurationEsPersistenceDAO.java | 24 +--
.../storage/es/dao/SegmentEsPersistenceDAO.java | 12 +-
...stractApplicationComponentEsPersistenceDAO.java | 22 +--
...stractApplicationAlarmListEsPersistenceDAO.java | 36 ++--
.../alarm/ApplicationAlarmEsPersistenceDAO.java | 91 +++------
.../ApplicationReferenceAlarmEsPersistenceDAO.java | 91 +++------
...licationReferenceAlarmListEsPersistenceDAO.java | 90 +++------
.../dao/alarm/InstanceAlarmEsPersistenceDAO.java | 90 +++------
.../alarm/InstanceAlarmListEsPersistenceDAO.java | 90 +++------
.../InstanceReferenceAlarmEsPersistenceDAO.java | 97 ++++------
...InstanceReferenceAlarmListEsPersistenceDAO.java | 100 ++++------
.../es/dao/alarm/ServiceAlarmEsPersistenceDAO.java | 95 +++------
.../alarm/ServiceAlarmListEsPersistenceDAO.java | 95 +++------
.../ServiceReferenceAlarmEsPersistenceDAO.java | 119 ++++--------
.../ServiceReferenceAlarmListEsPersistenceDAO.java | 119 ++++--------
.../AbstractApplicationMetricEsPersistenceDAO.java | 81 +++-----
...AbstractApplicationMappingEsPersistenceDAO.java | 22 +--
...ApplicationReferenceMetricEsPersistenceDAO.java | 88 +++------
.../es/dao/cache/ApplicationEsCacheDAO.java | 16 +-
.../storage/es/dao/cache/InstanceEsCacheDAO.java | 18 +-
.../es/dao/cache/NetworkAddressEsCacheDAO.java | 18 +-
.../es/dao/cache/ServiceNameEsCacheDAO.java | 12 +-
.../dao/cpu/AbstractCpuMetricEsPersistenceDAO.java | 26 +--
.../dao/gc/AbstractGCMetricEsPersistenceDAO.java | 30 +--
.../AbstractInstanceMetricEsPersistenceDAO.java | 60 ++----
.../AbstractInstanceMappingEsPersistenceDAO.java | 26 +--
...actInstanceReferenceMetricEsPersistenceDAO.java | 68 ++-----
.../AbstractMemoryMetricEsPersistenceDAO.java | 42 ++--
.../AbstractMemoryPoolMetricEsPersistenceDAO.java | 42 ++--
.../es/dao/register/ApplicationRegisterEsDAO.java | 16 +-
.../es/dao/register/InstanceRegisterEsDAO.java | 37 ++--
.../dao/register/NetworkAddressRegisterEsDAO.java | 24 +--
.../es/dao/register/ServiceNameRegisterEsDAO.java | 18 +-
.../smp/AbstractServiceMetricEsPersistenceDAO.java | 64 ++-----
...ractServiceReferenceMetricEsPersistenceDAO.java | 76 ++------
.../storage/es/dao/ui/ApplicationAlarmEsUIDAO.java | 12 +-
.../es/dao/ui/ApplicationAlarmListEsUIDAO.java | 10 +-
.../es/dao/ui/ApplicationComponentEsUIDAO.java | 10 +-
.../es/dao/ui/ApplicationMappingEsUIDAO.java | 10 +-
.../es/dao/ui/ApplicationMetricEsUIDAO.java | 48 ++---
.../dao/ui/ApplicationReferenceMetricEsUIDAO.java | 32 ++--
.../storage/es/dao/ui/CpuMetricEsUIDAO.java | 4 +-
.../storage/es/dao/ui/GCMetricEsUIDAO.java | 4 +-
.../storage/es/dao/ui/GlobalTraceEsUIDAO.java | 8 +-
.../storage/es/dao/ui/InstanceAlarmEsUIDAO.java | 14 +-
.../storage/es/dao/ui/InstanceEsUIDAO.java | 111 ++++-------
.../storage/es/dao/ui/InstanceMetricEsUIDAO.java | 43 ++---
.../storage/es/dao/ui/MemoryMetricEsUIDAO.java | 6 +-
.../storage/es/dao/ui/MemoryPoolMetricEsUIDAO.java | 61 ------
.../storage/es/dao/ui/NetworkAddressEsUIDAO.java | 10 +-
.../storage/es/dao/ui/SegmentDurationEsUIDAO.java | 20 +-
.../storage/es/dao/ui/SegmentEsUIDAO.java | 2 +-
.../storage/es/dao/ui/ServiceAlarmEsUIDAO.java | 14 +-
.../storage/es/dao/ui/ServiceMetricEsUIDAO.java | 65 ++++---
.../es/dao/ui/ServiceNameServiceEsUIDAO.java | 12 +-
.../es/dao/ui/ServiceReferenceEsMetricUIDAO.java | 52 ++---
.../es/define/GlobalTraceEsTableDefine.java | 8 +-
.../es/define/SegmentDurationEsTableDefine.java | 20 +-
.../storage/es/define/SegmentEsTableDefine.java | 6 +-
.../AbstractApplicationComponentEsTableDefine.java | 8 +-
.../AbstractApplicationAlarmListEsTableDefine.java | 12 +-
.../alarm/ApplicationAlarmEsTableDefine.java | 10 +-
.../ApplicationReferenceAlarmEsTableDefine.java | 12 +-
...ApplicationReferenceAlarmListEsTableDefine.java | 12 +-
.../define/alarm/InstanceAlarmEsTableDefine.java | 12 +-
.../alarm/InstanceAlarmListEsTableDefine.java | 12 +-
.../alarm/InstanceReferenceAlarmEsTableDefine.java | 16 +-
.../InstanceReferenceAlarmListEsTableDefine.java | 16 +-
.../es/define/alarm/ServiceAlarmEsTableDefine.java | 14 +-
.../alarm/ServiceAlarmListEsTableDefine.java | 14 +-
.../alarm/ServiceReferenceAlarmEsTableDefine.java | 20 +-
.../ServiceReferenceAlarmListEsTableDefine.java | 20 +-
.../AbstractApplicationMetricEsTableDefine.java | 48 ++---
.../AbstractApplicationMappingEsTableDefine.java | 8 +-
...actApplicationReferenceMetricEsTableDefine.java | 50 ++---
.../define/cpu/AbstractCpuMetricEsTableDefine.java | 14 +-
.../define/gc/AbstractGCMetricEsTableDefine.java | 16 +-
.../imp/AbstractInstanceMetricEsTableDefine.java | 52 ++---
.../impp/AbstractInstanceMappingEsTableDefine.java | 12 +-
...stractInstanceReferenceMetricEsTableDefine.java | 56 +++---
.../memory/AbstractMemoryMetricEsTableDefine.java | 22 +--
.../AbstractMemoryPoolMetricEsTableDefine.java | 22 +--
.../define/register/ApplicationEsTableDefine.java | 9 +-
.../es/define/register/InstanceEsTableDefine.java | 18 +-
.../register/NetworkAddressEsTableDefine.java | 8 +-
.../define/register/ServiceNameEsTableDefine.java | 10 +-
.../smp/AbstractServiceMetricEsTableDefine.java | 54 +++---
...bstractServiceReferenceMetricEsTableDefine.java | 50 ++---
.../collector/storage/h2/MetricTransformUtil.java | 78 ++++++++
.../storage/h2/StorageModuleH2Provider.java | 3 -
.../h2/base/dao/AbstractPersistenceH2DAO.java | 6 +-
.../storage/h2/base/define/H2ColumnDefine.java | 5 +-
.../storage/h2/base/define/H2StorageInstaller.java | 4 +-
.../h2/dao/GlobalTraceH2PersistenceDAO.java | 16 +-
.../h2/dao/InstanceHeartBeatH2PersistenceDAO.java | 14 +-
.../h2/dao/SegmentDurationH2PersistenceDAO.java | 26 +--
.../storage/h2/dao/SegmentH2PersistenceDAO.java | 14 +-
...stractApplicationComponentH2PersistenceDAO.java | 24 +--
...stractApplicationAlarmListH2PersistenceDAO.java | 34 ++--
.../alarm/ApplicationAlarmH2PersistenceDAO.java | 26 +--
.../ApplicationReferenceAlarmH2PersistenceDAO.java | 30 +--
...licationReferenceAlarmListH2PersistenceDAO.java | 30 +--
.../dao/alarm/InstanceAlarmH2PersistenceDAO.java | 30 +--
.../alarm/InstanceAlarmListH2PersistenceDAO.java | 30 +--
.../InstanceReferenceAlarmH2PersistenceDAO.java | 38 ++--
...InstanceReferenceAlarmListH2PersistenceDAO.java | 38 ++--
.../h2/dao/alarm/ServiceAlarmH2PersistenceDAO.java | 34 ++--
.../alarm/ServiceAlarmListH2PersistenceDAO.java | 34 ++--
.../ServiceReferenceAlarmH2PersistenceDAO.java | 46 ++---
.../ServiceReferenceAlarmListH2PersistenceDAO.java | 46 ++---
.../AbstractApplicationMetricH2PersistenceDAO.java | 68 ++-----
...AbstractApplicationMappingH2PersistenceDAO.java | 24 +--
...ApplicationReferenceMetricH2PersistenceDAO.java | 76 ++------
.../h2/dao/cache/ApplicationH2CacheDAO.java | 6 +-
.../storage/h2/dao/cache/InstanceH2CacheDAO.java | 16 +-
.../h2/dao/cache/NetworkAddressH2CacheDAO.java | 14 +-
.../h2/dao/cache/ServiceNameH2CacheDAO.java | 14 +-
.../dao/cpu/AbstractCpuMetricH2PersistenceDAO.java | 30 +--
.../dao/gcmp/AbstractGCMetricH2PersistenceDAO.java | 34 ++--
.../AbstractInstanceMetricH2PersistenceDAO.java | 65 ++-----
.../AbstractInstanceMappingH2PersistenceDAO.java | 30 +--
...actInstanceReferenceMetricH2PersistenceDAO.java | 72 ++-----
.../AbstractMemoryMetricH2PersistenceDAO.java | 46 ++---
.../AbstractMemoryPoolMetricH2PersistenceDAO.java | 46 ++---
.../h2/dao/register/ApplicationRegisterH2DAO.java | 20 +-
.../h2/dao/register/InstanceRegisterH2DAO.java | 34 ++--
.../dao/register/NetworkAddressRegisterH2DAO.java | 26 +--
.../h2/dao/register/ServiceNameRegisterH2DAO.java | 20 +-
.../smp/AbstractServiceMetricH2PersistenceDAO.java | 65 ++-----
...ractServiceReferenceMetricH2PersistenceDAO.java | 75 ++------
.../h2/dao/ui/ApplicationComponentH2UIDAO.java | 8 +-
.../h2/dao/ui/ApplicationMappingH2UIDAO.java | 8 +-
.../h2/dao/ui/ApplicationMetricH2UIDAO.java | 4 -
.../dao/ui/ApplicationReferenceMetricH2UIDAO.java | 3 -
.../storage/h2/dao/ui/CpuMetricH2UIDAO.java | 6 +-
.../storage/h2/dao/ui/GCMetricH2UIDAO.java | 6 +-
.../storage/h2/dao/ui/GlobalTraceH2UIDAO.java | 12 +-
.../storage/h2/dao/ui/InstanceH2UIDAO.java | 66 ++-----
.../storage/h2/dao/ui/InstanceMetricH2UIDAO.java | 10 +-
.../storage/h2/dao/ui/MemoryMetricH2UIDAO.java | 8 +-
.../storage/h2/dao/ui/MemoryPoolMetricH2UIDAO.java | 105 ----------
.../storage/h2/dao/ui/NetworkAddressH2UIDAO.java | 6 +-
.../storage/h2/dao/ui/SegmentDurationH2UIDAO.java | 22 +--
.../storage/h2/dao/ui/SegmentH2UIDAO.java | 6 +-
.../storage/h2/dao/ui/ServiceMetricH2UIDAO.java | 14 +-
.../h2/dao/ui/ServiceNameServiceH2UIDAO.java | 8 +-
.../h2/define/GlobalTraceH2TableDefine.java | 8 +-
.../h2/define/SegmentDurationH2TableDefine.java | 20 +-
.../storage/h2/define/SegmentH2TableDefine.java | 6 +-
.../AbstractApplicationComponentH2TableDefine.java | 10 +-
.../AbstractApplicationAlarmListH2TableDefine.java | 12 +-
.../alarm/ApplicationAlarmH2TableDefine.java | 12 +-
.../ApplicationReferenceAlarmH2TableDefine.java | 14 +-
...ApplicationReferenceAlarmListH2TableDefine.java | 14 +-
.../define/alarm/InstanceAlarmH2TableDefine.java | 14 +-
.../alarm/InstanceAlarmListH2TableDefine.java | 14 +-
.../alarm/InstanceReferenceAlarmH2TableDefine.java | 18 +-
.../InstanceReferenceAlarmListH2TableDefine.java | 18 +-
.../h2/define/alarm/ServiceAlarmH2TableDefine.java | 16 +-
.../alarm/ServiceAlarmListH2TableDefine.java | 16 +-
.../alarm/ServiceReferenceAlarmH2TableDefine.java | 22 +--
.../ServiceReferenceAlarmListH2TableDefine.java | 22 +--
.../AbstractApplicationMetricH2TableDefine.java | 48 ++---
.../AbstractApplicationMappingH2TableDefine.java | 12 +-
...actApplicationReferenceMetricH2TableDefine.java | 48 ++---
.../define/cpu/AbstractCpuMetricH2TableDefine.java | 12 +-
.../define/gc/AbstractGCMetricH2TableDefine.java | 16 +-
.../imp/AbstractInstanceMetricH2TableDefine.java | 50 ++---
.../impp/AbstractInstanceMappingH2TableDefine.java | 12 +-
...stractInstanceReferenceMetricH2TableDefine.java | 54 +++---
.../memory/AbstractMemoryMetricH2TableDefine.java | 20 +-
.../AbstractMemoryPoolMetricH2TableDefine.java | 22 +--
.../define/register/ApplicationH2TableDefine.java | 11 +-
.../h2/define/register/InstanceH2TableDefine.java | 20 +-
.../register/NetworkAddressH2TableDefine.java | 10 +-
.../define/register/ServiceNameH2TableDefine.java | 10 +-
.../smp/AbstractServiceMetricH2TableDefine.java | 52 ++---
...bstractServiceReferenceMetricH2TableDefine.java | 52 ++---
.../collector-ui-jetty-provider/pom.xml | 5 +
.../collector/ui/jetty/UIModuleJettyProvider.java | 3 +-
.../apm/collector/ui/query/AlarmQuery.java | 8 +-
.../apm/collector/ui/query/ApplicationQuery.java | 14 +-
.../apm/collector/ui/query/OverViewLayerQuery.java | 24 ++-
.../apm/collector/ui/query/ServerQuery.java | 10 +-
.../apm/collector/ui/query/ServiceQuery.java | 18 +-
.../apm/collector/ui/query/TraceQuery.java | 13 +-
.../collector/ui/service/ApplicationService.java | 7 +-
.../ui/service/ApplicationTopologyService.java | 7 +-
.../ui/service/ClusterTopologyService.java | 7 +-
.../ui/service/ServiceTopologyService.java | 7 +-
.../apm/collector/ui/service/SpanService.java | 7 +-
.../ui/service/TimeSynchronousService.java | 47 -----
.../apm/collector/ui/service/TopologyBuilder.java | 7 +-
.../collector/ui/service/TraceStackService.java | 28 +--
.../apm/collector/core/module/MockModule.java | 67 +++++++
.../collector/ui/DelegatingServletInputStream.java | 75 ++++++++
.../ui/jetty/UIModuleJettyProviderTest.java | 79 ++++++++
.../ui/jetty/UIModuleJettyRegistrationTest.java} | 29 +--
.../ui/jetty/handler/GraphQLHandlerTest.java | 104 ++++++++++
.../handler/naming/UIJettyNamingHandlerTest.java | 65 +++++++
.../handler/naming/UIJettyNamingListenerTest.java} | 34 ++--
.../collector/ui/mutation/ConfigMutationTest.java | 35 ++--
.../apm/collector/ui/query/AlarmQueryTestCase.java | 83 ++++++++
.../ui/query/ApplicationQueryTestCase.java | 93 ++++++++-
.../apm/collector/ui/query/ConfigQueryTest.java} | 27 ++-
.../collector/ui/query/OverViewLayerQueryTest.java | 186 ++++++++++++++++++
.../apm/collector/ui/query/ServerQueryTest.java | 159 +++++++++++++++
.../apm/collector/ui/query/ServiceQueryTest.java | 130 +++++++++++++
.../apm/collector/ui/query/TraceQueryTest.java | 99 ++++++++++
.../apm/collector/ui/service/AlarmServiceTest.java | 191 ++++++++++++++++++
.../ui/service/ApplicationServiceTest.java | 173 +++++++++++++++++
.../ui/service/ApplicationTopologyServiceTest.java | 106 ++++++++++
.../ui/service/ClusterTopologyServiceTest.java | 106 ++++++++++
.../ui/service/NetworkAddressServiceTest.java | 66 +++++++
.../ui/service/SecondBetweenServiceTest.java | 70 +++++++
.../ui/service/SegmentTopServiceTest.java | 93 +++++++++
.../collector/ui/service/ServerServiceTest.java | 213 +++++++++++++++++++++
.../ui/service/ServiceNameServiceTest.java | 134 +++++++++++++
.../ui/service/ServiceTopologyServiceTest.java | 138 +++++++++++++
.../apm/collector/ui/service/SpanServiceTest.java | 84 ++++++++
.../collector/ui/service/TopologyBuilderTest.java | 156 +++++++++++++++
.../ui/service/TraceStackServiceTest.java | 104 ++++++++++
.../collector/ui/utils/ApdexCalculatorTest.java} | 18 +-
.../collector/ui/utils/DurationUtilsTestCase.java | 24 ++-
.../apm/collector/ui/utils/SLACalculatorTest.java} | 15 +-
.../src/test/resources/log4j2.xml | 0
.../skywalking/apm/util/ConfigInitializerTest.java | 21 +-
.../{StringUtilTest.java => MachineInfoTest.java} | 29 +--
.../util/RunnableWithExceptionProtectionTest.java | 25 +--
.../network/trace/component/ComponentsDefine.java | 8 -
.../apm/agent/core/context/ContextManager.java | 5 +
.../core/conf/SnifferConfigInitializerTest.java | 4 +-
.../pom.xml | 29 ++-
.../CallableOrRunnableConstructInterceptor.java} | 16 +-
.../CallableOrRunnableInvokeInterceptor.java} | 25 ++-
.../define/CallableOrRunnableInstrumentation.java} | 57 +++---
.../src/main}/resources/skywalking-plugin.def | 2 +-
.../thread/CallableOrRunnableInterceptorTest.java} | 84 +++++---
apm-sniffer/apm-sdk-plugin/pom.xml | 1 +
docs/README.md | 9 +-
docs/README_ZH.md | 3 +-
.../Application-toolkit-trace-cross-thread-CN.md | 38 ++++
docs/cn/TLS-CN.md | 5 +-
docs/cn/Trace-Data-Protocol-CN.md | 2 +-
docs/en/Application-toolkit-trace-cross-thread.md | 36 ++++
docs/en/Trace-Data-Protocol.md | 2 +-
pom.xml | 5 +
skywalking-ui | 2 +-
416 files changed, 7760 insertions(+), 4756 deletions(-)
copy apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/{ActiveSpan.java => CallableWrapper.java} (65%)
copy apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/tools/SegmentStoragePoint.java => apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceCrossThread.java (87%)
create mode 100644 apm-collector/apm-collector-boot/src/main/resources/component-libraries.yml
copy apm-collector/apm-collector-configuration/collector-configuration-define/src/main/java/org/apache/skywalking/apm/collector/configuration/service/{IApplicationAlarmRuleConfig.java => IComponentLibraryCatalogService.java} (77%)
copy apm-collector/{apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/graph/PotentialCyclicGraphException.java => apm-collector-configuration/collector-configuration-define/src/main/java/org/apache/skywalking/apm/collector/configuration/service/InitialComponentCatalogException.java} (81%)
create mode 100644 apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/service/ComponentLibraryCatalogService.java
copy apm-collector/apm-collector-configuration/collector-configuration-provider/src/{main/java/org/apache/skywalking/apm/collector/configuration/service/ApdexThresholdService.java => test/java/org/apache/skywalking/apm/collector/configuration/service/ComponentLibraryCatalogServiceTest.java} (62%)
create mode 100644 apm-collector/apm-collector-configuration/collector-configuration-provider/src/test/resources/component-libraries.yml
copy apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/data/{ColumnDefine.java => ColumnName.java} (68%)
delete mode 100644 apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/util/ObjectUtils.java
delete mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ui/IMemoryPoolMetricUIDAO.java
delete mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/CommonMetricTable.java
create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/MetricColumns.java
copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/{MetricSource.java => ReferenceColumns.java} (60%)
copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/alarm/{Alarm.java => AlarmColumns.java} (69%)
rename apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/register/{ServerType.java => RegisterColumns.java} (67%)
delete mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/register/ServerTypeDefine.java
delete mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/test/java/org/apache/skywalking/apm/collector/storage/table/register/ServerTypeDefineTestCase.java
create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/MetricTransformUtil.java
delete mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/MemoryPoolMetricEsUIDAO.java
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/MetricTransformUtil.java
delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/MemoryPoolMetricH2UIDAO.java
delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/TimeSynchronousService.java
create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/core/module/MockModule.java
create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/DelegatingServletInputStream.java
create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/jetty/UIModuleJettyProviderTest.java
copy apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/{main/java/org/apache/skywalking/apm/collector/ui/jetty/UIModuleJettyRegistration.java => test/java/org/apache/skywalking/apm/collector/ui/jetty/UIModuleJettyRegistrationTest.java} (63%)
create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/jetty/handler/GraphQLHandlerTest.java
create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/jetty/handler/naming/UIJettyNamingHandlerTest.java
copy apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/{main/java/org/apache/skywalking/apm/collector/ui/jetty/handler/naming/UIJettyNamingListener.java => test/java/org/apache/skywalking/apm/collector/ui/jetty/handler/naming/UIJettyNamingListenerTest.java} (59%)
copy apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/StringUtilTest.java => apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/mutation/ConfigMutationTest.java (55%)
create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/query/AlarmQueryTestCase.java
copy apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/{main/java/org/apache/skywalking/apm/collector/ui/query/ConfigQuery.java => test/java/org/apache/skywalking/apm/collector/ui/query/ConfigQueryTest.java} (62%)
create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/query/OverViewLayerQueryTest.java
create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/query/ServerQueryTest.java
create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/query/ServiceQueryTest.java
create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/query/TraceQueryTest.java
create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/service/AlarmServiceTest.java
create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/service/ApplicationServiceTest.java
create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/service/ApplicationTopologyServiceTest.java
create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/service/ClusterTopologyServiceTest.java
create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/service/NetworkAddressServiceTest.java
create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/service/SecondBetweenServiceTest.java
create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/service/SegmentTopServiceTest.java
create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/service/ServerServiceTest.java
create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/service/ServiceNameServiceTest.java
create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/service/ServiceTopologyServiceTest.java
create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/service/SpanServiceTest.java
create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/service/TopologyBuilderTest.java
create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/service/TraceStackServiceTest.java
copy apm-collector/{apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/util/ColumnNameUtilsTest.java => apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/utils/ApdexCalculatorTest.java} (72%)
rename apm-collector/{apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/util/ObjectUtilsTest.java => apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/utils/SLACalculatorTest.java} (77%)
copy apm-collector/{apm-collector-instrument => apm-collector-ui/collector-ui-jetty-provider}/src/test/resources/log4j2.xml (100%)
copy apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/{StringUtilTest.java => MachineInfoTest.java} (61%)
copy apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/boot/DefaultNamedThreadFactoryTest.java => apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/RunnableWithExceptionProtectionTest.java (59%)
copy apm-sniffer/apm-sdk-plugin/{rocketMQ-3.x-plugin => jdk-cross-thread-plugin}/pom.xml (61%)
copy apm-sniffer/{apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/continuation/ConstructorInterceptor.java => apm-sdk-plugin/jdk-cross-thread-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/thread/CallableOrRunnableConstructInterceptor.java} (79%)
copy apm-sniffer/apm-sdk-plugin/{kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/CallbackInterceptor.java => jdk-cross-thread-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/thread/CallableOrRunnableInvokeInterceptor.java} (75%)
copy apm-sniffer/apm-sdk-plugin/{okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/define/RealCallInstrumentation.java => jdk-cross-thread-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/thread/define/CallableOrRunnableInstrumentation.java} (62%)
copy apm-sniffer/{apm-agent-core/src/test => apm-sdk-plugin/jdk-cross-thread-plugin/src/main}/resources/skywalking-plugin.def (88%)
copy apm-sniffer/apm-sdk-plugin/{rocketMQ-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/OnExceptionInterceptorTest.java => jdk-cross-thread-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdk/thread/CallableOrRunnableInterceptorTest.java} (58%)
create mode 100644 docs/cn/Application-toolkit-trace-cross-thread-CN.md
create mode 100644 docs/en/Application-toolkit-trace-cross-thread.md
--
To stop receiving notification emails like this one, please contact
pengys@apache.org.