Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
山不在高_有仙则灵
SkyWalking
提交
17edfe8f
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,发现更多精彩内容 >>
提交
17edfe8f
编写于
1月 08, 2018
作者:
P
peng-yongsheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Instance mapping pyramid aggregate test successful.
上级
e909ea02
变更
16
隐藏空白更改
内联
并排
Showing
16 changed file
with
227 addition
and
37 deletion
+227
-37
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/AnalysisMetricModuleProvider.java
...nalysis/metric/provider/AnalysisMetricModuleProvider.java
+2
-1
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingDayTransformNode.java
...ker/instance/mapping/InstanceMappingDayTransformNode.java
+10
-3
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingGraph.java
...rovider/worker/instance/mapping/InstanceMappingGraph.java
+2
-2
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingHourTransformNode.java
...er/instance/mapping/InstanceMappingHourTransformNode.java
+10
-3
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingMinuteAggregationWorker.java
...tance/mapping/InstanceMappingMinuteAggregationWorker.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/mapping/InstanceMappingMinuteRemoteWorker.java
...r/instance/mapping/InstanceMappingMinuteRemoteWorker.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/mapping/InstanceMappingMonthTransformNode.java
...r/instance/mapping/InstanceMappingMonthTransformNode.java
+10
-3
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingSpanListener.java
.../worker/instance/mapping/InstanceMappingSpanListener.java
+3
-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
+8
-1
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
+11
-1
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/instmapping/AbstractInstanceMappingEsTableDefine.java
...ine/instmapping/AbstractInstanceMappingEsTableDefine.java
+7
-9
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/instmapping/InstanceMappingDayEsTableDefine.java
...s/define/instmapping/InstanceMappingDayEsTableDefine.java
+37
-0
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/instmapping/InstanceMappingHourEsTableDefine.java
.../define/instmapping/InstanceMappingHourEsTableDefine.java
+37
-0
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/instmapping/InstanceMappingMinuteEsTableDefine.java
...efine/instmapping/InstanceMappingMinuteEsTableDefine.java
+37
-0
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/instmapping/InstanceMappingMonthEsTableDefine.java
...define/instmapping/InstanceMappingMonthEsTableDefine.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
+6
-1
未找到文件。
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/AnalysisMetricModuleProvider.java
浏览文件 @
17edfe8f
...
...
@@ -28,6 +28,7 @@ import org.apache.skywalking.apm.collector.analysis.metric.provider.worker.appli
import
org.apache.skywalking.apm.collector.analysis.metric.provider.worker.application.refmetric.ApplicationReferenceMetricGraph
;
import
org.apache.skywalking.apm.collector.analysis.metric.provider.worker.global.GlobalTraceGraph
;
import
org.apache.skywalking.apm.collector.analysis.metric.provider.worker.instance.mapping.InstanceMappingGraph
;
import
org.apache.skywalking.apm.collector.analysis.metric.provider.worker.instance.mapping.InstanceMappingSpanListener
;
import
org.apache.skywalking.apm.collector.analysis.metric.provider.worker.instance.metric.InstanceMetricGraph
;
import
org.apache.skywalking.apm.collector.analysis.metric.provider.worker.instance.refmetric.InstanceReferenceMetricGraph
;
import
org.apache.skywalking.apm.collector.analysis.metric.provider.worker.segment.SegmentCostGraph
;
...
...
@@ -84,7 +85,7 @@ public class AnalysisMetricModuleProvider extends ModuleProvider {
// segmentParserListenerRegister.register(new ServiceReferenceMetricSpanListener.Factory());
segmentParserListenerRegister
.
register
(
new
ApplicationComponentSpanListener
.
Factory
());
segmentParserListenerRegister
.
register
(
new
ApplicationMappingSpanListener
.
Factory
());
//
segmentParserListenerRegister.register(new InstanceMappingSpanListener.Factory());
segmentParserListenerRegister
.
register
(
new
InstanceMappingSpanListener
.
Factory
());
// segmentParserListenerRegister.register(new ServiceEntrySpanListener.Factory());
// segmentParserListenerRegister.register(new GlobalTraceSpanListener.Factory());
// segmentParserListenerRegister.register(new SegmentCostSpanListener.Factory());
...
...
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingDayTransformNode.java
浏览文件 @
17edfe8f
...
...
@@ -36,9 +36,16 @@ public class InstanceMappingDayTransformNode implements NodeProcessor<InstanceMa
@Override
public
void
process
(
InstanceMapping
instanceMapping
,
Next
<
InstanceMapping
>
next
)
{
long
timeBucket
=
TimeBucketUtils
.
INSTANCE
.
minuteToDay
(
instanceMapping
.
getTimeBucket
());
instanceMapping
.
setId
(
String
.
valueOf
(
timeBucket
)
+
Const
.
ID_SPLIT
+
instanceMapping
.
getMetricId
());
instanceMapping
.
setTimeBucket
(
timeBucket
);
next
.
execute
(
instanceMapping
);
InstanceMapping
newInstanceMapping
=
new
InstanceMapping
();
newInstanceMapping
.
setId
(
String
.
valueOf
(
timeBucket
)
+
Const
.
ID_SPLIT
+
instanceMapping
.
getMetricId
());
newInstanceMapping
.
setMetricId
(
instanceMapping
.
getMetricId
());
newInstanceMapping
.
setApplicationId
(
instanceMapping
.
getApplicationId
());
newInstanceMapping
.
setInstanceId
(
instanceMapping
.
getInstanceId
());
newInstanceMapping
.
setAddressId
(
instanceMapping
.
getAddressId
());
newInstanceMapping
.
setTimeBucket
(
timeBucket
);
next
.
execute
(
newInstanceMapping
);
}
}
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingGraph.java
浏览文件 @
17edfe8f
...
...
@@ -44,8 +44,8 @@ public class InstanceMappingGraph {
RemoteSenderService
remoteSenderService
=
moduleManager
.
find
(
RemoteModule
.
NAME
).
getService
(
RemoteSenderService
.
class
);
Node
<
InstanceMapping
,
InstanceMapping
>
remoteNode
=
GraphManager
.
INSTANCE
.
createIfAbsent
(
MetricGraphIdDefine
.
INSTANCE_MAPPING_GRAPH_ID
,
InstanceMapping
.
class
)
.
addNode
(
new
InstanceMappingAggregationWorker
.
Factory
(
moduleManager
).
create
(
workerCreateListener
))
.
addNext
(
new
InstanceMappingRemoteWorker
.
Factory
(
moduleManager
,
remoteSenderService
,
MetricGraphIdDefine
.
INSTANCE_MAPPING_GRAPH_ID
).
create
(
workerCreateListener
));
.
addNode
(
new
InstanceMapping
Minute
AggregationWorker
.
Factory
(
moduleManager
).
create
(
workerCreateListener
))
.
addNext
(
new
InstanceMapping
Minute
RemoteWorker
.
Factory
(
moduleManager
,
remoteSenderService
,
MetricGraphIdDefine
.
INSTANCE_MAPPING_GRAPH_ID
).
create
(
workerCreateListener
));
remoteNode
.
addNext
(
new
InstanceMappingMinutePersistenceWorker
.
Factory
(
moduleManager
).
create
(
workerCreateListener
));
...
...
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingHourTransformNode.java
浏览文件 @
17edfe8f
...
...
@@ -36,9 +36,16 @@ public class InstanceMappingHourTransformNode implements NodeProcessor<InstanceM
@Override
public
void
process
(
InstanceMapping
instanceMapping
,
Next
<
InstanceMapping
>
next
)
{
long
timeBucket
=
TimeBucketUtils
.
INSTANCE
.
minuteToHour
(
instanceMapping
.
getTimeBucket
());
instanceMapping
.
setId
(
String
.
valueOf
(
timeBucket
)
+
Const
.
ID_SPLIT
+
instanceMapping
.
getMetricId
());
instanceMapping
.
setTimeBucket
(
timeBucket
);
next
.
execute
(
instanceMapping
);
InstanceMapping
newInstanceMapping
=
new
InstanceMapping
();
newInstanceMapping
.
setId
(
String
.
valueOf
(
timeBucket
)
+
Const
.
ID_SPLIT
+
instanceMapping
.
getMetricId
());
newInstanceMapping
.
setMetricId
(
instanceMapping
.
getMetricId
());
newInstanceMapping
.
setApplicationId
(
instanceMapping
.
getApplicationId
());
newInstanceMapping
.
setInstanceId
(
instanceMapping
.
getInstanceId
());
newInstanceMapping
.
setAddressId
(
instanceMapping
.
getAddressId
());
newInstanceMapping
.
setTimeBucket
(
timeBucket
);
next
.
execute
(
newInstanceMapping
);
}
}
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingAggregationWorker.java
→
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMapping
Minute
AggregationWorker.java
浏览文件 @
17edfe8f
...
...
@@ -27,9 +27,9 @@ import org.apache.skywalking.apm.collector.storage.table.instance.InstanceMappin
/**
* @author peng-yongsheng
*/
public
class
InstanceMappingAggregationWorker
extends
AggregationWorker
<
InstanceMapping
,
InstanceMapping
>
{
public
class
InstanceMapping
Minute
AggregationWorker
extends
AggregationWorker
<
InstanceMapping
,
InstanceMapping
>
{
InstanceMappingAggregationWorker
(
ModuleManager
moduleManager
)
{
InstanceMapping
Minute
AggregationWorker
(
ModuleManager
moduleManager
)
{
super
(
moduleManager
);
}
...
...
@@ -37,14 +37,14 @@ public class InstanceMappingAggregationWorker extends AggregationWorker<Instance
return
MetricWorkerIdDefine
.
INSTANCE_MAPPING_MINUTE_AGGREGATION_WORKER_ID
;
}
public
static
class
Factory
extends
AbstractLocalAsyncWorkerProvider
<
InstanceMapping
,
InstanceMapping
,
InstanceMappingAggregationWorker
>
{
public
static
class
Factory
extends
AbstractLocalAsyncWorkerProvider
<
InstanceMapping
,
InstanceMapping
,
InstanceMapping
Minute
AggregationWorker
>
{
public
Factory
(
ModuleManager
moduleManager
)
{
super
(
moduleManager
);
}
@Override
public
InstanceMappingAggregationWorker
workerInstance
(
ModuleManager
moduleManager
)
{
return
new
InstanceMappingAggregationWorker
(
moduleManager
);
@Override
public
InstanceMapping
Minute
AggregationWorker
workerInstance
(
ModuleManager
moduleManager
)
{
return
new
InstanceMapping
Minute
AggregationWorker
(
moduleManager
);
}
@Override
...
...
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingRemoteWorker.java
→
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMapping
Minute
RemoteWorker.java
浏览文件 @
17edfe8f
...
...
@@ -30,9 +30,9 @@ import org.apache.skywalking.apm.collector.storage.table.instance.InstanceMappin
/**
* @author peng-yongsheng
*/
public
class
InstanceMappingRemoteWorker
extends
AbstractRemoteWorker
<
InstanceMapping
,
InstanceMapping
>
{
public
class
InstanceMapping
Minute
RemoteWorker
extends
AbstractRemoteWorker
<
InstanceMapping
,
InstanceMapping
>
{
InstanceMappingRemoteWorker
(
ModuleManager
moduleManager
)
{
InstanceMapping
Minute
RemoteWorker
(
ModuleManager
moduleManager
)
{
super
(
moduleManager
);
}
...
...
@@ -48,13 +48,13 @@ public class InstanceMappingRemoteWorker extends AbstractRemoteWorker<InstanceMa
return
Selector
.
HashCode
;
}
public
static
class
Factory
extends
AbstractRemoteWorkerProvider
<
InstanceMapping
,
InstanceMapping
,
InstanceMappingRemoteWorker
>
{
public
static
class
Factory
extends
AbstractRemoteWorkerProvider
<
InstanceMapping
,
InstanceMapping
,
InstanceMapping
Minute
RemoteWorker
>
{
public
Factory
(
ModuleManager
moduleManager
,
RemoteSenderService
remoteSenderService
,
int
graphId
)
{
super
(
moduleManager
,
remoteSenderService
,
graphId
);
}
@Override
public
InstanceMappingRemoteWorker
workerInstance
(
ModuleManager
moduleManager
)
{
return
new
InstanceMappingRemoteWorker
(
moduleManager
);
@Override
public
InstanceMapping
Minute
RemoteWorker
workerInstance
(
ModuleManager
moduleManager
)
{
return
new
InstanceMapping
Minute
RemoteWorker
(
moduleManager
);
}
}
}
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingMonthTransformNode.java
浏览文件 @
17edfe8f
...
...
@@ -36,9 +36,16 @@ public class InstanceMappingMonthTransformNode implements NodeProcessor<Instance
@Override
public
void
process
(
InstanceMapping
instanceMapping
,
Next
<
InstanceMapping
>
next
)
{
long
timeBucket
=
TimeBucketUtils
.
INSTANCE
.
minuteToMonth
(
instanceMapping
.
getTimeBucket
());
instanceMapping
.
setId
(
String
.
valueOf
(
timeBucket
)
+
Const
.
ID_SPLIT
+
instanceMapping
.
getMetricId
());
instanceMapping
.
setTimeBucket
(
timeBucket
);
next
.
execute
(
instanceMapping
);
InstanceMapping
newInstanceMapping
=
new
InstanceMapping
();
newInstanceMapping
.
setId
(
String
.
valueOf
(
timeBucket
)
+
Const
.
ID_SPLIT
+
instanceMapping
.
getMetricId
());
newInstanceMapping
.
setMetricId
(
instanceMapping
.
getMetricId
());
newInstanceMapping
.
setApplicationId
(
instanceMapping
.
getApplicationId
());
newInstanceMapping
.
setInstanceId
(
instanceMapping
.
getInstanceId
());
newInstanceMapping
.
setAddressId
(
instanceMapping
.
getAddressId
());
newInstanceMapping
.
setTimeBucket
(
timeBucket
);
next
.
execute
(
newInstanceMapping
);
}
}
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingSpanListener.java
浏览文件 @
17edfe8f
...
...
@@ -53,8 +53,8 @@ public class InstanceMappingSpanListener implements FirstSpanListener, EntrySpan
instanceMapping
.
setApplicationId
(
applicationId
);
instanceMapping
.
setInstanceId
(
instanceId
);
instanceMapping
.
setAddressId
(
spanDecorator
.
getRefs
(
i
).
getNetworkAddressId
());
String
i
d
=
String
.
valueOf
(
instanceId
)
+
Const
.
ID_SPLIT
+
String
.
valueOf
(
instanceMapping
.
getAddressId
());
instanceMapping
.
set
Id
(
i
d
);
String
metricI
d
=
String
.
valueOf
(
instanceId
)
+
Const
.
ID_SPLIT
+
String
.
valueOf
(
instanceMapping
.
getAddressId
());
instanceMapping
.
set
MetricId
(
metricI
d
);
instanceMappings
.
add
(
instanceMapping
);
}
}
...
...
@@ -70,7 +70,7 @@ public class InstanceMappingSpanListener implements FirstSpanListener, EntrySpan
logger
.
debug
(
"instance mapping listener build"
);
Graph
<
InstanceMapping
>
graph
=
GraphManager
.
INSTANCE
.
findGraph
(
MetricGraphIdDefine
.
INSTANCE_MAPPING_GRAPH_ID
,
InstanceMapping
.
class
);
instanceMappings
.
forEach
(
instanceMapping
->
{
instanceMapping
.
setId
(
timeBucket
+
Const
.
ID_SPLIT
+
instanceMapping
.
getId
());
instanceMapping
.
setId
(
timeBucket
+
Const
.
ID_SPLIT
+
instanceMapping
.
get
Metric
Id
());
instanceMapping
.
setTimeBucket
(
timeBucket
);
logger
.
debug
(
"push to instance mapping aggregation worker, id: {}"
,
instanceMapping
.
getId
());
graph
.
start
(
instanceMapping
);
...
...
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/StorageModule.java
浏览文件 @
17edfe8f
...
...
@@ -70,7 +70,10 @@ import org.apache.skywalking.apm.collector.storage.dao.armp.IApplicationReferenc
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.IInstanceMinuteMetricPersistenceDAO
;
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
;
import
org.apache.skywalking.apm.collector.storage.dao.impp.IInstanceMappingMonthPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.dao.irmp.IInstanceReferenceMinuteMetricPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.dao.memorymp.IMemorySecondMetricPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.dao.mpoolmp.IMemoryPoolSecondMetricPersistenceDAO
;
...
...
@@ -135,6 +138,11 @@ public class StorageModule extends Module {
classes
.
add
(
IApplicationMappingDayPersistenceDAO
.
class
);
classes
.
add
(
IApplicationMappingMonthPersistenceDAO
.
class
);
classes
.
add
(
IInstanceMappingMinutePersistenceDAO
.
class
);
classes
.
add
(
IInstanceMappingHourPersistenceDAO
.
class
);
classes
.
add
(
IInstanceMappingDayPersistenceDAO
.
class
);
classes
.
add
(
IInstanceMappingMonthPersistenceDAO
.
class
);
classes
.
add
(
IGlobalTracePersistenceDAO
.
class
);
classes
.
add
(
IApplicationMinuteMetricPersistenceDAO
.
class
);
classes
.
add
(
IApplicationReferenceMinuteMetricPersistenceDAO
.
class
);
...
...
@@ -146,7 +154,6 @@ public class StorageModule extends Module {
classes
.
add
(
IInstanceMinuteMetricPersistenceDAO
.
class
);
classes
.
add
(
IInstanceReferenceMinuteMetricPersistenceDAO
.
class
);
classes
.
add
(
IInstanceMappingMinutePersistenceDAO
.
class
);
classes
.
add
(
IInstanceHeartBeatPersistenceDAO
.
class
);
}
...
...
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/StorageModuleEsProvider.java
浏览文件 @
17edfe8f
...
...
@@ -79,7 +79,10 @@ import org.apache.skywalking.apm.collector.storage.dao.armp.IApplicationReferenc
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.IInstanceMinuteMetricPersistenceDAO
;
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
;
import
org.apache.skywalking.apm.collector.storage.dao.impp.IInstanceMappingMonthPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.dao.irmp.IInstanceReferenceMinuteMetricPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.dao.memorymp.IMemorySecondMetricPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.dao.mpoolmp.IMemoryPoolSecondMetricPersistenceDAO
;
...
...
@@ -139,7 +142,10 @@ import org.apache.skywalking.apm.collector.storage.es.dao.armp.ApplicationRefere
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.InstanceMinuteMetricEsPersistenceDAO
;
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
;
import
org.apache.skywalking.apm.collector.storage.es.dao.impp.InstanceMappingMonthEsPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.es.dao.irmp.InstanceReferenceMinuteMetricEsPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.es.dao.memorymp.MemorySecondMetricEsPersistenceDAO
;
import
org.apache.skywalking.apm.collector.storage.es.dao.mpoolmp.MemoryPoolSecondMetricEsPersistenceDAO
;
...
...
@@ -254,6 +260,11 @@ public class StorageModuleEsProvider extends ModuleProvider {
this
.
registerServiceImplementation
(
IApplicationMappingDayPersistenceDAO
.
class
,
new
ApplicationMappingDayEsPersistenceDAO
(
elasticSearchClient
));
this
.
registerServiceImplementation
(
IApplicationMappingMonthPersistenceDAO
.
class
,
new
ApplicationMappingMonthEsPersistenceDAO
(
elasticSearchClient
));
this
.
registerServiceImplementation
(
IInstanceMappingMinutePersistenceDAO
.
class
,
new
InstanceMappingMinuteEsPersistenceDAO
(
elasticSearchClient
));
this
.
registerServiceImplementation
(
IInstanceMappingHourPersistenceDAO
.
class
,
new
InstanceMappingHourEsPersistenceDAO
(
elasticSearchClient
));
this
.
registerServiceImplementation
(
IInstanceMappingDayPersistenceDAO
.
class
,
new
InstanceMappingDayEsPersistenceDAO
(
elasticSearchClient
));
this
.
registerServiceImplementation
(
IInstanceMappingMonthPersistenceDAO
.
class
,
new
InstanceMappingMonthEsPersistenceDAO
(
elasticSearchClient
));
this
.
registerServiceImplementation
(
IGlobalTracePersistenceDAO
.
class
,
new
GlobalTraceEsPersistenceDAO
(
elasticSearchClient
));
this
.
registerServiceImplementation
(
IApplicationMinuteMetricPersistenceDAO
.
class
,
new
ApplicationMinuteMetricEsPersistenceDAO
(
elasticSearchClient
));
this
.
registerServiceImplementation
(
IApplicationReferenceMinuteMetricPersistenceDAO
.
class
,
new
ApplicationReferenceMinuteMetricEsPersistenceDAO
(
elasticSearchClient
));
...
...
@@ -265,7 +276,6 @@ public class StorageModuleEsProvider extends ModuleProvider {
this
.
registerServiceImplementation
(
IInstanceMinuteMetricPersistenceDAO
.
class
,
new
InstanceMinuteMetricEsPersistenceDAO
(
elasticSearchClient
));
this
.
registerServiceImplementation
(
IInstanceReferenceMinuteMetricPersistenceDAO
.
class
,
new
InstanceReferenceMinuteMetricEsPersistenceDAO
(
elasticSearchClient
));
this
.
registerServiceImplementation
(
IInstanceMappingMinutePersistenceDAO
.
class
,
new
InstanceMappingMinuteEsPersistenceDAO
(
elasticSearchClient
));
this
.
registerServiceImplementation
(
IInstanceHeartBeatPersistenceDAO
.
class
,
new
InstanceHeartBeatEsPersistenceDAO
(
elasticSearchClient
));
}
...
...
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/InstanceMappingEsTableDefine.java
→
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/
instmapping/Abstract
InstanceMappingEsTableDefine.java
浏览文件 @
17edfe8f
...
...
@@ -16,7 +16,7 @@
*
*/
package
org.apache.skywalking.apm.collector.storage.es.define
;
package
org.apache.skywalking.apm.collector.storage.es.define
.instmapping
;
import
org.apache.skywalking.apm.collector.storage.es.base.define.ElasticSearchColumnDefine
;
import
org.apache.skywalking.apm.collector.storage.es.base.define.ElasticSearchTableDefine
;
...
...
@@ -25,17 +25,15 @@ import org.apache.skywalking.apm.collector.storage.table.instance.InstanceMappin
/**
* @author peng-yongsheng
*/
public
class
InstanceMappingEsTableDefine
extends
ElasticSearchTableDefine
{
public
abstract
class
Abstract
InstanceMappingEsTableDefine
extends
ElasticSearchTableDefine
{
public
InstanceMappingEsTableDefine
(
)
{
super
(
InstanceMappingTable
.
TABLE
);
AbstractInstanceMappingEsTableDefine
(
String
name
)
{
super
(
name
);
}
@Override
public
int
refreshInterval
()
{
return
2
;
}
@Override
public
void
initialize
()
{
@Override
public
final
void
initialize
()
{
addColumn
(
new
ElasticSearchColumnDefine
(
InstanceMappingTable
.
COLUMN_ID
,
ElasticSearchColumnDefine
.
Type
.
Keyword
.
name
()));
addColumn
(
new
ElasticSearchColumnDefine
(
InstanceMappingTable
.
COLUMN_METRIC_ID
,
ElasticSearchColumnDefine
.
Type
.
Keyword
.
name
()));
addColumn
(
new
ElasticSearchColumnDefine
(
InstanceMappingTable
.
COLUMN_APPLICATION_ID
,
ElasticSearchColumnDefine
.
Type
.
Integer
.
name
()));
addColumn
(
new
ElasticSearchColumnDefine
(
InstanceMappingTable
.
COLUMN_INSTANCE_ID
,
ElasticSearchColumnDefine
.
Type
.
Integer
.
name
()));
addColumn
(
new
ElasticSearchColumnDefine
(
InstanceMappingTable
.
COLUMN_ADDRESS_ID
,
ElasticSearchColumnDefine
.
Type
.
Integer
.
name
()));
...
...
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/instmapping/InstanceMappingDayEsTableDefine.java
0 → 100644
浏览文件 @
17edfe8f
/*
* 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.instmapping
;
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.InstanceMappingTable
;
/**
* @author peng-yongsheng
*/
public
class
InstanceMappingDayEsTableDefine
extends
AbstractInstanceMappingEsTableDefine
{
public
InstanceMappingDayEsTableDefine
()
{
super
(
InstanceMappingTable
.
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/instmapping/InstanceMappingHourEsTableDefine.java
0 → 100644
浏览文件 @
17edfe8f
/*
* 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.instmapping
;
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.InstanceMappingTable
;
/**
* @author peng-yongsheng
*/
public
class
InstanceMappingHourEsTableDefine
extends
AbstractInstanceMappingEsTableDefine
{
public
InstanceMappingHourEsTableDefine
()
{
super
(
InstanceMappingTable
.
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/instmapping/InstanceMappingMinuteEsTableDefine.java
0 → 100644
浏览文件 @
17edfe8f
/*
* 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.instmapping
;
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.InstanceMappingTable
;
/**
* @author peng-yongsheng
*/
public
class
InstanceMappingMinuteEsTableDefine
extends
AbstractInstanceMappingEsTableDefine
{
public
InstanceMappingMinuteEsTableDefine
()
{
super
(
InstanceMappingTable
.
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/instmapping/InstanceMappingMonthEsTableDefine.java
0 → 100644
浏览文件 @
17edfe8f
/*
* 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.instmapping
;
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.InstanceMappingTable
;
/**
* @author peng-yongsheng
*/
public
class
InstanceMappingMonthEsTableDefine
extends
AbstractInstanceMappingEsTableDefine
{
public
InstanceMappingMonthEsTableDefine
()
{
super
(
InstanceMappingTable
.
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
浏览文件 @
17edfe8f
...
...
@@ -11,4 +11,9 @@ org.apache.skywalking.apm.collector.storage.es.define.appcomp.ApplicationCompone
org.apache.skywalking.apm.collector.storage.es.define.appmapping.ApplicationMappingMinuteEsTableDefine
org.apache.skywalking.apm.collector.storage.es.define.appmapping.ApplicationMappingHourEsTableDefine
org.apache.skywalking.apm.collector.storage.es.define.appmapping.ApplicationMappingDayEsTableDefine
org.apache.skywalking.apm.collector.storage.es.define.appmapping.ApplicationMappingMonthEsTableDefine
\ No newline at end of file
org.apache.skywalking.apm.collector.storage.es.define.appmapping.ApplicationMappingMonthEsTableDefine
org.apache.skywalking.apm.collector.storage.es.define.instmapping.InstanceMappingMinuteEsTableDefine
org.apache.skywalking.apm.collector.storage.es.define.instmapping.InstanceMappingHourEsTableDefine
org.apache.skywalking.apm.collector.storage.es.define.instmapping.InstanceMappingDayEsTableDefine
org.apache.skywalking.apm.collector.storage.es.define.instmapping.InstanceMappingMonthEsTableDefine
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录