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/23 00:55:38 UTC
[incubator-skywalking] branch protocol/ui-beta updated (6edb060 ->
62ce34f)
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 6edb060 Fixed bean definition fault.
add a551b1b Add .NET/.NET Core components in component-libraries config (#1102)
add 4943993 Fix component libraries yml (#1103)
add 8cafc05 Aggregate response time distribution metric and persistent into database. (#1104)
new 62ce34f Merge branch 'master' into protocol/ui-beta
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../grpc/provider/handler/mock/ProviderMock.java | 2 +-
.../metric/define/graph/MetricGraphIdDefine.java | 2 +-
.../metric/define/graph/MetricWorkerIdDefine.java | 10 ++
.../provider/AnalysisMetricModuleProvider.java | 8 ++
.../ResponseTimeDistributionCopy.java} | 30 +++---
...ponseTimeDistributionDayPersistenceWorker.java} | 30 +++---
.../ResponseTimeDistributionDayTransformNode.java} | 20 ++--
.../std/ResponseTimeDistributionGraph.java} | 28 +++---
...onseTimeDistributionHourPersistenceWorker.java} | 30 +++---
...ResponseTimeDistributionHourTransformNode.java} | 20 ++--
...seTimeDistributionMinuteAggregationWorker.java} | 22 ++---
...seTimeDistributionMinutePersistenceWorker.java} | 30 +++---
...esponseTimeDistributionMinuteRemoteWorker.java} | 21 ++--
...nseTimeDistributionMonthPersistenceWorker.java} | 30 +++---
...esponseTimeDistributionMonthTransformNode.java} | 20 ++--
.../std/ResponseTimeDistributionSpanListener.java} | 107 ++++++++++++---------
...ponseTimeDistributionSpanListenerTestCase.java} | 31 +++---
.../src/main/resources/component-libraries.yml | 27 +++++-
.../boot/ComponentLibraryCatalogFileTest.java} | 23 ++++-
.../{ClientException.java => NameSpace.java} | 16 +--
.../client/elasticsearch/ElasticSearchClient.java | 11 ++-
.../apm/collector/storage/StorageModule.java | 9 ++
...ResponseTimeDistributionDayPersistenceDAO.java} | 6 +-
...esponseTimeDistributionHourPersistenceDAO.java} | 6 +-
...ponseTimeDistributionMinutePersistenceDAO.java} | 6 +-
...sponseTimeDistributionMonthPersistenceDAO.java} | 6 +-
.../ResponseTimeDistribution.java} | 60 +++++++-----
...ble.java => ResponseTimeDistributionTable.java} | 15 ++-
.../storage/es/StorageModuleEsProvider.java | 20 +++-
...ctResponseTimeDistributionEsPersistenceDAO.java | 75 +++++++++++++++
...sponseTimeDistributionDayEsPersistenceDAO.java} | 14 +--
...ponseTimeDistributionHourEsPersistenceDAO.java} | 14 +--
...nseTimeDistributionMinuteEsPersistenceDAO.java} | 14 +--
...onseTimeDistributionMonthEsPersistenceDAO.java} | 14 +--
...ractResponseTimeDistributionEsTableDefine.java} | 18 ++--
.../ResponseTimeDistributionDayEsTableDefine.java} | 10 +-
...ResponseTimeDistributionHourEsTableDefine.java} | 10 +-
...sponseTimeDistributionMinuteEsTableDefine.java} | 10 +-
...esponseTimeDistributionMonthEsTableDefine.java} | 10 +-
.../main/resources/META-INF/defines/storage.define | 5 +
.../storage/h2/StorageModuleH2Provider.java | 14 +++
...ctResponseTimeDistributionH2PersistenceDAO.java | 69 +++++++++++++
...sponseTimeDistributionDayH2PersistenceDAO.java} | 14 +--
...ponseTimeDistributionHourH2PersistenceDAO.java} | 14 +--
...nseTimeDistributionMinuteH2PersistenceDAO.java} | 14 +--
...onseTimeDistributionMonthH2PersistenceDAO.java} | 14 +--
...tractResponseTimeDistributionH2TableDefine.java | 43 +++++++++
.../ResponseTimeDistributionDayH2TableDefine.java} | 14 +--
...ResponseTimeDistributionHourH2TableDefine.java} | 14 +--
...sponseTimeDistributionMinuteH2TableDefine.java} | 14 +--
...esponseTimeDistributionMonthH2TableDefine.java} | 14 +--
.../main/resources/META-INF/defines/storage.define | 6 ++
52 files changed, 707 insertions(+), 377 deletions(-)
copy apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/{GlobalTraceGraph.java => std/ResponseTimeDistributionCopy.java} (50%)
copy apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/{GlobalTracePersistenceWorker.java => std/ResponseTimeDistributionDayPersistenceWorker.java} (66%)
copy apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/{application/component/ApplicationComponentHourTransformNode.java => global/std/ResponseTimeDistributionDayTransformNode.java} (58%)
copy apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/{service/refmetric/ServiceReferenceMetricGraph.java => global/std/ResponseTimeDistributionGraph.java} (56%)
copy apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/{GlobalTracePersistenceWorker.java => std/ResponseTimeDistributionHourPersistenceWorker.java} (66%)
copy apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/{application/component/ApplicationComponentHourTransformNode.java => global/std/ResponseTimeDistributionHourTransformNode.java} (61%)
copy apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/{application/component/ApplicationComponentMinuteAggregationWorker.java => global/std/ResponseTimeDistributionMinuteAggregationWorker.java} (63%)
copy apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/{GlobalTracePersistenceWorker.java => std/ResponseTimeDistributionMinutePersistenceWorker.java} (65%)
copy apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/{application/component/ApplicationComponentMinuteRemoteWorker.java => global/std/ResponseTimeDistributionMinuteRemoteWorker.java} (68%)
copy apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/{GlobalTracePersistenceWorker.java => std/ResponseTimeDistributionMonthPersistenceWorker.java} (66%)
copy apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/{application/mapping/ApplicationMappingMonthTransformNode.java => global/std/ResponseTimeDistributionMonthTransformNode.java} (61%)
copy apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/{application/mapping/ApplicationMappingSpanListener.java => global/std/ResponseTimeDistributionSpanListener.java} (52%)
copy apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/{main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingCopy.java => test/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/std/ResponseTimeDistributionSpanListenerTestCase.java} (51%)
copy apm-collector/{apm-collector-configuration/collector-configuration-provider/src/test/java/org/apache/skywalking/apm/collector/configuration/service/ComponentLibraryCatalogServiceTest.java => apm-collector-boot/src/test/java/org/apache/skywalking/apm/collector/boot/ComponentLibraryCatalogFileTest.java} (56%)
copy apm-collector/apm-collector-component/client-component/src/main/java/org/apache/skywalking/apm/collector/client/{ClientException.java => NameSpace.java} (75%)
copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{IGlobalTracePersistenceDAO.java => rtd/IResponseTimeDistributionDayPersistenceDAO.java} (78%)
copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{IGlobalTracePersistenceDAO.java => rtd/IResponseTimeDistributionHourPersistenceDAO.java} (78%)
copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{IGlobalTracePersistenceDAO.java => rtd/IResponseTimeDistributionMinutePersistenceDAO.java} (78%)
copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{IGlobalTracePersistenceDAO.java => rtd/IResponseTimeDistributionMonthPersistenceDAO.java} (78%)
copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/{instance/InstanceMapping.java => global/ResponseTimeDistribution.java} (63%)
copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/global/{GlobalTraceTable.java => ResponseTimeDistributionTable.java} (74%)
create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/rtd/AbstractResponseTimeDistributionEsPersistenceDAO.java
copy apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/{acp/ApplicationComponentHourEsPersistenceDAO.java => rtd/ResponseTimeDistributionDayEsPersistenceDAO.java} (61%)
copy apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/{acp/ApplicationComponentHourEsPersistenceDAO.java => rtd/ResponseTimeDistributionHourEsPersistenceDAO.java} (61%)
copy apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/{armp/ApplicationReferenceHourMetricEsPersistenceDAO.java => rtd/ResponseTimeDistributionMinuteEsPersistenceDAO.java} (62%)
copy apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/{irmp/InstanceReferenceMinuteMetricEsPersistenceDAO.java => rtd/ResponseTimeDistributionMonthEsPersistenceDAO.java} (62%)
copy apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/{acp/AbstractApplicationComponentEsTableDefine.java => rtd/AbstractResponseTimeDistributionEsTableDefine.java} (50%)
copy apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/{acp/ApplicationComponentHourEsTableDefine.java => rtd/ResponseTimeDistributionDayEsTableDefine.java} (71%)
copy apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/{acp/ApplicationComponentHourEsTableDefine.java => rtd/ResponseTimeDistributionHourEsTableDefine.java} (71%)
copy apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/{acp/ApplicationComponentHourEsTableDefine.java => rtd/ResponseTimeDistributionMinuteEsTableDefine.java} (70%)
copy apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/{acp/ApplicationComponentHourEsTableDefine.java => rtd/ResponseTimeDistributionMonthEsTableDefine.java} (70%)
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/rtd/AbstractResponseTimeDistributionH2PersistenceDAO.java
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{srmp/ServiceReferenceMonthMetricH2PersistenceDAO.java => rtd/ResponseTimeDistributionDayH2PersistenceDAO.java} (62%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{srmp/ServiceReferenceMinuteMetricH2PersistenceDAO.java => rtd/ResponseTimeDistributionHourH2PersistenceDAO.java} (62%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{armp/ApplicationReferenceHourMetricH2PersistenceDAO.java => rtd/ResponseTimeDistributionMinuteH2PersistenceDAO.java} (61%)
copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{irmp/InstanceReferenceMinuteMetricH2PersistenceDAO.java => rtd/ResponseTimeDistributionMonthH2PersistenceDAO.java} (61%)
create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/rtd/AbstractResponseTimeDistributionH2TableDefine.java
copy apm-collector/apm-collector-storage/{collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/cpu/CpuDayMetricEsTableDefine.java => collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/rtd/ResponseTimeDistributionDayH2TableDefine.java} (69%)
copy apm-collector/apm-collector-storage/{collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/cpu/CpuDayMetricEsTableDefine.java => collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/rtd/ResponseTimeDistributionHourH2TableDefine.java} (69%)
copy apm-collector/apm-collector-storage/{collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/cpu/CpuDayMetricEsTableDefine.java => collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/rtd/ResponseTimeDistributionMinuteH2TableDefine.java} (69%)
copy apm-collector/apm-collector-storage/{collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/cpu/CpuDayMetricEsTableDefine.java => collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/rtd/ResponseTimeDistributionMonthH2TableDefine.java} (69%)
--
To stop receiving notification emails like this one, please contact
pengys@apache.org.
[incubator-skywalking] 01/01: Merge branch 'master' into
protocol/ui-beta
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pengys pushed a commit to branch protocol/ui-beta
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 62ce34febdb1f2c7ed0e510ad818a749e07eeffc
Merge: 6edb060 8cafc05
Author: 彭勇升 pengys <80...@qq.com>
AuthorDate: Mon Apr 23 08:55:35 2018 +0800
Merge branch 'master' into protocol/ui-beta
.../grpc/provider/handler/mock/ProviderMock.java | 2 +-
.../metric/define/graph/MetricGraphIdDefine.java | 2 +-
.../metric/define/graph/MetricWorkerIdDefine.java | 10 ++
.../provider/AnalysisMetricModuleProvider.java | 8 ++
.../global/std/ResponseTimeDistributionCopy.java | 40 +++++++
...sponseTimeDistributionDayPersistenceWorker.java | 74 ++++++++++++
.../ResponseTimeDistributionDayTransformNode.java | 46 ++++++++
.../global/std/ResponseTimeDistributionGraph.java | 61 ++++++++++
...ponseTimeDistributionHourPersistenceWorker.java | 74 ++++++++++++
.../ResponseTimeDistributionHourTransformNode.java | 46 ++++++++
...nseTimeDistributionMinuteAggregationWorker.java | 63 ++++++++++
...nseTimeDistributionMinutePersistenceWorker.java | 74 ++++++++++++
...ResponseTimeDistributionMinuteRemoteWorker.java | 59 ++++++++++
...onseTimeDistributionMonthPersistenceWorker.java | 74 ++++++++++++
...ResponseTimeDistributionMonthTransformNode.java | 46 ++++++++
.../std/ResponseTimeDistributionSpanListener.java | 130 +++++++++++++++++++++
...sponseTimeDistributionSpanListenerTestCase.java | 47 ++++++++
.../src/main/resources/component-libraries.yml | 27 ++++-
.../boot/ComponentLibraryCatalogFileTest.java | 55 +++++++++
.../skywalking/apm/collector/client/NameSpace.java | 37 ++++++
.../client/elasticsearch/ElasticSearchClient.java | 11 +-
.../apm/collector/storage/StorageModule.java | 9 ++
...IResponseTimeDistributionDayPersistenceDAO.java | 28 +++++
...ResponseTimeDistributionHourPersistenceDAO.java | 28 +++++
...sponseTimeDistributionMinutePersistenceDAO.java | 28 +++++
...esponseTimeDistributionMonthPersistenceDAO.java | 28 +++++
.../table/global/ResponseTimeDistribution.java | 119 +++++++++++++++++++
.../global/ResponseTimeDistributionTable.java | 37 ++++++
.../storage/es/StorageModuleEsProvider.java | 20 +++-
...ctResponseTimeDistributionEsPersistenceDAO.java | 75 ++++++++++++
...esponseTimeDistributionDayEsPersistenceDAO.java | 42 +++++++
...sponseTimeDistributionHourEsPersistenceDAO.java | 42 +++++++
...onseTimeDistributionMinuteEsPersistenceDAO.java | 42 +++++++
...ponseTimeDistributionMonthEsPersistenceDAO.java | 42 +++++++
...tractResponseTimeDistributionEsTableDefine.java | 42 +++++++
.../ResponseTimeDistributionDayEsTableDefine.java | 37 ++++++
.../ResponseTimeDistributionHourEsTableDefine.java | 37 ++++++
...esponseTimeDistributionMinuteEsTableDefine.java | 37 ++++++
...ResponseTimeDistributionMonthEsTableDefine.java | 37 ++++++
.../main/resources/META-INF/defines/storage.define | 5 +
.../storage/h2/StorageModuleH2Provider.java | 14 +++
...ctResponseTimeDistributionH2PersistenceDAO.java | 69 +++++++++++
...esponseTimeDistributionDayH2PersistenceDAO.java | 41 +++++++
...sponseTimeDistributionHourH2PersistenceDAO.java | 41 +++++++
...onseTimeDistributionMinuteH2PersistenceDAO.java | 41 +++++++
...ponseTimeDistributionMonthH2PersistenceDAO.java | 41 +++++++
...tractResponseTimeDistributionH2TableDefine.java | 43 +++++++
.../ResponseTimeDistributionDayH2TableDefine.java | 33 ++++++
.../ResponseTimeDistributionHourH2TableDefine.java | 33 ++++++
...esponseTimeDistributionMinuteH2TableDefine.java | 33 ++++++
...ResponseTimeDistributionMonthH2TableDefine.java | 33 ++++++
.../main/resources/META-INF/defines/storage.define | 6 +
52 files changed, 2140 insertions(+), 9 deletions(-)
--
To stop receiving notification emails like this one, please contact
pengys@apache.org.