Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
8e8029d0
S
SkyWalking
项目概览
apache
/
SkyWalking
上一次同步 1 年多
通知
302
Star
21345
Fork
6091
代码
文件
提交
分支
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,发现更多精彩内容 >>
提交
8e8029d0
编写于
11月 08, 2017
作者:
P
peng-yongsheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
no message
上级
7c0f47c1
变更
27
隐藏空白更改
内联
并排
Showing
27 changed file
with
459 addition
and
311 deletion
+459
-311
apm-collector/apm-collector-agent/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/handler/JVMMetricsServiceHandler.java
...ollector/agent/grpc/handler/JVMMetricsServiceHandler.java
+57
-76
apm-collector/apm-collector-agent/collector-agent-stream/pom.xml
...lector/apm-collector-agent/collector-agent-stream/pom.xml
+1
-1
apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/graph/JvmMetricStreamGraph.java
...pm/collector/agent/stream/graph/JvmMetricStreamGraph.java
+94
-0
apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/CpuMetricPersistenceWorker.java
...r/agent/stream/worker/jvm/CpuMetricPersistenceWorker.java
+64
-0
apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/GCMetricPersistenceWorker.java
...or/agent/stream/worker/jvm/GCMetricPersistenceWorker.java
+10
-8
apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/InstHeartBeatPersistenceWorker.java
...ent/stream/worker/jvm/InstHeartBeatPersistenceWorker.java
+9
-11
apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/MemoryMetricPersistenceWorker.java
...gent/stream/worker/jvm/MemoryMetricPersistenceWorker.java
+11
-5
apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/MemoryPoolMetricPersistenceWorker.java
.../stream/worker/jvm/MemoryPoolMetricPersistenceWorker.java
+37
-0
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/Data.java
...ain/java/org/skywalking/apm/collector/core/data/Data.java
+39
-0
apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/skywalking/apm/collector/queue/base/QueueExecutor.java
...rg/skywalking/apm/collector/queue/base/QueueExecutor.java
+3
-2
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/dao/IBatchDAO.java
.../skywalking/apm/collector/storage/base/dao/IBatchDAO.java
+1
-1
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/dao/IPersistenceDAO.java
...lking/apm/collector/storage/base/dao/IPersistenceDAO.java
+6
-4
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/ICpuMetricStreamDAO.java
...alking/apm/collector/storage/dao/ICpuMetricStreamDAO.java
+3
-1
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/service/DAOService.java
.../skywalking/apm/collector/storage/service/DAOService.java
+3
-0
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/CpuMetric.java
...skywalking/apm/collector/storage/table/jvm/CpuMetric.java
+12
-0
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/GCMetric.java
.../skywalking/apm/collector/storage/table/jvm/GCMetric.java
+20
-0
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryMetric.java
...walking/apm/collector/storage/table/jvm/MemoryMetric.java
+28
-0
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryPoolMetric.java
...ing/apm/collector/storage/table/jvm/MemoryPoolMetric.java
+28
-0
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/CpuMetricEsStreamDAO.java
...ng/apm/collector/storage/es/dao/CpuMetricEsStreamDAO.java
+1
-2
apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractLocalAsyncWorker.java
...ollector/stream/worker/base/AbstractLocalAsyncWorker.java
+1
-32
apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractLocalAsyncWorkerProvider.java
.../stream/worker/base/AbstractLocalAsyncWorkerProvider.java
+6
-10
apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractWorker.java
...king/apm/collector/stream/worker/base/AbstractWorker.java
+8
-22
apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractWorkerProvider.java
.../collector/stream/worker/base/AbstractWorkerProvider.java
+3
-14
apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/LocalAsyncWorkerRef.java
...apm/collector/stream/worker/base/LocalAsyncWorkerRef.java
+1
-2
apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/WorkerContext.java
...lking/apm/collector/stream/worker/base/WorkerContext.java
+0
-91
apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/WorkerRef.java
...kywalking/apm/collector/stream/worker/base/WorkerRef.java
+0
-10
apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/impl/PersistenceWorker.java
...g/apm/collector/stream/worker/impl/PersistenceWorker.java
+13
-19
未找到文件。
apm-collector/apm-collector-agent/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/handler/JVMMetricsServiceHandler.java
浏览文件 @
8e8029d0
...
...
@@ -20,24 +20,17 @@ package org.skywalking.apm.collector.agent.grpc.handler;
import
io.grpc.stub.StreamObserver
;
import
java.util.List
;
import
org.skywalking.apm.collector.agentjvm.worker.cpu.CpuMetricPersistenceWorker
;
import
org.skywalking.apm.collector.agentjvm.worker.gc.GCMetricPersistenceWorker
;
import
org.skywalking.apm.collector.agentjvm.worker.heartbeat.InstHeartBeatPersistenceWorker
;
import
org.skywalking.apm.collector.agentjvm.worker.heartbeat.define.InstanceHeartBeatDataDefine
;
import
org.skywalking.apm.collector.agentjvm.worker.memory.MemoryMetricPersistenceWorker
;
import
org.skywalking.apm.collector.agentjvm.worker.memorypool.MemoryPoolMetricPersistenceWorker
;
import
org.skywalking.apm.collector.core.framework.CollectorContextHelper
;
import
org.skywalking.apm.collector.agent.stream.graph.JvmMetricStreamGraph
;
import
org.skywalking.apm.collector.core.graph.Graph
;
import
org.skywalking.apm.collector.core.graph.GraphManager
;
import
org.skywalking.apm.collector.core.util.Const
;
import
org.skywalking.apm.collector.core.util.TimeBucketUtils
;
import
org.skywalking.apm.collector.server.grpc.GRPCHandler
;
import
org.skywalking.apm.collector.storage.define.jvm.CpuMetricDataDefine
;
import
org.skywalking.apm.collector.storage.define.jvm.GCMetricDataDefine
;
import
org.skywalking.apm.collector.storage.define.jvm.MemoryMetricDataDefine
;
import
org.skywalking.apm.collector.storage.define.jvm.MemoryPoolMetricDataDefine
;
import
org.skywalking.apm.collector.stream.StreamModuleContext
;
import
org.skywalking.apm.collector.stream.StreamModuleGroupDefine
;
import
org.skywalking.apm.collector.stream.worker.WorkerInvokeException
;
import
org.skywalking.apm.collector.stream.worker.WorkerNotFoundException
;
import
org.skywalking.apm.collector.storage.table.jvm.CpuMetric
;
import
org.skywalking.apm.collector.storage.table.jvm.GCMetric
;
import
org.skywalking.apm.collector.storage.table.jvm.MemoryMetric
;
import
org.skywalking.apm.collector.storage.table.jvm.MemoryPoolMetric
;
import
org.skywalking.apm.collector.storage.table.register.Instance
;
import
org.skywalking.apm.network.proto.CPU
;
import
org.skywalking.apm.network.proto.Downstream
;
import
org.skywalking.apm.network.proto.GC
;
...
...
@@ -55,81 +48,77 @@ public class JVMMetricsServiceHandler extends JVMMetricsServiceGrpc.JVMMetricsSe
private
final
Logger
logger
=
LoggerFactory
.
getLogger
(
JVMMetricsServiceHandler
.
class
);
private
final
Graph
memoryMetricGraph
;
private
final
Graph
memoryPoolMetricGraph
;
private
final
Graph
gcMetricGraph
;
private
final
Graph
cpuMetricGraph
;
private
final
Graph
heartBeatGraph
;
public
JVMMetricsServiceHandler
()
{
memoryPoolMetricGraph
=
GraphManager
.
INSTANCE
.
findGraph
(
JvmMetricStreamGraph
.
MEMORY_POOL_METRIC_GRAPH_ID
);
memoryMetricGraph
=
GraphManager
.
INSTANCE
.
findGraph
(
JvmMetricStreamGraph
.
MEMORY_METRIC_GRAPH_ID
);
gcMetricGraph
=
GraphManager
.
INSTANCE
.
findGraph
(
JvmMetricStreamGraph
.
GC_METRIC_GRAPH_ID
);
cpuMetricGraph
=
GraphManager
.
INSTANCE
.
findGraph
(
JvmMetricStreamGraph
.
CPU_METRIC_GRAPH_ID
);
heartBeatGraph
=
GraphManager
.
INSTANCE
.
findGraph
(
JvmMetricStreamGraph
.
INST_HEART_BEAT_GRAPH_ID
);
}
@Override
public
void
collect
(
JVMMetrics
request
,
StreamObserver
<
Downstream
>
responseObserver
)
{
int
instanceId
=
request
.
getApplicationInstanceId
();
logger
.
debug
(
"receive the jvm metric from application instance, id: {}"
,
instanceId
);
StreamModuleContext
context
=
(
StreamModuleContext
)
CollectorContextHelper
.
INSTANCE
.
getContext
(
StreamModuleGroupDefine
.
GROUP_NAME
);
request
.
getMetricsList
().
forEach
(
metric
->
{
long
time
=
TimeBucketUtils
.
INSTANCE
.
getSecondTimeBucket
(
metric
.
getTime
());
senToInstanceHeartBeatPersistenceWorker
(
context
,
instanceId
,
metric
.
getTime
());
sendToCpuMetricPersistenceWorker
(
context
,
instanceId
,
time
,
metric
.
getCpu
());
sendToMemoryMetricPersistenceWorker
(
context
,
instanceId
,
time
,
metric
.
getMemoryList
());
sendToMemoryPoolMetricPersistenceWorker
(
context
,
instanceId
,
time
,
metric
.
getMemoryPoolList
());
sendToGCMetricPersistenceWorker
(
context
,
instanceId
,
time
,
metric
.
getGcList
());
senToInstanceHeartBeatPersistenceWorker
(
instanceId
,
metric
.
getTime
());
sendToCpuMetricPersistenceWorker
(
instanceId
,
time
,
metric
.
getCpu
());
sendToMemoryMetricPersistenceWorker
(
instanceId
,
time
,
metric
.
getMemoryList
());
sendToMemoryPoolMetricPersistenceWorker
(
instanceId
,
time
,
metric
.
getMemoryPoolList
());
sendToGCMetricPersistenceWorker
(
instanceId
,
time
,
metric
.
getGcList
());
});
responseObserver
.
onNext
(
Downstream
.
newBuilder
().
build
());
responseObserver
.
onCompleted
();
}
private
void
senToInstanceHeartBeatPersistenceWorker
(
StreamModuleContext
context
,
int
instanceId
,
long
heartBeatTime
)
{
InstanceHeartBeatDataDefine
.
InstanceHeartBeat
heartBeat
=
new
InstanceHeartBeatDataDefine
.
InstanceHeartBeat
();
heartBeat
.
setId
(
String
.
valueOf
(
instanceId
));
heartBeat
.
setHeartBeatTime
(
TimeBucketUtils
.
INSTANCE
.
getSecondTimeBucket
(
heartBeatTime
));
heartBeat
.
setInstanceId
(
instanceId
);
try
{
logger
.
debug
(
"send to instance heart beat persistence worker, id: {}"
,
heartBeat
.
getId
());
context
.
getClusterWorkerContext
().
lookup
(
InstHeartBeatPersistenceWorker
.
WorkerRole
.
INSTANCE
).
tell
(
heartBeat
.
toData
());
}
catch
(
WorkerInvokeException
|
WorkerNotFoundException
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
}
private
void
senToInstanceHeartBeatPersistenceWorker
(
int
instanceId
,
long
heartBeatTime
)
{
Instance
instance
=
new
Instance
(
String
.
valueOf
(
instanceId
));
instance
.
setHeartBeatTime
(
TimeBucketUtils
.
INSTANCE
.
getSecondTimeBucket
(
heartBeatTime
));
instance
.
setInstanceId
(
instanceId
);
logger
.
debug
(
"send to instance heart beat persistence worker, id: {}"
,
instance
.
getId
());
heartBeatGraph
.
start
(
instance
);
}
private
void
sendToCpuMetricPersistenceWorker
(
StreamModuleContext
context
,
int
instanceId
,
long
timeBucket
,
CPU
cpu
)
{
CpuMetricDataDefine
.
CpuMetric
cpuMetric
=
new
CpuMetricDataDefine
.
CpuMetric
();
cpuMetric
.
setId
(
timeBucket
+
Const
.
ID_SPLIT
+
instanceId
);
private
void
sendToCpuMetricPersistenceWorker
(
int
instanceId
,
long
timeBucket
,
CPU
cpu
)
{
CpuMetric
cpuMetric
=
new
CpuMetric
(
timeBucket
+
Const
.
ID_SPLIT
+
instanceId
);
cpuMetric
.
setInstanceId
(
instanceId
);
cpuMetric
.
setUsagePercent
(
cpu
.
getUsagePercent
());
cpuMetric
.
setTimeBucket
(
timeBucket
);
try
{
logger
.
debug
(
"send to cpu metric persistence worker, id: {}"
,
cpuMetric
.
getId
());
context
.
getClusterWorkerContext
().
lookup
(
CpuMetricPersistenceWorker
.
WorkerRole
.
INSTANCE
).
tell
(
cpuMetric
.
toData
());
}
catch
(
WorkerInvokeException
|
WorkerNotFoundException
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
}
}
private
void
sendToMemoryMetricPersistenceWorker
(
StreamModuleContext
context
,
int
instanceId
,
long
timeBucket
,
List
<
Memory
>
memories
)
{
logger
.
debug
(
"send to cpu metric graph, id: {}"
,
cpuMetric
.
getId
());
cpuMetricGraph
.
start
(
cpuMetric
);
}
private
void
sendToMemoryMetricPersistenceWorker
(
int
instanceId
,
long
timeBucket
,
List
<
Memory
>
memories
)
{
memories
.
forEach
(
memory
->
{
MemoryMetricDataDefine
.
MemoryMetric
memoryMetric
=
new
MemoryMetricDataDefine
.
MemoryMetric
();
memoryMetric
.
setId
(
timeBucket
+
Const
.
ID_SPLIT
+
instanceId
+
Const
.
ID_SPLIT
+
String
.
valueOf
(
memory
.
getIsHeap
()));
memoryMetric
.
setApplicationInstanceId
(
instanceId
);
memoryMetric
.
setHeap
(
memory
.
getIsHeap
());
MemoryMetric
memoryMetric
=
new
MemoryMetric
(
timeBucket
+
Const
.
ID_SPLIT
+
instanceId
+
Const
.
ID_SPLIT
+
String
.
valueOf
(
memory
.
getIsHeap
()));
memoryMetric
.
setInstanceId
(
instanceId
);
memoryMetric
.
setIsHeap
(
memory
.
getIsHeap
());
memoryMetric
.
setInit
(
memory
.
getInit
());
memoryMetric
.
setMax
(
memory
.
getMax
());
memoryMetric
.
setUsed
(
memory
.
getUsed
());
memoryMetric
.
setCommitted
(
memory
.
getCommitted
());
memoryMetric
.
setTimeBucket
(
timeBucket
);
try
{
logger
.
debug
(
"send to memory metric persistence worker, id: {}"
,
memoryMetric
.
getId
());
context
.
getClusterWorkerContext
().
lookup
(
MemoryMetricPersistenceWorker
.
WorkerRole
.
INSTANCE
).
tell
(
memoryMetric
.
toData
());
}
catch
(
WorkerInvokeException
|
WorkerNotFoundException
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
}
logger
.
debug
(
"send to memory metric graph, id: {}"
,
memoryMetric
.
getId
());
memoryMetricGraph
.
start
(
memoryMetric
);
});
}
private
void
sendToMemoryPoolMetricPersistenceWorker
(
StreamModuleContext
context
,
int
instanceId
,
long
timeBucket
,
List
<
MemoryPool
>
memoryPools
)
{
private
void
sendToMemoryPoolMetricPersistenceWorker
(
int
instanceId
,
long
timeBucket
,
List
<
MemoryPool
>
memoryPools
)
{
memoryPools
.
forEach
(
memoryPool
->
{
MemoryPoolMetricDataDefine
.
MemoryPoolMetric
memoryPoolMetric
=
new
MemoryPoolMetricDataDefine
.
MemoryPoolMetric
();
memoryPoolMetric
.
setId
(
timeBucket
+
Const
.
ID_SPLIT
+
instanceId
+
Const
.
ID_SPLIT
+
String
.
valueOf
(
memoryPool
.
getType
().
getNumber
()));
MemoryPoolMetric
memoryPoolMetric
=
new
MemoryPoolMetric
(
timeBucket
+
Const
.
ID_SPLIT
+
instanceId
+
Const
.
ID_SPLIT
+
String
.
valueOf
(
memoryPool
.
getType
().
getNumber
()));
memoryPoolMetric
.
setInstanceId
(
instanceId
);
memoryPoolMetric
.
setPoolType
(
memoryPool
.
getType
().
getNumber
());
memoryPoolMetric
.
setInit
(
memoryPool
.
getInit
());
...
...
@@ -137,31 +126,23 @@ public class JVMMetricsServiceHandler extends JVMMetricsServiceGrpc.JVMMetricsSe
memoryPoolMetric
.
setUsed
(
memoryPool
.
getUsed
());
memoryPoolMetric
.
setCommitted
(
memoryPool
.
getCommited
());
memoryPoolMetric
.
setTimeBucket
(
timeBucket
);
try
{
logger
.
debug
(
"send to memory pool metric persistence worker, id: {}"
,
memoryPoolMetric
.
getId
());
context
.
getClusterWorkerContext
().
lookup
(
MemoryPoolMetricPersistenceWorker
.
WorkerRole
.
INSTANCE
).
tell
(
memoryPoolMetric
.
toData
());
}
catch
(
WorkerInvokeException
|
WorkerNotFoundException
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
}
logger
.
debug
(
"send to memory pool metric graph, id: {}"
,
memoryPoolMetric
.
getId
());
memoryPoolMetricGraph
.
start
(
memoryPoolMetric
);
});
}
private
void
sendToGCMetricPersistenceWorker
(
StreamModuleContext
context
,
int
instanceId
,
long
timeBucket
,
List
<
GC
>
gcs
)
{
private
void
sendToGCMetricPersistenceWorker
(
int
instanceId
,
long
timeBucket
,
List
<
GC
>
gcs
)
{
gcs
.
forEach
(
gc
->
{
GCMetricDataDefine
.
GCMetric
gcMetric
=
new
GCMetricDataDefine
.
GCMetric
();
gcMetric
.
setId
(
timeBucket
+
Const
.
ID_SPLIT
+
instanceId
+
Const
.
ID_SPLIT
+
String
.
valueOf
(
gc
.
getPhraseValue
()));
GCMetric
gcMetric
=
new
GCMetric
(
timeBucket
+
Const
.
ID_SPLIT
+
instanceId
+
Const
.
ID_SPLIT
+
String
.
valueOf
(
gc
.
getPhraseValue
()));
gcMetric
.
setInstanceId
(
instanceId
);
gcMetric
.
setPhrase
(
gc
.
getPhraseValue
());
gcMetric
.
setCount
(
gc
.
getCount
());
gcMetric
.
setTime
(
gc
.
getTime
());
gcMetric
.
setTimeBucket
(
timeBucket
);
try
{
logger
.
debug
(
"send to gc metric persistence worker, id: {}"
,
gcMetric
.
getId
());
context
.
getClusterWorkerContext
().
lookup
(
GCMetricPersistenceWorker
.
WorkerRole
.
INSTANCE
).
tell
(
gcMetric
.
toData
());
}
catch
(
WorkerInvokeException
|
WorkerNotFoundException
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
}
logger
.
debug
(
"send to gc metric graph, id: {}"
,
gcMetric
.
getId
());
gcMetricGraph
.
start
(
gcMetric
);
});
}
}
apm-collector/apm-collector-agent/collector-agent-stream/pom.xml
浏览文件 @
8e8029d0
...
...
@@ -33,7 +33,7 @@
<dependencies>
<dependency>
<groupId>
org.skywalking
</groupId>
<artifactId>
collector-stream-
define
</artifactId>
<artifactId>
collector-stream-
provider
</artifactId>
<version>
${project.version}
</version>
</dependency>
</dependencies>
...
...
apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/graph/JvmMetricStreamGraph.java
0 → 100644
浏览文件 @
8e8029d0
/*
* Copyright 2017, OpenSkywalking Organization All rights reserved.
*
* Licensed 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.
*
* Project repository: https://github.com/OpenSkywalking/skywalking
*/
package
org.skywalking.apm.collector.agent.stream.graph
;
import
org.skywalking.apm.collector.agent.stream.worker.jvm.CpuMetricPersistenceWorker
;
import
org.skywalking.apm.collector.agent.stream.worker.jvm.GCMetricPersistenceWorker
;
import
org.skywalking.apm.collector.agent.stream.worker.jvm.InstHeartBeatPersistenceWorker
;
import
org.skywalking.apm.collector.agent.stream.worker.jvm.MemoryMetricPersistenceWorker
;
import
org.skywalking.apm.collector.agent.stream.worker.jvm.MemoryPoolMetricPersistenceWorker
;
import
org.skywalking.apm.collector.core.graph.Graph
;
import
org.skywalking.apm.collector.core.graph.GraphManager
;
import
org.skywalking.apm.collector.core.graph.Next
;
import
org.skywalking.apm.collector.core.graph.NodeProcessor
;
import
org.skywalking.apm.collector.storage.table.jvm.CpuMetric
;
import
org.skywalking.apm.collector.storage.table.jvm.GCMetric
;
import
org.skywalking.apm.collector.storage.table.jvm.MemoryMetric
;
import
org.skywalking.apm.collector.storage.table.jvm.MemoryPoolMetric
;
import
org.skywalking.apm.collector.storage.table.register.Instance
;
import
org.skywalking.apm.collector.stream.worker.base.ProviderNotFoundException
;
import
org.skywalking.apm.collector.stream.worker.base.WorkerInvokeException
;
import
org.skywalking.apm.collector.stream.worker.base.WorkerRef
;
/**
* @author peng-yongsheng
*/
public
class
JvmMetricStreamGraph
{
public
static
final
int
GC_METRIC_GRAPH_ID
=
100
;
public
static
final
int
MEMORY_METRIC_GRAPH_ID
=
101
;
public
static
final
int
MEMORY_POOL_METRIC_GRAPH_ID
=
102
;
public
static
final
int
CPU_METRIC_GRAPH_ID
=
103
;
public
static
final
int
INST_HEART_BEAT_GRAPH_ID
=
104
;
public
Graph
<
GCMetric
>
createGCMetricGraph
()
{
Graph
<
GCMetric
>
graph
=
GraphManager
.
INSTANCE
.
createIfAbsent
(
GC_METRIC_GRAPH_ID
,
GCMetric
.
class
);
graph
.
addNode
(
new
GCMetricPersistenceWorker
());
return
graph
;
}
public
Graph
<
CpuMetric
>
createCPUMetricGraph
()
throws
ProviderNotFoundException
{
CpuMetricPersistenceWorker
.
Factory
factory
=
new
CpuMetricPersistenceWorker
.
Factory
(
null
,
null
);
final
WorkerRef
workerRef
=
factory
.
create
(
null
);
Graph
<
CpuMetric
>
graph
=
GraphManager
.
INSTANCE
.
createIfAbsent
(
CPU_METRIC_GRAPH_ID
,
CpuMetric
.
class
);
graph
.
addNode
(
new
NodeProcessor
<
CpuMetric
,
CpuMetric
>()
{
@Override
public
int
id
()
{
return
0
;
}
@Override
public
void
process
(
CpuMetric
INPUT
,
Next
<
CpuMetric
>
next
)
{
try
{
workerRef
.
tell
(
INPUT
);
}
catch
(
WorkerInvokeException
e
)
{
e
.
printStackTrace
();
}
}
});
return
graph
;
}
public
Graph
<
MemoryMetric
>
createMemoryMetricGraph
()
{
Graph
<
MemoryMetric
>
graph
=
GraphManager
.
INSTANCE
.
createIfAbsent
(
MEMORY_METRIC_GRAPH_ID
,
MemoryMetric
.
class
);
graph
.
addNode
(
new
MemoryMetricPersistenceWorker
());
return
graph
;
}
public
Graph
<
MemoryPoolMetric
>
createMemoryPoolMetricGraph
()
{
Graph
<
MemoryPoolMetric
>
graph
=
GraphManager
.
INSTANCE
.
createIfAbsent
(
MEMORY_POOL_METRIC_GRAPH_ID
,
MemoryPoolMetric
.
class
);
graph
.
addNode
(
new
MemoryPoolMetricPersistenceWorker
());
return
graph
;
}
public
Graph
<
Instance
>
createHeartBeatGraph
()
{
Graph
<
Instance
>
graph
=
GraphManager
.
INSTANCE
.
createIfAbsent
(
INST_HEART_BEAT_GRAPH_ID
,
Instance
.
class
);
graph
.
addNode
(
new
InstHeartBeatPersistenceWorker
());
return
graph
;
}
}
apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/CpuMetricPersistenceWorker.java
0 → 100644
浏览文件 @
8e8029d0
/*
* Copyright 2017, OpenSkywalking Organization All rights reserved.
*
* Licensed 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.
*
* Project repository: https://github.com/OpenSkywalking/skywalking
*/
package
org.skywalking.apm.collector.agent.stream.worker.jvm
;
import
org.skywalking.apm.collector.queue.service.QueueCreatorService
;
import
org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO
;
import
org.skywalking.apm.collector.storage.dao.ICpuMetricStreamDAO
;
import
org.skywalking.apm.collector.storage.service.DAOService
;
import
org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider
;
import
org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker
;
/**
* @author peng-yongsheng
*/
public
class
CpuMetricPersistenceWorker
extends
PersistenceWorker
{
private
final
DAOService
daoService
;
public
CpuMetricPersistenceWorker
(
DAOService
daoService
)
{
super
(
daoService
);
this
.
daoService
=
daoService
;
}
@Override
protected
boolean
needMergeDBData
()
{
return
false
;
}
@Override
protected
IPersistenceDAO
persistenceDAO
()
{
return
daoService
.
getPersistenceDAO
(
ICpuMetricStreamDAO
.
class
);
}
public
static
class
Factory
extends
AbstractLocalAsyncWorkerProvider
<
CpuMetricPersistenceWorker
>
{
public
Factory
(
DAOService
daoService
,
QueueCreatorService
queueCreatorService
)
{
super
(
daoService
,
queueCreatorService
);
}
@Override
public
CpuMetricPersistenceWorker
workerInstance
(
DAOService
daoService
)
{
return
new
CpuMetricPersistenceWorker
(
daoService
);
}
@Override
public
int
queueSize
()
{
return
1024
;
}
}
}
apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/
graph/GCMetricStreamGraph
.java
→
apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/
worker/jvm/GCMetricPersistenceWorker
.java
浏览文件 @
8e8029d0
...
...
@@ -16,20 +16,22 @@
* Project repository: https://github.com/OpenSkywalking/skywalking
*/
package
org.skywalking.apm.collector.agent.stream.
graph
;
package
org.skywalking.apm.collector.agent.stream.
worker.jvm
;
import
org.skywalking.apm.collector.core.graph.
Graph
;
import
org.skywalking.apm.collector.core.graph.
GraphManage
r
;
import
org.skywalking.apm.collector.core.graph.
Next
;
import
org.skywalking.apm.collector.core.graph.
NodeProcesso
r
;
import
org.skywalking.apm.collector.storage.table.jvm.GCMetric
;
/**
* @author peng-yongsheng
*/
public
class
GCMetricStreamGraph
{
public
class
GCMetricPersistenceWorker
implements
NodeProcessor
<
GCMetric
,
GCMetric
>
{
@Override
public
int
id
()
{
return
1
;
}
@Override
public
void
process
(
GCMetric
INPUT
,
Next
<
GCMetric
>
next
)
{
public
Graph
<
GCMetric
>
createIfAbsent
()
{
Graph
<
GCMetric
>
graph
=
GraphManager
.
INSTANCE
.
createIfAbsent
(
1
,
GCMetric
.
class
);
graph
.
addNode
();
return
graph
;
}
}
apm-collector/apm-collector-
stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/ClusterWorkerContext
.java
→
apm-collector/apm-collector-
agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/InstHeartBeatPersistenceWorker
.java
浏览文件 @
8e8029d0
...
...
@@ -16,24 +16,22 @@
* Project repository: https://github.com/OpenSkywalking/skywalking
*/
package
org.skywalking.apm.collector.
stream.worker.base
;
package
org.skywalking.apm.collector.
agent.stream.worker.jvm
;
import
java.util.ArrayList
;
import
java.util.List
;
import
org.skywalking.apm.collector.core.graph.Next
;
import
org.skywalking.apm.collector.core.graph.NodeProcessor
;
import
org.skywalking.apm.collector.storage.table.register.Instance
;
/**
* @author peng-yongsheng
*/
public
class
ClusterWorkerContext
extends
WorkerContext
{
public
class
InstHeartBeatPersistenceWorker
implements
NodeProcessor
<
Instance
,
Instance
>
{
private
List
<
AbstractRemoteWorkerProvider
>
providers
=
new
ArrayList
<>();
public
List
<
AbstractRemoteWorkerProvider
>
getProviders
()
{
return
providers
;
@Override
public
int
id
()
{
return
0
;
}
@Override
public
void
putProvider
(
AbstractRemoteWorkerProvider
provider
)
{
providers
.
add
(
provider
);
@Override
public
void
process
(
Instance
INPUT
,
Next
<
Instance
>
next
)
{
}
}
apm-collector/apm-collector-
stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/Role
.java
→
apm-collector/apm-collector-
agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/MemoryMetricPersistenceWorker
.java
浏览文件 @
8e8029d0
...
...
@@ -16,16 +16,22 @@
* Project repository: https://github.com/OpenSkywalking/skywalking
*/
package
org.skywalking.apm.collector.
stream.worker.base
;
package
org.skywalking.apm.collector.
agent.stream.worker.jvm
;
import
org.skywalking.apm.collector.remote.RoutingRule
;
import
org.skywalking.apm.collector.core.graph.Next
;
import
org.skywalking.apm.collector.core.graph.NodeProcessor
;
import
org.skywalking.apm.collector.storage.table.jvm.MemoryMetric
;
/**
* @author peng-yongsheng
*/
public
interface
Role
{
public
class
MemoryMetricPersistenceWorker
implements
NodeProcessor
<
MemoryMetric
,
MemoryMetric
>
{
String
roleName
();
@Override
public
int
id
()
{
return
0
;
}
RoutingRule
routingRule
();
@Override
public
void
process
(
MemoryMetric
INPUT
,
Next
<
MemoryMetric
>
next
)
{
}
}
apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/MemoryPoolMetricPersistenceWorker.java
0 → 100644
浏览文件 @
8e8029d0
/*
* Copyright 2017, OpenSkywalking Organization All rights reserved.
*
* Licensed 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.
*
* Project repository: https://github.com/OpenSkywalking/skywalking
*/
package
org.skywalking.apm.collector.agent.stream.worker.jvm
;
import
org.skywalking.apm.collector.core.graph.Next
;
import
org.skywalking.apm.collector.core.graph.NodeProcessor
;
import
org.skywalking.apm.collector.storage.table.jvm.MemoryPoolMetric
;
/**
* @author peng-yongsheng
*/
public
class
MemoryPoolMetricPersistenceWorker
implements
NodeProcessor
<
MemoryPoolMetric
,
MemoryPoolMetric
>
{
@Override
public
int
id
()
{
return
0
;
}
@Override
public
void
process
(
MemoryPoolMetric
INPUT
,
Next
<
MemoryPoolMetric
>
next
)
{
}
}
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/Data.java
浏览文件 @
8e8029d0
...
...
@@ -28,6 +28,12 @@ public abstract class Data extends AbstractHashMessage {
private
Integer
[]
dataIntegers
;
private
Boolean
[]
dataBooleans
;
private
byte
[][]
dataBytes
;
private
final
Column
[]
stringColumns
;
private
final
Column
[]
longColumns
;
private
final
Column
[]
doubleColumns
;
private
final
Column
[]
integerColumns
;
private
final
Column
[]
booleanColumns
;
private
final
Column
[]
byteColumns
;
public
Data
(
String
id
,
Column
[]
stringColumns
,
Column
[]
longColumns
,
Column
[]
doubleColumns
,
Column
[]
integerColumns
,
Column
[]
booleanColumns
,
Column
[]
byteColumns
)
{
...
...
@@ -39,6 +45,12 @@ public abstract class Data extends AbstractHashMessage {
this
.
dataIntegers
=
new
Integer
[
integerColumns
.
length
];
this
.
dataBooleans
=
new
Boolean
[
booleanColumns
.
length
];
this
.
dataBytes
=
new
byte
[
byteColumns
.
length
][];
this
.
stringColumns
=
stringColumns
;
this
.
longColumns
=
longColumns
;
this
.
doubleColumns
=
doubleColumns
;
this
.
integerColumns
=
integerColumns
;
this
.
booleanColumns
=
booleanColumns
;
this
.
byteColumns
=
byteColumns
;
}
public
int
getDataStringsCount
()
{
...
...
@@ -117,6 +129,33 @@ public abstract class Data extends AbstractHashMessage {
return
dataStrings
[
0
];
}
public
void
mergeData
(
Data
newData
)
{
for
(
int
i
=
0
;
i
<
stringColumns
.
length
;
i
++)
{
String
stringData
=
stringColumns
[
i
].
getOperation
().
operate
(
newData
.
getDataString
(
i
),
this
.
dataStrings
[
i
]);
this
.
dataStrings
[
i
]
=
stringData
;
}
for
(
int
i
=
0
;
i
<
longColumns
.
length
;
i
++)
{
Long
longData
=
longColumns
[
i
].
getOperation
().
operate
(
newData
.
getDataLong
(
i
),
this
.
dataLongs
[
i
]);
this
.
dataLongs
[
i
]
=
longData
;
}
for
(
int
i
=
0
;
i
<
doubleColumns
.
length
;
i
++)
{
Double
doubleData
=
doubleColumns
[
i
].
getOperation
().
operate
(
newData
.
getDataDouble
(
i
),
this
.
dataDoubles
[
i
]);
this
.
dataDoubles
[
i
]
=
doubleData
;
}
for
(
int
i
=
0
;
i
<
integerColumns
.
length
;
i
++)
{
Integer
integerData
=
integerColumns
[
i
].
getOperation
().
operate
(
newData
.
getDataInteger
(
i
),
this
.
dataIntegers
[
i
]);
this
.
dataIntegers
[
i
]
=
integerData
;
}
for
(
int
i
=
0
;
i
<
booleanColumns
.
length
;
i
++)
{
Boolean
booleanData
=
booleanColumns
[
i
].
getOperation
().
operate
(
newData
.
getDataBoolean
(
i
),
this
.
dataBooleans
[
i
]);
this
.
dataBooleans
[
i
]
=
booleanData
;
}
for
(
int
i
=
0
;
i
<
byteColumns
.
length
;
i
++)
{
byte
[]
byteData
=
byteColumns
[
i
].
getOperation
().
operate
(
newData
.
getDataBytes
(
i
),
this
.
dataBytes
[
i
]);
this
.
dataBytes
[
i
]
=
byteData
;
}
}
@Override
public
String
toString
()
{
StringBuilder
dataStr
=
new
StringBuilder
();
dataStr
.
append
(
"string: ["
);
...
...
apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/skywalking/apm/collector/queue/base/QueueExecutor.java
浏览文件 @
8e8029d0
...
...
@@ -18,9 +18,10 @@
package
org.skywalking.apm.collector.queue.base
;
import
org.skywalking.apm.collector.core.framework.Executor
;
/**
* @author peng-yongsheng
*/
public
interface
QueueExecutor
{
void
execute
(
Object
message
);
public
interface
QueueExecutor
extends
Executor
{
}
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/dao/IBatchDAO.java
浏览文件 @
8e8029d0
...
...
@@ -23,6 +23,6 @@ import java.util.List;
/**
* @author peng-yongsheng
*/
public
interface
IBatchDAO
{
public
interface
IBatchDAO
extends
DAO
{
void
batchPersistence
(
List
<?>
batchCollection
);
}
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/dao/IPersistenceDAO.java
浏览文件 @
8e8029d0
...
...
@@ -18,13 +18,15 @@
package
org.skywalking.apm.collector.storage.base.dao
;
import
org.skywalking.apm.collector.core.data.Data
;
/**
* @author peng-yongsheng
*/
public
interface
IPersistenceDAO
<
Insert
,
Update
,
Data
>
{
Data
get
(
String
id
);
public
interface
IPersistenceDAO
<
Insert
,
Update
,
Data
Impl
extends
Data
>
{
Data
Impl
get
(
String
id
);
Insert
prepareBatchInsert
(
Data
data
);
Insert
prepareBatchInsert
(
Data
Impl
data
);
Update
prepareBatchUpdate
(
Data
data
);
Update
prepareBatchUpdate
(
Data
Impl
data
);
}
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/ICpuMetricStreamDAO.java
浏览文件 @
8e8029d0
...
...
@@ -18,8 +18,10 @@
package
org.skywalking.apm.collector.storage.dao
;
import
org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO
;
/**
* @author peng-yongsheng
*/
public
interface
ICpuMetricStreamDAO
{
public
interface
ICpuMetricStreamDAO
<
Insert
,
Update
,
Data
>
extends
IPersistenceDAO
<
Insert
,
Update
,
Data
>
{
}
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/service/DAOService.java
浏览文件 @
8e8029d0
...
...
@@ -20,10 +20,13 @@ package org.skywalking.apm.collector.storage.service;
import
org.skywalking.apm.collector.core.module.Service
;
import
org.skywalking.apm.collector.storage.base.dao.DAO
;
import
org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO
;
/**
* @author peng-yongsheng
*/
public
interface
DAOService
extends
Service
{
DAO
get
(
Class
<?
extends
DAO
>
daoInterfaceClass
);
IPersistenceDAO
getPersistenceDAO
(
Class
<?
extends
IPersistenceDAO
>
daoInterfaceClass
);
}
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/CpuMetric.java
浏览文件 @
8e8029d0
...
...
@@ -56,11 +56,23 @@ public class CpuMetric extends Data {
return
getDataInteger
(
0
);
}
public
void
setInstanceId
(
Integer
instanceId
)
{
setDataInteger
(
0
,
instanceId
);
}
public
Double
getUsagePercent
()
{
return
getDataDouble
(
0
);
}
public
void
setUsagePercent
(
Double
usagePercent
)
{
setDataDouble
(
0
,
usagePercent
);
}
public
Long
getTimeBucket
()
{
return
getDataLong
(
0
);
}
public
void
setTimeBucket
(
Long
timeBucket
)
{
setDataLong
(
0
,
timeBucket
);
}
}
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/GCMetric.java
浏览文件 @
8e8029d0
...
...
@@ -57,19 +57,39 @@ public class GCMetric extends Data {
return
getDataLong
(
0
);
}
public
void
setCount
(
Long
count
)
{
setDataLong
(
0
,
count
);
}
public
Long
getTime
()
{
return
getDataLong
(
1
);
}
public
void
setTime
(
Long
time
)
{
setDataLong
(
1
,
time
);
}
public
Long
getTimeBucket
()
{
return
getDataLong
(
2
);
}
public
void
setTimeBucket
(
Long
timeBucket
)
{
setDataLong
(
2
,
timeBucket
);
}
public
Integer
getInstanceId
()
{
return
getDataInteger
(
0
);
}
public
void
setInstanceId
(
Integer
instanceId
)
{
setDataInteger
(
0
,
instanceId
);
}
public
Integer
getPhrase
()
{
return
getDataInteger
(
1
);
}
public
void
setPhrase
(
Integer
phrase
)
{
setDataInteger
(
1
,
phrase
);
}
}
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryMetric.java
浏览文件 @
8e8029d0
...
...
@@ -60,27 +60,55 @@ public class MemoryMetric extends Data {
return
getDataLong
(
0
);
}
public
void
setInit
(
Long
init
)
{
setDataLong
(
0
,
init
);
}
public
Long
getMax
()
{
return
getDataLong
(
1
);
}
public
void
setMax
(
Long
max
)
{
setDataLong
(
1
,
max
);
}
public
Long
getUsed
()
{
return
getDataLong
(
2
);
}
public
void
setUsed
(
Long
used
)
{
setDataLong
(
2
,
used
);
}
public
Long
getCommitted
()
{
return
getDataLong
(
3
);
}
public
void
setCommitted
(
Long
committed
)
{
setDataLong
(
3
,
committed
);
}
public
Long
getTimeBucket
()
{
return
getDataLong
(
4
);
}
public
void
setTimeBucket
(
Long
timeBucket
)
{
setDataLong
(
4
,
timeBucket
);
}
public
Boolean
getIsHeap
()
{
return
getDataBoolean
(
0
);
}
public
void
setIsHeap
(
Boolean
isHeap
)
{
setDataBoolean
(
0
,
isHeap
);
}
public
Integer
getInstanceId
()
{
return
getDataInteger
(
0
);
}
public
void
setInstanceId
(
Integer
instanceId
)
{
setDataInteger
(
0
,
instanceId
);
}
}
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryPoolMetric.java
浏览文件 @
8e8029d0
...
...
@@ -59,27 +59,55 @@ public class MemoryPoolMetric extends Data {
return
getDataLong
(
0
);
}
public
void
setInit
(
Long
init
)
{
setDataLong
(
0
,
init
);
}
public
Long
getMax
()
{
return
getDataLong
(
1
);
}
public
void
setMax
(
Long
max
)
{
setDataLong
(
1
,
max
);
}
public
Long
getUsed
()
{
return
getDataLong
(
2
);
}
public
void
setUsed
(
Long
used
)
{
setDataLong
(
2
,
used
);
}
public
Long
getCommitted
()
{
return
getDataLong
(
3
);
}
public
void
setCommitted
(
Long
committed
)
{
setDataLong
(
3
,
committed
);
}
public
Long
getTimeBucket
()
{
return
getDataLong
(
4
);
}
public
void
setTimeBucket
(
Long
timeBucket
)
{
setDataLong
(
4
,
timeBucket
);
}
public
Integer
getInstanceId
()
{
return
getDataInteger
(
0
);
}
public
void
setInstanceId
(
Integer
instanceId
)
{
setDataInteger
(
0
,
instanceId
);
}
public
Integer
getPoolType
()
{
return
getDataInteger
(
1
);
}
public
void
setPoolType
(
Integer
poolType
)
{
setDataInteger
(
1
,
poolType
);
}
}
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/CpuMetricEsStreamDAO.java
浏览文件 @
8e8029d0
...
...
@@ -22,7 +22,6 @@ import java.util.HashMap;
import
java.util.Map
;
import
org.elasticsearch.action.index.IndexRequestBuilder
;
import
org.elasticsearch.action.update.UpdateRequestBuilder
;
import
org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO
;
import
org.skywalking.apm.collector.storage.dao.ICpuMetricStreamDAO
;
import
org.skywalking.apm.collector.storage.es.base.dao.EsDAO
;
import
org.skywalking.apm.collector.storage.table.jvm.CpuMetric
;
...
...
@@ -33,7 +32,7 @@ import org.slf4j.LoggerFactory;
/**
* @author peng-yongsheng
*/
public
class
CpuMetricEsStreamDAO
extends
EsDAO
implements
ICpuMetricStreamDAO
,
IPersistenceDAO
<
IndexRequestBuilder
,
UpdateRequestBuilder
,
CpuMetric
>
{
public
class
CpuMetricEsStreamDAO
extends
EsDAO
implements
ICpuMetricStreamDAO
<
IndexRequestBuilder
,
UpdateRequestBuilder
,
CpuMetric
>
{
private
final
Logger
logger
=
LoggerFactory
.
getLogger
(
CpuMetricEsStreamDAO
.
class
);
...
...
apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractLocalAsyncWorker.java
浏览文件 @
8e8029d0
...
...
@@ -27,38 +27,7 @@ import org.skywalking.apm.collector.queue.base.QueueExecutor;
* @author peng-yongsheng
* @since v3.0-2017
*/
public
abstract
class
AbstractLocalAsyncWorker
extends
AbstractWorker
<
LocalAsyncWorkerRef
>
implements
QueueExecutor
{
private
LocalAsyncWorkerRef
workerRef
;
/**
* Construct an <code>AbstractLocalAsyncWorker</code> with the worker role and context.
*
* @param role The responsibility of worker in cluster, more than one workers can have same responsibility which use
* to provide load balancing ability.
* @param clusterContext See {@link ClusterWorkerContext}
*/
public
AbstractLocalAsyncWorker
(
Role
role
,
ClusterWorkerContext
clusterContext
)
{
super
(
role
,
clusterContext
);
}
/**
* The asynchronous worker always use to persistence data into db, this is the end of the streaming,
* so usually no need to create the next worker instance at the time of this worker instance create.
*
* @throws ProviderNotFoundException When worker provider not found, it will be throw this exception.
*/
@Override
public
void
preStart
()
throws
ProviderNotFoundException
{
}
@Override
protected
final
LocalAsyncWorkerRef
getSelf
()
{
return
workerRef
;
}
@Override
protected
final
void
putSelfRef
(
LocalAsyncWorkerRef
workerRef
)
{
this
.
workerRef
=
workerRef
;
}
public
abstract
class
AbstractLocalAsyncWorker
extends
AbstractWorker
implements
QueueExecutor
{
/**
* Receive message
...
...
apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractLocalAsyncWorkerProvider.java
浏览文件 @
8e8029d0
...
...
@@ -21,6 +21,7 @@ package org.skywalking.apm.collector.stream.worker.base;
import
org.skywalking.apm.collector.queue.base.QueueEventHandler
;
import
org.skywalking.apm.collector.queue.base.QueueExecutor
;
import
org.skywalking.apm.collector.queue.service.QueueCreatorService
;
import
org.skywalking.apm.collector.storage.service.DAOService
;
/**
* @author peng-yongsheng
...
...
@@ -29,24 +30,19 @@ public abstract class AbstractLocalAsyncWorkerProvider<T extends AbstractLocalAs
public
abstract
int
queueSize
();
private
final
DAOService
daoService
;
private
final
QueueCreatorService
queueCreatorService
;
public
AbstractLocalAsyncWorkerProvider
(
QueueCreatorService
queueCreatorService
)
{
public
AbstractLocalAsyncWorkerProvider
(
DAOService
daoService
,
QueueCreatorService
queueCreatorService
)
{
this
.
daoService
=
daoService
;
this
.
queueCreatorService
=
queueCreatorService
;
}
@Override
final
public
WorkerRef
create
(
WorkerCreateListener
workerCreateListener
)
throws
ProviderNotFoundException
{
T
localAsyncWorker
=
workerInstance
(
getClusterContext
());
localAsyncWorker
.
preStart
();
T
localAsyncWorker
=
workerInstance
(
daoService
);
workerCreateListener
.
addWorker
(
localAsyncWorker
);
QueueEventHandler
queueEventHandler
=
queueCreatorService
.
create
(
queueSize
(),
localAsyncWorker
);
LocalAsyncWorkerRef
workerRef
=
new
LocalAsyncWorkerRef
(
role
(),
queueEventHandler
);
getClusterContext
().
put
(
workerRef
);
localAsyncWorker
.
putSelfRef
(
workerRef
);
return
workerRef
;
return
new
LocalAsyncWorkerRef
(
queueEventHandler
);
}
}
apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractWorker.java
浏览文件 @
8e8029d0
...
...
@@ -18,25 +18,17 @@
package
org.skywalking.apm.collector.stream.worker.base
;
import
org.skywalking.apm.collector.core.framework.Executor
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
/**
* @author peng-yongsheng
*/
public
abstract
class
AbstractWorker
<
S
extends
WorkerRef
>
{
public
abstract
class
AbstractWorker
implements
Executor
{
private
final
Logger
logger
=
LoggerFactory
.
getLogger
(
AbstractWorker
.
class
);
private
final
Role
role
;
private
final
ClusterWorkerContext
clusterContext
;
public
AbstractWorker
(
Role
role
,
ClusterWorkerContext
clusterContext
)
{
this
.
role
=
role
;
this
.
clusterContext
=
clusterContext
;
}
/**
* The data process logic in this method.
*
...
...
@@ -45,17 +37,11 @@ public abstract class AbstractWorker<S extends WorkerRef> {
*/
protected
abstract
void
onWork
(
Object
message
)
throws
WorkerException
;
public
abstract
void
preStart
()
throws
ProviderNotFoundException
;
final
public
ClusterWorkerContext
getClusterContext
()
{
return
clusterContext
;
@Override
public
final
void
execute
(
Object
message
)
{
try
{
onWork
(
message
);
}
catch
(
WorkerException
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
}
}
final
public
Role
getRole
()
{
return
role
;
}
protected
abstract
S
getSelf
();
protected
abstract
void
putSelfRef
(
S
workerRef
);
}
apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractWorkerProvider.java
浏览文件 @
8e8029d0
...
...
@@ -18,22 +18,11 @@
package
org.skywalking.apm.collector.stream.worker.base
;
import
org.skywalking.apm.collector.storage.service.DAOService
;
/**
* @author peng-yongsheng
*/
public
abstract
class
AbstractWorkerProvider
<
T
extends
AbstractWorker
>
implements
Provider
{
private
ClusterWorkerContext
clusterContext
;
public
abstract
Role
role
();
public
abstract
T
workerInstance
(
ClusterWorkerContext
clusterContext
);
final
public
void
setClusterContext
(
ClusterWorkerContext
clusterContext
)
{
this
.
clusterContext
=
clusterContext
;
}
final
protected
ClusterWorkerContext
getClusterContext
()
{
return
clusterContext
;
}
public
abstract
T
workerInstance
(
DAOService
daoService
);
}
apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/LocalAsyncWorkerRef.java
浏览文件 @
8e8029d0
...
...
@@ -27,8 +27,7 @@ public class LocalAsyncWorkerRef extends WorkerRef {
private
QueueEventHandler
queueEventHandler
;
public
LocalAsyncWorkerRef
(
Role
role
,
QueueEventHandler
queueEventHandler
)
{
super
(
role
);
public
LocalAsyncWorkerRef
(
QueueEventHandler
queueEventHandler
)
{
this
.
queueEventHandler
=
queueEventHandler
;
}
...
...
apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/WorkerContext.java
已删除
100644 → 0
浏览文件 @
7c0f47c1
/*
* Copyright 2017, OpenSkywalking Organization All rights reserved.
*
* Licensed 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.
*
* Project repository: https://github.com/OpenSkywalking/skywalking
*/
package
org.skywalking.apm.collector.stream.worker.base
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
/**
* @author peng-yongsheng
*/
public
abstract
class
WorkerContext
implements
Context
{
private
final
Logger
logger
=
LoggerFactory
.
getLogger
(
WorkerContext
.
class
);
private
Map
<
String
,
RemoteWorkerRef
>
remoteWorkerRefs
;
private
Map
<
String
,
List
<
WorkerRef
>>
roleWorkers
;
private
Map
<
String
,
Role
>
roles
;
WorkerContext
()
{
this
.
roleWorkers
=
new
HashMap
<>();
this
.
roles
=
new
HashMap
<>();
this
.
remoteWorkerRefs
=
new
HashMap
<>();
}
private
Map
<
String
,
List
<
WorkerRef
>>
getRoleWorkers
()
{
return
this
.
roleWorkers
;
}
@Override
final
public
WorkerRefs
lookup
(
Role
role
)
throws
WorkerNotFoundException
{
if
(
getRoleWorkers
().
containsKey
(
role
.
roleName
()))
{
return
new
WorkerRefs
(
getRoleWorkers
().
get
(
role
.
roleName
()),
role
.
workerSelector
());
}
else
{
throw
new
WorkerNotFoundException
(
"role="
+
role
.
roleName
()
+
", no available worker."
);
}
}
@Override
final
public
RemoteWorkerRef
lookupInSide
(
String
roleName
)
throws
WorkerNotFoundException
{
if
(
remoteWorkerRefs
.
containsKey
(
roleName
))
{
return
remoteWorkerRefs
.
get
(
roleName
);
}
else
{
throw
new
WorkerNotFoundException
(
"role="
+
roleName
+
", no available worker."
);
}
}
public
final
void
putRole
(
Role
role
)
{
roles
.
put
(
role
.
roleName
(),
role
);
}
public
final
Role
getRole
(
String
roleName
)
{
return
roles
.
get
(
roleName
);
}
@Override
final
public
void
put
(
WorkerRef
workerRef
)
{
logger
.
debug
(
"put worker reference into context, role name: {}"
,
workerRef
.
getRole
().
roleName
());
if
(!
getRoleWorkers
().
containsKey
(
workerRef
.
getRole
().
roleName
()))
{
getRoleWorkers
().
putIfAbsent
(
workerRef
.
getRole
().
roleName
(),
new
ArrayList
<>());
}
getRoleWorkers
().
get
(
workerRef
.
getRole
().
roleName
()).
add
(
workerRef
);
if
(
workerRef
instanceof
RemoteWorkerRef
)
{
RemoteWorkerRef
remoteWorkerRef
=
(
RemoteWorkerRef
)
workerRef
;
if
(!
remoteWorkerRef
.
isAcrossJVM
())
{
remoteWorkerRefs
.
put
(
workerRef
.
getRole
().
roleName
(),
remoteWorkerRef
);
}
}
}
@Override
final
public
void
remove
(
WorkerRef
workerRef
)
{
getRoleWorkers
().
remove
(
workerRef
.
getRole
().
roleName
());
}
}
apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/WorkerRef.java
浏览文件 @
8e8029d0
...
...
@@ -22,15 +22,5 @@ package org.skywalking.apm.collector.stream.worker.base;
* @author peng-yongsheng
*/
public
abstract
class
WorkerRef
{
private
Role
role
;
public
WorkerRef
(
Role
role
)
{
this
.
role
=
role
;
}
final
public
Role
getRole
()
{
return
role
;
}
public
abstract
void
tell
(
Object
message
)
throws
WorkerInvokeException
;
}
apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/impl/PersistenceWorker.java
浏览文件 @
8e8029d0
...
...
@@ -24,13 +24,10 @@ import java.util.Map;
import
org.skywalking.apm.collector.core.data.Data
;
import
org.skywalking.apm.collector.core.util.ObjectUtils
;
import
org.skywalking.apm.collector.queue.base.EndOfBatchCommand
;
import
org.skywalking.apm.collector.storage.base.dao.DAOContainer
;
import
org.skywalking.apm.collector.storage.base.dao.IBatchDAO
;
import
org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO
;
import
org.skywalking.apm.collector.storage.service.DAOService
;
import
org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorker
;
import
org.skywalking.apm.collector.stream.worker.base.ClusterWorkerContext
;
import
org.skywalking.apm.collector.stream.worker.base.ProviderNotFoundException
;
import
org.skywalking.apm.collector.stream.worker.base.Role
;
import
org.skywalking.apm.collector.stream.worker.base.WorkerException
;
import
org.skywalking.apm.collector.stream.worker.impl.data.DataCache
;
import
org.slf4j.Logger
;
...
...
@@ -43,15 +40,12 @@ public abstract class PersistenceWorker extends AbstractLocalAsyncWorker {
private
final
Logger
logger
=
LoggerFactory
.
getLogger
(
PersistenceWorker
.
class
);
private
DataCache
dataCache
;
private
final
DAOService
daoService
;
private
final
DataCache
dataCache
;
public
PersistenceWorker
(
Role
role
,
ClusterWorkerContext
clusterContext
)
{
super
(
role
,
clusterContext
);
dataCache
=
new
DataCache
();
}
@Override
public
void
preStart
()
throws
ProviderNotFoundException
{
super
.
preStart
();
public
PersistenceWorker
(
DAOService
daoService
)
{
this
.
dataCache
=
new
DataCache
();
this
.
daoService
=
daoService
;
}
@Override
protected
final
void
onWork
(
Object
message
)
throws
WorkerException
{
...
...
@@ -71,7 +65,7 @@ public abstract class PersistenceWorker extends AbstractLocalAsyncWorker {
dataCache
.
switchPointer
();
List
<?>
collection
=
buildBatchCollection
();
IBatchDAO
dao
=
(
IBatchDAO
)
DAOContainer
.
INSTANCE
.
get
(
IBatchDAO
.
class
.
getName
()
);
IBatchDAO
dao
=
(
IBatchDAO
)
daoService
.
get
(
IBatchDAO
.
class
);
dao
.
batchPersistence
(
collection
);
}
}
finally
{
...
...
@@ -107,9 +101,9 @@ public abstract class PersistenceWorker extends AbstractLocalAsyncWorker {
List
<
Object
>
updateBatchCollection
=
new
LinkedList
<>();
dataMap
.
forEach
((
id
,
data
)
->
{
if
(
needMergeDBData
())
{
Data
dbData
=
persistenceDAO
().
get
(
id
,
getRole
().
dataDefine
()
);
Data
dbData
=
persistenceDAO
().
get
(
id
);
if
(
ObjectUtils
.
isNotEmpty
(
dbData
))
{
getRole
().
dataDefine
().
mergeData
(
data
,
dbD
ata
);
dbData
.
mergeData
(
d
ata
);
try
{
updateBatchCollection
.
add
(
persistenceDAO
().
prepareBatchUpdate
(
data
));
}
catch
(
Throwable
t
)
{
...
...
@@ -137,12 +131,12 @@ public abstract class PersistenceWorker extends AbstractLocalAsyncWorker {
private
void
aggregate
(
Object
message
)
{
dataCache
.
writing
();
Data
d
ata
=
(
Data
)
message
;
Data
newD
ata
=
(
Data
)
message
;
if
(
dataCache
.
containsKey
(
d
ata
.
getId
()))
{
getRole
().
dataDefine
().
mergeData
(
dataCache
.
get
(
data
.
getId
()),
d
ata
);
if
(
dataCache
.
containsKey
(
newD
ata
.
getId
()))
{
dataCache
.
get
(
newData
.
getId
()).
mergeData
(
newD
ata
);
}
else
{
dataCache
.
put
(
data
.
getId
(),
d
ata
);
dataCache
.
put
(
newData
.
getId
(),
newD
ata
);
}
dataCache
.
finishWriting
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录