Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
山不在高_有仙则灵
SkyWalking
提交
7e84aedd
S
SkyWalking
项目概览
山不在高_有仙则灵
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
12
Star
0
Fork
2
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7e84aedd
编写于
1月 09, 2018
作者:
P
peng-yongsheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Instance metric pyramid aggregate test successful.
上级
8745cb2b
变更
16
隐藏空白更改
内联
并排
Showing
16 changed file
with
257 addition
and
31 deletion
+257
-31
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceDayMetricTransformNode.java
...orker/instance/metric/InstanceDayMetricTransformNode.java
+4
-3
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceHourMetricTransformNode.java
...rker/instance/metric/InstanceHourMetricTransformNode.java
+4
-3
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceMetricCopy.java
...c/provider/worker/instance/metric/InstanceMetricCopy.java
+55
-0
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceMetricGraph.java
.../provider/worker/instance/metric/InstanceMetricGraph.java
+3
-3
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceMinuteMetricAggregationWorker.java
...nstance/metric/InstanceMinuteMetricAggregationWorker.java
+5
-5
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceMinuteMetricRemoteWorker.java
...ker/instance/metric/InstanceMinuteMetricRemoteWorker.java
+5
-5
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceMonthMetricTransformNode.java
...ker/instance/metric/InstanceMonthMetricTransformNode.java
+4
-3
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/StorageModule.java
...pache/skywalking/apm/collector/storage/StorageModule.java
+6
-0
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/instance/InstanceMetric.java
.../apm/collector/storage/table/instance/InstanceMetric.java
+1
-0
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/StorageModuleEsProvider.java
...ing/apm/collector/storage/es/StorageModuleEsProvider.java
+9
-0
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/imp/AbstractInstanceMetricEsTableDefine.java
...ge/es/define/imp/AbstractInstanceMetricEsTableDefine.java
+8
-9
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/imp/InstanceDayMetricEsTableDefine.java
...storage/es/define/imp/InstanceDayMetricEsTableDefine.java
+37
-0
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/imp/InstanceHourMetricEsTableDefine.java
...torage/es/define/imp/InstanceHourMetricEsTableDefine.java
+37
-0
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/imp/InstanceMinuteMetricEsTableDefine.java
...rage/es/define/imp/InstanceMinuteMetricEsTableDefine.java
+37
-0
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/imp/InstanceMonthMetricEsTableDefine.java
...orage/es/define/imp/InstanceMonthMetricEsTableDefine.java
+37
-0
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/resources/META-INF/defines/storage.define
...ovider/src/main/resources/META-INF/defines/storage.define
+5
-0
未找到文件。
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceDayMetricTransformNode.java
浏览文件 @
7e84aedd
...
...
@@ -36,9 +36,10 @@ public class InstanceDayMetricTransformNode implements NodeProcessor<InstanceMet
@Override
public
void
process
(
InstanceMetric
instanceMetric
,
Next
<
InstanceMetric
>
next
)
{
long
timeBucket
=
TimeBucketUtils
.
INSTANCE
.
minuteToDay
(
instanceMetric
.
getTimeBucket
());
instanceMetric
.
setId
(
String
.
valueOf
(
timeBucket
)
+
Const
.
ID_SPLIT
+
instanceMetric
.
getMetricId
());
instanceMetric
.
setTimeBucket
(
timeBucket
);
next
.
execute
(
instanceMetric
);
InstanceMetric
newInstanceMetric
=
InstanceMetricCopy
.
copy
(
instanceMetric
);
newInstanceMetric
.
setId
(
String
.
valueOf
(
timeBucket
)
+
Const
.
ID_SPLIT
+
instanceMetric
.
getMetricId
());
newInstanceMetric
.
setTimeBucket
(
timeBucket
);
next
.
execute
(
newInstanceMetric
);
}
}
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceHourMetricTransformNode.java
浏览文件 @
7e84aedd
...
...
@@ -36,9 +36,10 @@ public class InstanceHourMetricTransformNode implements NodeProcessor<InstanceMe
@Override
public
void
process
(
InstanceMetric
instanceMetric
,
Next
<
InstanceMetric
>
next
)
{
long
timeBucket
=
TimeBucketUtils
.
INSTANCE
.
minuteToHour
(
instanceMetric
.
getTimeBucket
());
instanceMetric
.
setId
(
String
.
valueOf
(
timeBucket
)
+
Const
.
ID_SPLIT
+
instanceMetric
.
getMetricId
());
instanceMetric
.
setTimeBucket
(
timeBucket
);
next
.
execute
(
instanceMetric
);
InstanceMetric
newInstanceMetric
=
InstanceMetricCopy
.
copy
(
instanceMetric
);
newInstanceMetric
.
setId
(
String
.
valueOf
(
timeBucket
)
+
Const
.
ID_SPLIT
+
instanceMetric
.
getMetricId
());
newInstanceMetric
.
setTimeBucket
(
timeBucket
);
next
.
execute
(
newInstanceMetric
);
}
}
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceMetricCopy.java
0 → 100644
浏览文件 @
7e84aedd
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package
org.apache.skywalking.apm.collector.analysis.metric.provider.worker.instance.metric
;
import
org.apache.skywalking.apm.collector.storage.table.instance.InstanceMetric
;
/**
* @author peng-yongsheng
*/
public
class
InstanceMetricCopy
{
public
static
InstanceMetric
copy
(
InstanceMetric
instanceMetric
)
{
InstanceMetric
newInstanceMetric
=
new
InstanceMetric
();
newInstanceMetric
.
setId
(
instanceMetric
.
getId
());
newInstanceMetric
.
setMetricId
(
instanceMetric
.
getMetricId
());
newInstanceMetric
.
setSourceValue
(
instanceMetric
.
getSourceValue
());
newInstanceMetric
.
setApplicationId
(
instanceMetric
.
getApplicationId
());
newInstanceMetric
.
setInstanceId
(
instanceMetric
.
getInstanceId
());
newInstanceMetric
.
setTransactionCalls
(
instanceMetric
.
getTransactionCalls
());
newInstanceMetric
.
setTransactionDurationSum
(
instanceMetric
.
getTransactionDurationSum
());
newInstanceMetric
.
setTransactionErrorCalls
(
instanceMetric
.
getTransactionErrorCalls
());
newInstanceMetric
.
setTransactionErrorDurationSum
(
instanceMetric
.
getTransactionErrorDurationSum
());
newInstanceMetric
.
setBusinessTransactionCalls
(
instanceMetric
.
getBusinessTransactionCalls
());
newInstanceMetric
.
setBusinessTransactionDurationSum
(
instanceMetric
.
getBusinessTransactionDurationSum
());
newInstanceMetric
.
setBusinessTransactionErrorCalls
(
instanceMetric
.
getBusinessTransactionErrorCalls
());
newInstanceMetric
.
setBusinessTransactionErrorDurationSum
(
instanceMetric
.
getBusinessTransactionErrorDurationSum
());
newInstanceMetric
.
setMqTransactionCalls
(
instanceMetric
.
getMqTransactionCalls
());
newInstanceMetric
.
setMqTransactionDurationSum
(
instanceMetric
.
getMqTransactionDurationSum
());
newInstanceMetric
.
setMqTransactionErrorCalls
(
instanceMetric
.
getMqTransactionErrorCalls
());
newInstanceMetric
.
setMqTransactionErrorDurationSum
(
instanceMetric
.
getMqTransactionErrorDurationSum
());
newInstanceMetric
.
setTimeBucket
(
instanceMetric
.
getTimeBucket
());
return
newInstanceMetric
;
}
}
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceMetricGraph.java
浏览文件 @
7e84aedd
...
...
@@ -50,8 +50,8 @@ public class InstanceMetricGraph {
Graph
<
InstanceReferenceMetric
>
graph
=
GraphManager
.
INSTANCE
.
createIfAbsent
(
MetricGraphIdDefine
.
INSTANCE_METRIC_GRAPH_ID
,
InstanceReferenceMetric
.
class
);
Node
<
InstanceMetric
,
InstanceMetric
>
remoteNode
=
graph
.
addNode
(
new
InstanceMetricAggregationWorker
.
Factory
(
moduleManager
).
create
(
workerCreateListener
))
.
addNext
(
new
InstanceMetricRemoteWorker
.
Factory
(
moduleManager
,
remoteSenderService
,
MetricGraphIdDefine
.
INSTANCE_METRIC_GRAPH_ID
).
create
(
workerCreateListener
));
Node
<
InstanceMetric
,
InstanceMetric
>
remoteNode
=
graph
.
addNode
(
new
InstanceM
inuteM
etricAggregationWorker
.
Factory
(
moduleManager
).
create
(
workerCreateListener
))
.
addNext
(
new
InstanceM
inuteM
etricRemoteWorker
.
Factory
(
moduleManager
,
remoteSenderService
,
MetricGraphIdDefine
.
INSTANCE_METRIC_GRAPH_ID
).
create
(
workerCreateListener
));
remoteNode
.
addNext
(
new
InstanceMinuteMetricPersistenceWorker
.
Factory
(
moduleManager
).
create
(
workerCreateListener
));
...
...
@@ -64,7 +64,7 @@ public class InstanceMetricGraph {
remoteNode
.
addNext
(
new
InstanceMonthMetricTransformNode
())
.
addNext
(
new
InstanceMonthMetricPersistenceWorker
.
Factory
(
moduleManager
).
create
(
workerCreateListener
));
//
link(graph);
link
(
graph
);
}
private
void
link
(
Graph
<
InstanceReferenceMetric
>
graph
)
{
...
...
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceMetricAggregationWorker.java
→
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceM
inuteM
etricAggregationWorker.java
浏览文件 @
7e84aedd
...
...
@@ -29,9 +29,9 @@ import org.apache.skywalking.apm.collector.storage.table.instance.InstanceRefere
/**
* @author peng-yongsheng
*/
public
class
InstanceMetricAggregationWorker
extends
AggregationWorker
<
InstanceReferenceMetric
,
InstanceMetric
>
{
public
class
InstanceM
inuteM
etricAggregationWorker
extends
AggregationWorker
<
InstanceReferenceMetric
,
InstanceMetric
>
{
public
InstanceMetricAggregationWorker
(
ModuleManager
moduleManager
)
{
public
InstanceM
inuteM
etricAggregationWorker
(
ModuleManager
moduleManager
)
{
super
(
moduleManager
);
}
...
...
@@ -70,14 +70,14 @@ public class InstanceMetricAggregationWorker extends AggregationWorker<InstanceR
return
instanceMetric
;
}
public
static
class
Factory
extends
AbstractLocalAsyncWorkerProvider
<
InstanceReferenceMetric
,
InstanceMetric
,
InstanceMetricAggregationWorker
>
{
public
static
class
Factory
extends
AbstractLocalAsyncWorkerProvider
<
InstanceReferenceMetric
,
InstanceMetric
,
InstanceM
inuteM
etricAggregationWorker
>
{
public
Factory
(
ModuleManager
moduleManager
)
{
super
(
moduleManager
);
}
@Override
public
InstanceMetricAggregationWorker
workerInstance
(
ModuleManager
moduleManager
)
{
return
new
InstanceMetricAggregationWorker
(
moduleManager
);
@Override
public
InstanceM
inuteM
etricAggregationWorker
workerInstance
(
ModuleManager
moduleManager
)
{
return
new
InstanceM
inuteM
etricAggregationWorker
(
moduleManager
);
}
@Override
...
...
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceMetricRemoteWorker.java
→
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceM
inuteM
etricRemoteWorker.java
浏览文件 @
7e84aedd
...
...
@@ -30,9 +30,9 @@ import org.apache.skywalking.apm.collector.storage.table.instance.InstanceMetric
/**
* @author peng-yongsheng
*/
public
class
InstanceMetricRemoteWorker
extends
AbstractRemoteWorker
<
InstanceMetric
,
InstanceMetric
>
{
public
class
InstanceM
inuteM
etricRemoteWorker
extends
AbstractRemoteWorker
<
InstanceMetric
,
InstanceMetric
>
{
public
InstanceMetricRemoteWorker
(
ModuleManager
moduleManager
)
{
public
InstanceM
inuteM
etricRemoteWorker
(
ModuleManager
moduleManager
)
{
super
(
moduleManager
);
}
...
...
@@ -48,14 +48,14 @@ public class InstanceMetricRemoteWorker extends AbstractRemoteWorker<InstanceMet
onNext
(
instanceMetric
);
}
public
static
class
Factory
extends
AbstractRemoteWorkerProvider
<
InstanceMetric
,
InstanceMetric
,
InstanceMetricRemoteWorker
>
{
public
static
class
Factory
extends
AbstractRemoteWorkerProvider
<
InstanceMetric
,
InstanceMetric
,
InstanceM
inuteM
etricRemoteWorker
>
{
public
Factory
(
ModuleManager
moduleManager
,
RemoteSenderService
remoteSenderService
,
int
graphId
)
{
super
(
moduleManager
,
remoteSenderService
,
graphId
);
}
@Override
public
InstanceMetricRemoteWorker
workerInstance
(
ModuleManager
moduleManager
)
{
return
new
InstanceMetricRemoteWorker
(
moduleManager
);
@Override
public
InstanceM
inuteM
etricRemoteWorker
workerInstance
(
ModuleManager
moduleManager
)
{
return
new
InstanceM
inuteM
etricRemoteWorker
(
moduleManager
);
}
}
}
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceMonthMetricTransformNode.java
浏览文件 @
7e84aedd
...
...
@@ -36,9 +36,10 @@ public class InstanceMonthMetricTransformNode implements NodeProcessor<InstanceM
@Override
public
void
process
(
InstanceMetric
instanceMetric
,
Next
<
InstanceMetric
>
next
)
{
long
timeBucket
=
TimeBucketUtils
.
INSTANCE
.
minuteToMonth
(
instanceMetric
.
getTimeBucket
());
instanceMetric
.
setId
(
String
.
valueOf
(
timeBucket
)
+
Const
.
ID_SPLIT
+
instanceMetric
.
getMetricId
());
instanceMetric
.
setTimeBucket
(
timeBucket
);
next
.
execute
(
instanceMetric
);
InstanceMetric
newInstanceMetric
=
InstanceMetricCopy
.
copy
(
instanceMetric
);
newInstanceMetric
.
setId
(
String
.
valueOf
(
timeBucket
)
+
Const
.
ID_SPLIT
+
instanceMetric
.
getMetricId
());
newInstanceMetric
.
setTimeBucket
(
timeBucket
);
next
.
execute
(
newInstanceMetric
);
}
}
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/StorageModule.java
浏览文件 @
7e84aedd
...
...
@@ -70,7 +70,10 @@ import org.apache.skywalking.apm.collector.storage.dao.armp.IApplicationReferenc
import
org.apache.skywalking.apm.collector.storage.dao.armp.IApplicationReferenceMonthMetricPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.dao.cpump.ICpuSecondMetricPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.dao.gcmp.IGCSecondMetricPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.dao.imp.IInstanceDayMetricPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.dao.imp.IInstanceHourMetricPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.dao.imp.IInstanceMinuteMetricPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.dao.imp.IInstanceMonthMetricPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.dao.impp.IInstanceMappingDayPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.dao.impp.IInstanceMappingHourPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.dao.impp.IInstanceMappingMinutePersistenceDAO
;
...
...
@@ -175,6 +178,9 @@ public class StorageModule extends Module {
classes
.
add
(
IServiceReferenceMonthMetricPersistenceDAO
.
class
);
classes
.
add
(
IInstanceMinuteMetricPersistenceDAO
.
class
);
classes
.
add
(
IInstanceHourMetricPersistenceDAO
.
class
);
classes
.
add
(
IInstanceDayMetricPersistenceDAO
.
class
);
classes
.
add
(
IInstanceMonthMetricPersistenceDAO
.
class
);
classes
.
add
(
IInstanceReferenceMinuteMetricPersistenceDAO
.
class
);
classes
.
add
(
IInstanceReferenceHourMetricPersistenceDAO
.
class
);
...
...
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/instance/InstanceMetric.java
浏览文件 @
7e84aedd
...
...
@@ -61,6 +61,7 @@ public class InstanceMetric extends StreamData implements Metric {
};
private
static
final
Column
[]
BOOLEAN_COLUMNS
=
{};
private
static
final
Column
[]
BYTE_COLUMNS
=
{};
public
InstanceMetric
()
{
...
...
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/StorageModuleEsProvider.java
浏览文件 @
7e84aedd
...
...
@@ -79,7 +79,10 @@ import org.apache.skywalking.apm.collector.storage.dao.armp.IApplicationReferenc
import
org.apache.skywalking.apm.collector.storage.dao.armp.IApplicationReferenceMonthMetricPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.dao.cpump.ICpuSecondMetricPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.dao.gcmp.IGCSecondMetricPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.dao.imp.IInstanceDayMetricPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.dao.imp.IInstanceHourMetricPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.dao.imp.IInstanceMinuteMetricPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.dao.imp.IInstanceMonthMetricPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.dao.impp.IInstanceMappingDayPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.dao.impp.IInstanceMappingHourPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.dao.impp.IInstanceMappingMinutePersistenceDAO
;
...
...
@@ -152,7 +155,10 @@ import org.apache.skywalking.apm.collector.storage.es.dao.armp.ApplicationRefere
import
org.apache.skywalking.apm.collector.storage.es.dao.armp.ApplicationReferenceMonthMetricEsPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.es.dao.cpump.CpuSecondMetricEsPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.es.dao.gcmp.GCSecondMetricEsPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.es.dao.imp.InstanceDayMetricEsPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.es.dao.imp.InstanceHourMetricEsPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.es.dao.imp.InstanceMinuteMetricEsPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.es.dao.imp.InstanceMonthMetricEsPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.es.dao.impp.InstanceMappingDayEsPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.es.dao.impp.InstanceMappingHourEsPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.es.dao.impp.InstanceMappingMinuteEsPersistenceDAO
;
...
...
@@ -307,6 +313,9 @@ public class StorageModuleEsProvider extends ModuleProvider {
this
.
registerServiceImplementation
(
IServiceReferenceMonthMetricPersistenceDAO
.
class
,
new
ServiceReferenceMonthMetricEsPersistenceDAO
(
elasticSearchClient
));
this
.
registerServiceImplementation
(
IInstanceMinuteMetricPersistenceDAO
.
class
,
new
InstanceMinuteMetricEsPersistenceDAO
(
elasticSearchClient
));
this
.
registerServiceImplementation
(
IInstanceHourMetricPersistenceDAO
.
class
,
new
InstanceHourMetricEsPersistenceDAO
(
elasticSearchClient
));
this
.
registerServiceImplementation
(
IInstanceDayMetricPersistenceDAO
.
class
,
new
InstanceDayMetricEsPersistenceDAO
(
elasticSearchClient
));
this
.
registerServiceImplementation
(
IInstanceMonthMetricPersistenceDAO
.
class
,
new
InstanceMonthMetricEsPersistenceDAO
(
elasticSearchClient
));
this
.
registerServiceImplementation
(
IInstanceReferenceMinuteMetricPersistenceDAO
.
class
,
new
InstanceReferenceMinuteMetricEsPersistenceDAO
(
elasticSearchClient
));
this
.
registerServiceImplementation
(
IInstanceReferenceHourMetricPersistenceDAO
.
class
,
new
InstanceReferenceHourMetricEsPersistenceDAO
(
elasticSearchClient
));
...
...
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/InstanceMetricEsTableDefine.java
→
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/
imp/Abstract
InstanceMetricEsTableDefine.java
浏览文件 @
7e84aedd
...
...
@@ -16,7 +16,7 @@
*
*/
package
org.apache.skywalking.apm.collector.storage.es.define
;
package
org.apache.skywalking.apm.collector.storage.es.define
.imp
;
import
org.apache.skywalking.apm.collector.storage.es.base.define.ElasticSearchColumnDefine
;
import
org.apache.skywalking.apm.collector.storage.es.base.define.ElasticSearchTableDefine
;
...
...
@@ -25,19 +25,18 @@ import org.apache.skywalking.apm.collector.storage.table.instance.InstanceMetric
/**
* @author peng-yongsheng
*/
public
class
InstanceMetricEsTableDefine
extends
ElasticSearchTableDefine
{
public
abstract
class
Abstract
InstanceMetricEsTableDefine
extends
ElasticSearchTableDefine
{
public
InstanceMetricEsTableDefine
(
)
{
super
(
InstanceMetricTable
.
TABLE
);
public
AbstractInstanceMetricEsTableDefine
(
String
name
)
{
super
(
name
);
}
@Override
public
int
refreshInterval
()
{
return
2
;
}
@Override
public
void
initialize
()
{
@Override
public
final
void
initialize
()
{
addColumn
(
new
ElasticSearchColumnDefine
(
InstanceMetricTable
.
COLUMN_ID
,
ElasticSearchColumnDefine
.
Type
.
Keyword
.
name
()));
addColumn
(
new
ElasticSearchColumnDefine
(
InstanceMetricTable
.
COLUMN_METRIC_ID
,
ElasticSearchColumnDefine
.
Type
.
Keyword
.
name
()));
addColumn
(
new
ElasticSearchColumnDefine
(
InstanceMetricTable
.
COLUMN_APPLICATION_ID
,
ElasticSearchColumnDefine
.
Type
.
Integer
.
name
()));
addColumn
(
new
ElasticSearchColumnDefine
(
InstanceMetricTable
.
COLUMN_INSTANCE_ID
,
ElasticSearchColumnDefine
.
Type
.
Integer
.
name
()));
addColumn
(
new
ElasticSearchColumnDefine
(
InstanceMetricTable
.
COLUMN_SOURCE_VALUE
,
ElasticSearchColumnDefine
.
Type
.
Integer
.
name
()));
addColumn
(
new
ElasticSearchColumnDefine
(
InstanceMetricTable
.
COLUMN_TRANSACTION_CALLS
,
ElasticSearchColumnDefine
.
Type
.
Long
.
name
()));
addColumn
(
new
ElasticSearchColumnDefine
(
InstanceMetricTable
.
COLUMN_TRANSACTION_ERROR_CALLS
,
ElasticSearchColumnDefine
.
Type
.
Long
.
name
()));
...
...
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/imp/InstanceDayMetricEsTableDefine.java
0 → 100644
浏览文件 @
7e84aedd
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package
org.apache.skywalking.apm.collector.storage.es.define.imp
;
import
org.apache.skywalking.apm.collector.core.storage.TimePyramid
;
import
org.apache.skywalking.apm.collector.core.util.Const
;
import
org.apache.skywalking.apm.collector.storage.table.instance.InstanceMetricTable
;
/**
* @author peng-yongsheng
*/
public
class
InstanceDayMetricEsTableDefine
extends
AbstractInstanceMetricEsTableDefine
{
public
InstanceDayMetricEsTableDefine
()
{
super
(
InstanceMetricTable
.
TABLE
+
Const
.
ID_SPLIT
+
TimePyramid
.
Day
.
getName
());
}
@Override
public
int
refreshInterval
()
{
return
2
;
}
}
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/imp/InstanceHourMetricEsTableDefine.java
0 → 100644
浏览文件 @
7e84aedd
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package
org.apache.skywalking.apm.collector.storage.es.define.imp
;
import
org.apache.skywalking.apm.collector.core.storage.TimePyramid
;
import
org.apache.skywalking.apm.collector.core.util.Const
;
import
org.apache.skywalking.apm.collector.storage.table.instance.InstanceMetricTable
;
/**
* @author peng-yongsheng
*/
public
class
InstanceHourMetricEsTableDefine
extends
AbstractInstanceMetricEsTableDefine
{
public
InstanceHourMetricEsTableDefine
()
{
super
(
InstanceMetricTable
.
TABLE
+
Const
.
ID_SPLIT
+
TimePyramid
.
Hour
.
getName
());
}
@Override
public
int
refreshInterval
()
{
return
2
;
}
}
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/imp/InstanceMinuteMetricEsTableDefine.java
0 → 100644
浏览文件 @
7e84aedd
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package
org.apache.skywalking.apm.collector.storage.es.define.imp
;
import
org.apache.skywalking.apm.collector.core.storage.TimePyramid
;
import
org.apache.skywalking.apm.collector.core.util.Const
;
import
org.apache.skywalking.apm.collector.storage.table.instance.InstanceMetricTable
;
/**
* @author peng-yongsheng
*/
public
class
InstanceMinuteMetricEsTableDefine
extends
AbstractInstanceMetricEsTableDefine
{
public
InstanceMinuteMetricEsTableDefine
()
{
super
(
InstanceMetricTable
.
TABLE
+
Const
.
ID_SPLIT
+
TimePyramid
.
Minute
.
getName
());
}
@Override
public
int
refreshInterval
()
{
return
2
;
}
}
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/imp/InstanceMonthMetricEsTableDefine.java
0 → 100644
浏览文件 @
7e84aedd
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package
org.apache.skywalking.apm.collector.storage.es.define.imp
;
import
org.apache.skywalking.apm.collector.core.storage.TimePyramid
;
import
org.apache.skywalking.apm.collector.core.util.Const
;
import
org.apache.skywalking.apm.collector.storage.table.instance.InstanceMetricTable
;
/**
* @author peng-yongsheng
*/
public
class
InstanceMonthMetricEsTableDefine
extends
AbstractInstanceMetricEsTableDefine
{
public
InstanceMonthMetricEsTableDefine
()
{
super
(
InstanceMetricTable
.
TABLE
+
Const
.
ID_SPLIT
+
TimePyramid
.
Month
.
getName
());
}
@Override
public
int
refreshInterval
()
{
return
2
;
}
}
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/resources/META-INF/defines/storage.define
浏览文件 @
7e84aedd
...
...
@@ -33,6 +33,11 @@ org.apache.skywalking.apm.collector.storage.es.define.irmp.InstanceReferenceHour
org.apache.skywalking.apm.collector.storage.es.define.irmp.InstanceReferenceDayMetricEsTableDefine
org.apache.skywalking.apm.collector.storage.es.define.irmp.InstanceReferenceMonthMetricEsTableDefine
org.apache.skywalking.apm.collector.storage.es.define.imp.InstanceMinuteMetricEsTableDefine
org.apache.skywalking.apm.collector.storage.es.define.imp.InstanceHourMetricEsTableDefine
org.apache.skywalking.apm.collector.storage.es.define.imp.InstanceDayMetricEsTableDefine
org.apache.skywalking.apm.collector.storage.es.define.imp.InstanceMonthMetricEsTableDefine
org.apache.skywalking.apm.collector.storage.es.define.armp.ApplicationReferenceMinuteMetricEsTableDefine
org.apache.skywalking.apm.collector.storage.es.define.armp.ApplicationReferenceHourMetricEsTableDefine
org.apache.skywalking.apm.collector.storage.es.define.armp.ApplicationReferenceDayMetricEsTableDefine
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录