Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
山不在高_有仙则灵
SkyWalking
提交
9b76ecd2
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,发现更多精彩内容 >>
提交
9b76ecd2
编写于
12月 09, 2017
作者:
P
peng-yongsheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Change the version of some modules.
上级
a9ff0b28
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
19 addition
and
28 deletion
+19
-28
apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/graph/TraceStreamGraph.java
...ng/apm/collector/agent/stream/graph/TraceStreamGraph.java
+4
-13
apm-collector/apm-collector-alerting/collector-alerting-define/pom.xml
.../apm-collector-alerting/collector-alerting-define/pom.xml
+1
-1
apm-collector/apm-collector-alerting/collector-alerting-provider/pom.xml
...pm-collector-alerting/collector-alerting-provider/pom.xml
+1
-1
apm-collector/apm-collector-alerting/pom.xml
apm-collector/apm-collector-alerting/pom.xml
+1
-1
apm-collector/apm-collector-configuration/collector-configuration-define/pom.xml
...ctor-configuration/collector-configuration-define/pom.xml
+1
-1
apm-collector/apm-collector-configuration/collector-configuration-provider/pom.xml
...or-configuration/collector-configuration-provider/pom.xml
+1
-1
apm-collector/apm-collector-configuration/pom.xml
apm-collector/apm-collector-configuration/pom.xml
+1
-1
apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/data/DataCache.java
...king/apm/collector/stream/worker/impl/data/DataCache.java
+4
-4
apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/data/DataCollection.java
...apm/collector/stream/worker/impl/data/DataCollection.java
+5
-5
未找到文件。
apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/graph/TraceStreamGraph.java
浏览文件 @
9b76ecd2
...
...
@@ -20,21 +20,14 @@ package org.skywalking.apm.collector.agent.stream.graph;
import
org.skywalking.apm.collector.agent.stream.parser.standardization.SegmentStandardization
;
import
org.skywalking.apm.collector.agent.stream.parser.standardization.SegmentStandardizationWorker
;
import
org.skywalking.apm.collector.agent.stream.service.graph.ServiceGraphNodeIdDefine
;
import
org.skywalking.apm.collector.agent.stream.worker.trace.application.ApplicationComponentAggregationWorker
;
import
org.skywalking.apm.collector.agent.stream.worker.trace.application.ApplicationComponentPersistenceWorker
;
import
org.skywalking.apm.collector.agent.stream.worker.trace.application.ApplicationComponentRemoteWorker
;
import
org.skywalking.apm.collector.agent.stream.worker.trace.application.ApplicationMappingAggregationWorker
;
import
org.skywalking.apm.collector.agent.stream.worker.trace.application.ApplicationMappingPersistenceWorker
;
import
org.skywalking.apm.collector.agent.stream.worker.trace.application.ApplicationMappingRemoteWorker
;
import
org.skywalking.apm.collector.agent.stream.worker.trace.application.ApplicationReferenceMetricAggregationWorker
;
import
org.skywalking.apm.collector.agent.stream.worker.trace.application.ApplicationReferenceMetricPersistenceWorker
;
import
org.skywalking.apm.collector.agent.stream.worker.trace.application.ApplicationReferenceMetricRemoteWorker
;
import
org.skywalking.apm.collector.agent.stream.worker.trace.global.GlobalTracePersistenceWorker
;
import
org.skywalking.apm.collector.agent.stream.worker.trace.instance.InstanceMetricPersistenceWorker
;
import
org.skywalking.apm.collector.agent.stream.worker.trace.instance.InstanceReferenceMetricAggregationWorker
;
import
org.skywalking.apm.collector.agent.stream.worker.trace.instance.InstanceReferenceMetricRemoteWorker
;
import
org.skywalking.apm.collector.agent.stream.worker.trace.instance.InstanceReferencePersistenceWorker
;
import
org.skywalking.apm.collector.agent.stream.worker.trace.segment.SegmentCostPersistenceWorker
;
import
org.skywalking.apm.collector.agent.stream.worker.trace.segment.SegmentPersistenceWorker
;
import
org.skywalking.apm.collector.agent.stream.worker.trace.service.ServiceEntryAggregationWorker
;
...
...
@@ -45,7 +38,6 @@ import org.skywalking.apm.collector.agent.stream.worker.trace.service.ServiceRef
import
org.skywalking.apm.collector.agent.stream.worker.trace.service.ServiceReferenceMetricRemoteWorker
;
import
org.skywalking.apm.collector.core.graph.Graph
;
import
org.skywalking.apm.collector.core.graph.GraphManager
;
import
org.skywalking.apm.collector.core.graph.Node
;
import
org.skywalking.apm.collector.core.module.ModuleManager
;
import
org.skywalking.apm.collector.queue.QueueModule
;
import
org.skywalking.apm.collector.queue.service.QueueCreatorService
;
...
...
@@ -71,7 +63,6 @@ public class TraceStreamGraph {
public
static
final
int
INSTANCE_METRIC_GRAPH_ID
=
301
;
public
static
final
int
APPLICATION_COMPONENT_GRAPH_ID
=
302
;
public
static
final
int
APPLICATION_MAPPING_GRAPH_ID
=
303
;
public
static
final
int
APPLICATION_REFERENCE_METRIC_GRAPH_ID
=
304
;
public
static
final
int
SERVICE_ENTRY_GRAPH_ID
=
305
;
public
static
final
int
SERVICE_REFERENCE_GRAPH_ID
=
306
;
public
static
final
int
SEGMENT_GRAPH_ID
=
307
;
...
...
@@ -162,10 +153,10 @@ public class TraceStreamGraph {
QueueCreatorService
<
InstanceReferenceMetric
>
persistenceQueueCreatorService
=
moduleManager
.
find
(
QueueModule
.
NAME
).
getService
(
QueueCreatorService
.
class
);
RemoteSenderService
remoteSenderService
=
moduleManager
.
find
(
RemoteModule
.
NAME
).
getService
(
RemoteSenderService
.
class
);
Node
<?,
ServiceReferenceMetric
>
serviceReferenceMetricNode
=
graph
.
toFinder
().
findNode
(
ServiceGraphNodeIdDefine
.
SERVICE_REFERENCE_METRIC_AGGREGATION_NODE_ID
,
ServiceReferenceMetric
.
class
);
serviceReferenceMetricNode
.
addNext
(
new
InstanceReferenceMetricAggregationWorker
.
Factory
(
moduleManager
,
aggregationQueueCreatorService
).
create
(
workerCreateListener
))
.
addNext
(
new
InstanceReferenceMetricRemoteWorker
.
Factory
(
moduleManager
,
remoteSenderService
,
SERVICE_REFERENCE_GRAPH_ID
).
create
(
workerCreateListener
))
.
addNext
(
new
InstanceReferencePersistenceWorker
.
Factory
(
moduleManager
,
persistenceQueueCreatorService
).
create
(
workerCreateListener
));
//
Node<?, ServiceReferenceMetric> serviceReferenceMetricNode = graph.toFinder().findNode(ServiceGraphNodeIdDefine.SERVICE_REFERENCE_METRIC_AGGREGATION_NODE_ID, ServiceReferenceMetric.class);
//
serviceReferenceMetricNode.addNext(new InstanceReferenceMetricAggregationWorker.Factory(moduleManager, aggregationQueueCreatorService).create(workerCreateListener))
//
.addNext(new InstanceReferenceMetricRemoteWorker.Factory(moduleManager, remoteSenderService, SERVICE_REFERENCE_GRAPH_ID).create(workerCreateListener))
//
.addNext(new InstanceReferencePersistenceWorker.Factory(moduleManager, persistenceQueueCreatorService).create(workerCreateListener));
createApplicationReferenceMetricGraph
(
graph
);
}
...
...
apm-collector/apm-collector-alerting/collector-alerting-define/pom.xml
浏览文件 @
9b76ecd2
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-alerting
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.3.0-2017
</version>
<version>
5.0-2018-preview
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-alerting/collector-alerting-provider/pom.xml
浏览文件 @
9b76ecd2
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-alerting
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.3.0-2017
</version>
<version>
5.0-2018-preview
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-alerting/pom.xml
浏览文件 @
9b76ecd2
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.3.0-2017
</version>
<version>
5.0-2018-preview
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-configuration/collector-configuration-define/pom.xml
浏览文件 @
9b76ecd2
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-configuration
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.3.0-2017
</version>
<version>
5.0-2018-preview
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-configuration/collector-configuration-provider/pom.xml
浏览文件 @
9b76ecd2
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector-configuration
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.3.0-2017
</version>
<version>
5.0-2018-preview
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-configuration/pom.xml
浏览文件 @
9b76ecd2
...
...
@@ -23,7 +23,7 @@
<parent>
<artifactId>
apm-collector
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.3.0-2017
</version>
<version>
5.0-2018-preview
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/data/DataCache.java
浏览文件 @
9b76ecd2
...
...
@@ -24,11 +24,11 @@ import org.skywalking.apm.collector.core.data.Data;
/**
* @author peng-yongsheng
*/
public
class
DataCache
<
D
ataImpl
extends
Data
>
extends
Window
<
DataCollection
<
DataImpl
>>
{
public
class
DataCache
<
D
ATA_IMPL
extends
Data
>
extends
Window
<
DataCollection
<
DATA_IMPL
>>
{
private
DataCollection
<
D
ataImpl
>
lockedDataCollection
;
private
DataCollection
<
D
ATA_IMPL
>
lockedDataCollection
;
@Override
public
DataCollection
<
D
ataImpl
>
collectionInstance
()
{
@Override
public
DataCollection
<
D
ATA_IMPL
>
collectionInstance
()
{
return
new
DataCollection
<>();
}
...
...
@@ -40,7 +40,7 @@ public class DataCache<DataImpl extends Data> extends Window<DataCollection<Data
return
lockedDataCollection
.
get
(
id
);
}
public
void
put
(
String
id
,
D
ataImpl
data
)
{
public
void
put
(
String
id
,
D
ATA_IMPL
data
)
{
lockedDataCollection
.
put
(
id
,
data
);
}
...
...
apm-collector/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/data/DataCollection.java
浏览文件 @
9b76ecd2
...
...
@@ -26,8 +26,8 @@ import org.skywalking.apm.collector.core.data.Data;
/**
* @author peng-yongsheng
*/
public
class
DataCollection
<
D
ataImpl
extends
Data
>
implements
Collection
<
Map
<
String
,
DataImpl
>>
{
private
Map
<
String
,
D
ataImpl
>
data
;
public
class
DataCollection
<
D
ATA_IMPL
extends
Data
>
implements
Collection
<
Map
<
String
,
DATA_IMPL
>>
{
private
Map
<
String
,
D
ATA_IMPL
>
data
;
private
volatile
boolean
writing
;
private
volatile
boolean
reading
;
...
...
@@ -65,11 +65,11 @@ public class DataCollection<DataImpl extends Data> implements Collection<Map<Str
return
data
.
containsKey
(
key
);
}
void
put
(
String
key
,
D
ataImpl
value
)
{
void
put
(
String
key
,
D
ATA_IMPL
value
)
{
data
.
put
(
key
,
value
);
}
public
D
ataImpl
get
(
String
key
)
{
public
D
ATA_IMPL
get
(
String
key
)
{
return
data
.
get
(
key
);
}
...
...
@@ -81,7 +81,7 @@ public class DataCollection<DataImpl extends Data> implements Collection<Map<Str
data
.
clear
();
}
public
Map
<
String
,
D
ataImpl
>
collection
()
{
public
Map
<
String
,
D
ATA_IMPL
>
collection
()
{
return
data
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录