Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
f74a5a9c
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,发现更多精彩内容 >>
提交
f74a5a9c
编写于
11月 12, 2017
作者:
P
peng-yongsheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Parse and listener
上级
863933af
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
71 addition
and
38 deletion
+71
-38
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/AbstractHashMessage.java
...ywalking/apm/collector/core/data/AbstractHashMessage.java
+4
-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
+5
-0
apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/skywalking/apm/collector/queue/base/QueueEventHandler.java
...kywalking/apm/collector/queue/base/QueueEventHandler.java
+1
-3
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
+1
-2
apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/skywalking/apm/collector/queue/service/QueueCreatorService.java
...king/apm/collector/queue/service/QueueCreatorService.java
+1
-2
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/global/GlobalTrace.java
...lking/apm/collector/storage/table/global/GlobalTrace.java
+12
-0
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/Segment.java
...ywalking/apm/collector/storage/table/segment/Segment.java
+4
-0
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentCost.java
...king/apm/collector/storage/table/segment/SegmentCost.java
+32
-0
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
-2
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
+3
-8
apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractRemoteWorkerProvider.java
...ctor/stream/worker/base/AbstractRemoteWorkerProvider.java
+1
-5
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
+1
-2
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
+2
-8
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
+2
-4
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
+1
-2
未找到文件。
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/AbstractHashMessage.java
浏览文件 @
f74a5a9c
...
...
@@ -36,4 +36,8 @@ public abstract class AbstractHashMessage {
public
int
getHashCode
()
{
return
hashCode
;
}
public
void
setKey
(
String
key
)
{
this
.
hashCode
=
key
.
hashCode
();
}
}
apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/Data.java
浏览文件 @
f74a5a9c
...
...
@@ -129,6 +129,11 @@ public abstract class Data extends EndOfBatchQueueMessage {
return
dataStrings
[
0
];
}
public
void
setId
(
String
id
)
{
setKey
(
id
);
this
.
dataStrings
[
0
]
=
id
;
}
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
]);
...
...
apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/skywalking/apm/collector/queue/base/QueueEventHandler.java
浏览文件 @
f74a5a9c
...
...
@@ -18,11 +18,9 @@
package
org.skywalking.apm.collector.queue.base
;
import
org.skywalking.apm.collector.core.data.Data
;
/**
* @author peng-yongsheng
*/
public
interface
QueueEventHandler
<
MESSAGE
extends
Data
>
{
public
interface
QueueEventHandler
<
MESSAGE
>
{
void
tell
(
MESSAGE
message
);
}
apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/skywalking/apm/collector/queue/base/QueueExecutor.java
浏览文件 @
f74a5a9c
...
...
@@ -18,11 +18,10 @@
package
org.skywalking.apm.collector.queue.base
;
import
org.skywalking.apm.collector.core.data.Data
;
import
org.skywalking.apm.collector.core.framework.Executor
;
/**
* @author peng-yongsheng
*/
public
interface
QueueExecutor
<
MESSAGE
extends
Data
>
extends
Executor
<
MESSAGE
>
{
public
interface
QueueExecutor
<
MESSAGE
>
extends
Executor
<
MESSAGE
>
{
}
apm-collector/apm-collector-queue/collector-queue-define/src/main/java/org/skywalking/apm/collector/queue/service/QueueCreatorService.java
浏览文件 @
f74a5a9c
...
...
@@ -18,7 +18,6 @@
package
org.skywalking.apm.collector.queue.service
;
import
org.skywalking.apm.collector.core.data.Data
;
import
org.skywalking.apm.collector.core.module.Service
;
import
org.skywalking.apm.collector.queue.base.QueueEventHandler
;
import
org.skywalking.apm.collector.queue.base.QueueExecutor
;
...
...
@@ -26,6 +25,6 @@ import org.skywalking.apm.collector.queue.base.QueueExecutor;
/**
* @author peng-yongsheng
*/
public
interface
QueueCreatorService
<
MESSAGE
extends
Data
>
extends
Service
{
public
interface
QueueCreatorService
<
MESSAGE
>
extends
Service
{
QueueEventHandler
<
MESSAGE
>
create
(
int
queueSize
,
QueueExecutor
<
MESSAGE
>
executor
);
}
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/global/GlobalTrace.java
浏览文件 @
f74a5a9c
...
...
@@ -52,11 +52,23 @@ public class GlobalTrace extends Data {
return
getDataString
(
1
);
}
public
void
setSegmentId
(
String
segmentId
)
{
setDataString
(
1
,
segmentId
);
}
public
String
getGlobalTraceId
()
{
return
getDataString
(
2
);
}
public
void
setGlobalTraceId
(
String
globalTraceId
)
{
setDataString
(
2
,
globalTraceId
);
}
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/segment/Segment.java
浏览文件 @
f74a5a9c
...
...
@@ -50,4 +50,8 @@ public class Segment extends Data {
public
byte
[]
getDataBinary
()
{
return
getDataBytes
(
0
);
}
public
void
setDataBinary
(
byte
[]
dataBinary
)
{
setDataBytes
(
0
,
dataBinary
);
}
}
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentCost.java
浏览文件 @
f74a5a9c
...
...
@@ -58,31 +58,63 @@ public class SegmentCost extends Data {
return
getDataString
(
1
);
}
public
void
setSegmentId
(
String
segmentId
)
{
setDataString
(
1
,
segmentId
);
}
public
String
getServiceName
()
{
return
getDataString
(
2
);
}
public
void
setServiceName
(
String
serviceName
)
{
setDataString
(
2
,
serviceName
);
}
public
Long
getCost
()
{
return
getDataLong
(
0
);
}
public
void
setCost
(
Long
cost
)
{
setDataLong
(
0
,
cost
);
}
public
Long
getStartTime
()
{
return
getDataLong
(
1
);
}
public
void
setStartTime
(
Long
startTime
)
{
setDataLong
(
1
,
startTime
);
}
public
Long
getEndTime
()
{
return
getDataLong
(
2
);
}
public
void
setEndTime
(
Long
endTime
)
{
setDataLong
(
2
,
endTime
);
}
public
Long
getTimeBucket
()
{
return
getDataLong
(
3
);
}
public
void
setTimeBucket
(
Long
timeBucket
)
{
setDataLong
(
3
,
timeBucket
);
}
public
Integer
getApplicationId
()
{
return
getDataInteger
(
0
);
}
public
void
setApplicationId
(
Integer
applicationId
)
{
setDataInteger
(
0
,
applicationId
);
}
public
Boolean
getIsError
()
{
return
getDataBoolean
(
0
);
}
public
void
setIsError
(
Boolean
isError
)
{
setDataBoolean
(
0
,
isError
);
}
}
apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractLocalAsyncWorker.java
浏览文件 @
f74a5a9c
...
...
@@ -19,7 +19,6 @@
package
org.skywalking.apm.collector.stream.worker.base
;
import
org.skywalking.apm.collector.cache.CacheServiceManager
;
import
org.skywalking.apm.collector.core.data.Data
;
import
org.skywalking.apm.collector.queue.base.QueueExecutor
;
import
org.skywalking.apm.collector.storage.service.DAOService
;
...
...
@@ -30,7 +29,7 @@ import org.skywalking.apm.collector.storage.service.DAOService;
* @author peng-yongsheng
* @since v3.0-2017
*/
public
abstract
class
AbstractLocalAsyncWorker
<
INPUT
extends
Data
,
OUTPUT
extends
Data
>
extends
AbstractWorker
<
INPUT
,
OUTPUT
>
implements
QueueExecutor
<
INPUT
>
{
public
abstract
class
AbstractLocalAsyncWorker
<
INPUT
,
OUTPUT
>
extends
AbstractWorker
<
INPUT
,
OUTPUT
>
implements
QueueExecutor
<
INPUT
>
{
public
AbstractLocalAsyncWorker
(
DAOService
daoService
,
CacheServiceManager
cacheServiceManager
)
{
super
(
daoService
,
cacheServiceManager
);
...
...
apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractLocalAsyncWorkerProvider.java
浏览文件 @
f74a5a9c
...
...
@@ -19,7 +19,6 @@
package
org.skywalking.apm.collector.stream.worker.base
;
import
org.skywalking.apm.collector.cache.CacheServiceManager
;
import
org.skywalking.apm.collector.core.data.Data
;
import
org.skywalking.apm.collector.queue.base.QueueEventHandler
;
import
org.skywalking.apm.collector.queue.base.QueueExecutor
;
import
org.skywalking.apm.collector.queue.service.QueueCreatorService
;
...
...
@@ -28,7 +27,7 @@ import org.skywalking.apm.collector.storage.service.DAOService;
/**
* @author peng-yongsheng
*/
public
abstract
class
AbstractLocalAsyncWorkerProvider
<
INPUT
extends
Data
,
OUTPUT
extends
Data
,
WORKER_TYPE
extends
AbstractLocalAsyncWorker
<
INPUT
,
OUTPUT
>
&
QueueExecutor
<
INPUT
>>
extends
AbstractWorkerProvider
<
INPUT
,
OUTPUT
,
WORKER_TYPE
>
{
public
abstract
class
AbstractLocalAsyncWorkerProvider
<
INPUT
,
OUTPUT
,
WORKER_TYPE
extends
AbstractLocalAsyncWorker
<
INPUT
,
OUTPUT
>
&
QueueExecutor
<
INPUT
>>
extends
AbstractWorkerProvider
<
INPUT
,
OUTPUT
,
WORKER_TYPE
>
{
public
abstract
int
queueSize
();
...
...
@@ -41,12 +40,8 @@ public abstract class AbstractLocalAsyncWorkerProvider<INPUT extends Data, OUTPU
}
@Override
final
public
WorkerRef
create
(
WorkerCreateListener
workerCreateListener
)
throws
ProviderNotFoundException
{
<<<<<<<
HEAD
WorkerType
localAsyncWorker
=
workerInstance
(
getDaoService
(),
getCacheServiceManager
());
=======
WORKER_TYPE
localAsyncWorker
=
workerInstance
(
daoService
);
>>>>>>>
0
c17906c3c1c41752e1ec38b37d9e0dec22503ca
public
final
WorkerRef
create
(
WorkerCreateListener
workerCreateListener
)
throws
ProviderNotFoundException
{
WORKER_TYPE
localAsyncWorker
=
workerInstance
(
getDaoService
(),
getCacheServiceManager
());
workerCreateListener
.
addWorker
(
localAsyncWorker
);
QueueEventHandler
<
INPUT
>
queueEventHandler
=
queueCreatorService
.
create
(
queueSize
(),
localAsyncWorker
);
return
new
LocalAsyncWorkerRef
<>(
localAsyncWorker
,
queueEventHandler
);
...
...
apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractRemoteWorkerProvider.java
浏览文件 @
f74a5a9c
...
...
@@ -49,11 +49,7 @@ public abstract class AbstractRemoteWorkerProvider<INPUT extends Data, OUTPUT ex
* worker instance, when the worker provider not find then Throw this Exception.
*/
@Override
final
public
WorkerRef
create
(
WorkerCreateListener
workerCreateListener
)
{
<<<<<<<
HEAD
WorkerType
remoteWorker
=
workerInstance
(
getDaoService
(),
getCacheServiceManager
());
=======
WORKER_TYPE
remoteWorker
=
workerInstance
(
daoService
);
>>>>>>>
0
c17906c3c1c41752e1ec38b37d9e0dec22503ca
WORKER_TYPE
remoteWorker
=
workerInstance
(
getDaoService
(),
getCacheServiceManager
());
workerCreateListener
.
addWorker
(
remoteWorker
);
RemoteWorkerRef
<
INPUT
,
OUTPUT
>
workerRef
=
new
RemoteWorkerRef
<>(
remoteWorker
);
return
workerRef
;
...
...
apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractWorker.java
浏览文件 @
f74a5a9c
...
...
@@ -19,7 +19,6 @@
package
org.skywalking.apm.collector.stream.worker.base
;
import
org.skywalking.apm.collector.cache.CacheServiceManager
;
import
org.skywalking.apm.collector.core.data.Data
;
import
org.skywalking.apm.collector.core.graph.Next
;
import
org.skywalking.apm.collector.core.graph.NodeProcessor
;
import
org.skywalking.apm.collector.storage.service.DAOService
;
...
...
@@ -29,7 +28,7 @@ import org.slf4j.LoggerFactory;
/**
* @author peng-yongsheng
*/
public
abstract
class
AbstractWorker
<
INPUT
extends
Data
,
OUTPUT
extends
Data
>
implements
NodeProcessor
<
INPUT
,
OUTPUT
>
{
public
abstract
class
AbstractWorker
<
INPUT
,
OUTPUT
>
implements
NodeProcessor
<
INPUT
,
OUTPUT
>
{
private
final
Logger
logger
=
LoggerFactory
.
getLogger
(
AbstractWorker
.
class
);
...
...
apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/AbstractWorkerProvider.java
浏览文件 @
f74a5a9c
...
...
@@ -19,14 +19,12 @@
package
org.skywalking.apm.collector.stream.worker.base
;
import
org.skywalking.apm.collector.cache.CacheServiceManager
;
import
org.skywalking.apm.collector.core.data.Data
;
import
org.skywalking.apm.collector.storage.service.DAOService
;
/**
* @author peng-yongsheng
*/
<<<<<<<
HEAD
public
abstract
class
AbstractWorkerProvider
<
INPUT
extends
Data
,
OUTPUT
extends
Data
,
WorkerType
extends
AbstractWorker
<
INPUT
,
OUTPUT
>>
implements
Provider
{
public
abstract
class
AbstractWorkerProvider
<
INPUT
,
OUTPUT
,
WORKER_TYPE
extends
AbstractWorker
<
INPUT
,
OUTPUT
>>
implements
Provider
{
private
final
DAOService
daoService
;
private
final
CacheServiceManager
cacheServiceManager
;
...
...
@@ -44,9 +42,5 @@ public abstract class AbstractWorkerProvider<INPUT extends Data, OUTPUT extends
return
cacheServiceManager
;
}
public
abstract
WorkerType
workerInstance
(
DAOService
daoService
,
CacheServiceManager
cacheServiceManager
);
=======
public
abstract
class
AbstractWorkerProvider
<
INPUT
extends
Data
,
OUTPUT
extends
Data
,
WORKER_TYPE
extends
AbstractWorker
<
INPUT
,
OUTPUT
>>
implements
Provider
{
public
abstract
WORKER_TYPE
workerInstance
(
DAOService
daoService
);
>>>>>>>
0
c17906c3c1c41752e1ec38b37d9e0dec22503ca
public
abstract
WORKER_TYPE
workerInstance
(
DAOService
daoService
,
CacheServiceManager
cacheServiceManager
);
}
apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/LocalAsyncWorkerRef.java
浏览文件 @
f74a5a9c
...
...
@@ -18,19 +18,17 @@
package
org.skywalking.apm.collector.stream.worker.base
;
import
org.skywalking.apm.collector.core.data.Data
;
import
org.skywalking.apm.collector.core.graph.NodeProcessor
;
import
org.skywalking.apm.collector.queue.base.QueueEventHandler
;
/**
* @author peng-yongsheng
*/
public
class
LocalAsyncWorkerRef
<
INPUT
extends
Data
,
OUTPUT
extends
Data
>
extends
WorkerRef
<
INPUT
,
OUTPUT
>
{
public
class
LocalAsyncWorkerRef
<
INPUT
,
OUTPUT
>
extends
WorkerRef
<
INPUT
,
OUTPUT
>
{
private
final
QueueEventHandler
<
INPUT
>
queueEventHandler
;
LocalAsyncWorkerRef
(
NodeProcessor
<
INPUT
,
OUTPUT
>
destinationHandler
,
QueueEventHandler
<
INPUT
>
queueEventHandler
)
{
LocalAsyncWorkerRef
(
NodeProcessor
<
INPUT
,
OUTPUT
>
destinationHandler
,
QueueEventHandler
<
INPUT
>
queueEventHandler
)
{
super
(
destinationHandler
);
this
.
queueEventHandler
=
queueEventHandler
;
}
...
...
apm-collector/apm-collector-stream/collector-stream-provider/src/main/java/org/skywalking/apm/collector/stream/worker/base/WorkerRef.java
浏览文件 @
f74a5a9c
...
...
@@ -18,14 +18,13 @@
package
org.skywalking.apm.collector.stream.worker.base
;
import
org.skywalking.apm.collector.core.data.Data
;
import
org.skywalking.apm.collector.core.graph.NodeProcessor
;
import
org.skywalking.apm.collector.core.graph.WayToNode
;
/**
* @author peng-yongsheng
*/
public
abstract
class
WorkerRef
<
INPUT
extends
Data
,
OUTPUT
extends
Data
>
extends
WayToNode
<
INPUT
,
OUTPUT
>
{
public
abstract
class
WorkerRef
<
INPUT
,
OUTPUT
>
extends
WayToNode
<
INPUT
,
OUTPUT
>
{
WorkerRef
(
NodeProcessor
<
INPUT
,
OUTPUT
>
destinationHandler
)
{
super
(
destinationHandler
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录