Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
山不在高_有仙则灵
SkyWalking
提交
67bdb201
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,发现更多精彩内容 >>
提交
67bdb201
编写于
10月 23, 2017
作者:
wu-sheng
提交者:
GitHub
10月 23, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #538 from OpenSkywalking/feature/537
Feature/537
上级
b4902723
6dab2c99
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
49 addition
and
30 deletion
+49
-30
apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameRegisterSerialWorker.java
...r/worker/servicename/ServiceNameRegisterSerialWorker.java
+1
-1
apm-collector/apm-collector-agentregister/src/main/resources/META-INF/defines/remote_worker_provider.define
.../resources/META-INF/defines/remote_worker_provider.define
+3
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/ReferenceIdExchanger.java
.../worker/segment/standardization/ReferenceIdExchanger.java
+8
-3
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SpanIdExchanger.java
...tream/worker/segment/standardization/SpanIdExchanger.java
+7
-2
apm-collector/apm-collector-agentstream/src/main/resources/META-INF/defines/remote_worker_provider.define
.../resources/META-INF/defines/remote_worker_provider.define
+0
-4
apm-collector/apm-collector-cache/src/main/resources/META-INF/defines/h2_dao.define
...r-cache/src/main/resources/META-INF/defines/h2_dao.define
+3
-3
apm-collector/apm-collector-core/src/main/resources/application-default.yml
...collector-core/src/main/resources/application-default.yml
+27
-17
未找到文件。
apm-collector/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameRegisterSerialWorker.java
浏览文件 @
67bdb201
...
...
@@ -56,7 +56,7 @@ public class ServiceNameRegisterSerialWorker extends AbstractLocalAsyncWorker {
ServiceNameDataDefine
.
ServiceName
serviceName
=
(
ServiceNameDataDefine
.
ServiceName
)
message
;
logger
.
debug
(
"register service name: {}, application id: {}"
,
serviceName
.
getServiceName
(),
serviceName
.
getApplicationId
());
IServiceNameCacheDAO
cacheDao
=
(
IServiceNameCacheDAO
)
DAOContainer
.
INSTANCE
.
get
(
IServiceNameDAO
.
class
.
getName
());
IServiceNameCacheDAO
cacheDao
=
(
IServiceNameCacheDAO
)
DAOContainer
.
INSTANCE
.
get
(
IServiceName
Cache
DAO
.
class
.
getName
());
int
serviceId
=
cacheDao
.
getServiceId
(
serviceName
.
getApplicationId
(),
serviceName
.
getServiceName
());
IServiceNameDAO
dao
=
(
IServiceNameDAO
)
DAOContainer
.
INSTANCE
.
get
(
IServiceNameDAO
.
class
.
getName
());
...
...
apm-collector/apm-collector-agentregister/src/main/resources/META-INF/defines/remote_worker_provider.define
0 → 100644
浏览文件 @
67bdb201
org.skywalking.apm.collector.agentregister.worker.application.ApplicationRegisterRemoteWorker$Factory
org.skywalking.apm.collector.agentregister.worker.instance.InstanceRegisterRemoteWorker$Factory
org.skywalking.apm.collector.agentregister.worker.servicename.ServiceNameRegisterRemoteWorker$Factory
\ No newline at end of file
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/ReferenceIdExchanger.java
浏览文件 @
67bdb201
...
...
@@ -18,9 +18,9 @@
package
org.skywalking.apm.collector.agentstream.worker.segment.standardization
;
import
org.skywalking.apm.collector.agentregister.servicename.ServiceNameService
;
import
org.skywalking.apm.collector.cache.ApplicationCache
;
import
org.skywalking.apm.collector.cache.InstanceCache
;
import
org.skywalking.apm.collector.cache.ServiceIdCache
;
import
org.skywalking.apm.collector.core.util.Const
;
import
org.skywalking.apm.collector.core.util.StringUtils
;
import
org.slf4j.Logger
;
...
...
@@ -34,6 +34,7 @@ public class ReferenceIdExchanger implements IdExchanger<ReferenceDecorator> {
private
final
Logger
logger
=
LoggerFactory
.
getLogger
(
ReferenceIdExchanger
.
class
);
private
static
ReferenceIdExchanger
EXCHANGER
;
private
ServiceNameService
serviceNameService
;
public
static
ReferenceIdExchanger
getInstance
()
{
if
(
EXCHANGER
==
null
)
{
...
...
@@ -42,9 +43,13 @@ public class ReferenceIdExchanger implements IdExchanger<ReferenceDecorator> {
return
EXCHANGER
;
}
public
ReferenceIdExchanger
()
{
serviceNameService
=
new
ServiceNameService
();
}
@Override
public
boolean
exchange
(
ReferenceDecorator
standardBuilder
,
int
applicationId
)
{
if
(
standardBuilder
.
getEntryServiceId
()
==
0
&&
StringUtils
.
isNotEmpty
(
standardBuilder
.
getEntryServiceName
()))
{
int
entryServiceId
=
ServiceIdCache
.
get
(
InstanceCache
.
get
(
standardBuilder
.
getEntryApplicationInstanceId
()),
standardBuilder
.
getEntryServiceName
());
int
entryServiceId
=
serviceNameService
.
getOrCreate
(
InstanceCache
.
get
(
standardBuilder
.
getEntryApplicationInstanceId
()),
standardBuilder
.
getEntryServiceName
());
if
(
entryServiceId
==
0
)
{
return
false
;
}
else
{
...
...
@@ -55,7 +60,7 @@ public class ReferenceIdExchanger implements IdExchanger<ReferenceDecorator> {
}
if
(
standardBuilder
.
getParentServiceId
()
==
0
&&
StringUtils
.
isNotEmpty
(
standardBuilder
.
getParentServiceName
()))
{
int
parentServiceId
=
ServiceIdCache
.
get
(
InstanceCache
.
get
(
standardBuilder
.
getParentApplicationInstanceId
()),
standardBuilder
.
getParentServiceName
());
int
parentServiceId
=
serviceNameService
.
getOrCreate
(
InstanceCache
.
get
(
standardBuilder
.
getParentApplicationInstanceId
()),
standardBuilder
.
getParentServiceName
());
if
(
parentServiceId
==
0
)
{
return
false
;
}
else
{
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SpanIdExchanger.java
浏览文件 @
67bdb201
...
...
@@ -18,8 +18,8 @@
package
org.skywalking.apm.collector.agentstream.worker.segment.standardization
;
import
org.skywalking.apm.collector.agentregister.servicename.ServiceNameService
;
import
org.skywalking.apm.collector.cache.ApplicationCache
;
import
org.skywalking.apm.collector.cache.ServiceIdCache
;
import
org.skywalking.apm.collector.core.util.Const
;
import
org.skywalking.apm.collector.core.util.StringUtils
;
...
...
@@ -29,6 +29,7 @@ import org.skywalking.apm.collector.core.util.StringUtils;
public
class
SpanIdExchanger
implements
IdExchanger
<
SpanDecorator
>
{
private
static
SpanIdExchanger
EXCHANGER
;
private
ServiceNameService
serviceNameService
;
public
static
SpanIdExchanger
getInstance
()
{
if
(
EXCHANGER
==
null
)
{
...
...
@@ -37,6 +38,10 @@ public class SpanIdExchanger implements IdExchanger<SpanDecorator> {
return
EXCHANGER
;
}
public
SpanIdExchanger
()
{
serviceNameService
=
new
ServiceNameService
();
}
@Override
public
boolean
exchange
(
SpanDecorator
standardBuilder
,
int
applicationId
)
{
if
(
standardBuilder
.
getPeerId
()
==
0
&&
StringUtils
.
isNotEmpty
(
standardBuilder
.
getPeer
()))
{
int
peerId
=
ApplicationCache
.
get
(
standardBuilder
.
getPeer
());
...
...
@@ -50,7 +55,7 @@ public class SpanIdExchanger implements IdExchanger<SpanDecorator> {
}
if
(
standardBuilder
.
getOperationNameId
()
==
0
&&
StringUtils
.
isNotEmpty
(
standardBuilder
.
getOperationName
()))
{
int
operationNameId
=
ServiceIdCache
.
get
(
applicationId
,
standardBuilder
.
getOperationName
());
int
operationNameId
=
serviceNameService
.
getOrCreate
(
applicationId
,
standardBuilder
.
getOperationName
());
if
(
operationNameId
==
0
)
{
return
false
;
}
else
{
...
...
apm-collector/apm-collector-agentstream/src/main/resources/META-INF/defines/remote_worker_provider.define
浏览文件 @
67bdb201
org.skywalking.apm.collector.agentregister.worker.application.ApplicationRegisterRemoteWorker$Factory
org.skywalking.apm.collector.agentregister.worker.instance.InstanceRegisterRemoteWorker$Factory
org.skywalking.apm.collector.agentregister.worker.servicename.ServiceNameRegisterRemoteWorker$Factory
org.skywalking.apm.collector.agentstream.worker.node.component.NodeComponentRemoteWorker$Factory
org.skywalking.apm.collector.agentstream.worker.node.mapping.NodeMappingRemoteWorker$Factory
org.skywalking.apm.collector.agentstream.worker.noderef.NodeReferenceRemoteWorker$Factory
...
...
apm-collector/apm-collector-cache/src/main/resources/META-INF/defines/h2_dao.define
浏览文件 @
67bdb201
org.skywalking.apm.collector.cache.dao.ApplicationH2DAO
org.skywalking.apm.collector.cache.dao.InstanceH2DAO
org.skywalking.apm.collector.cache.dao.ServiceNameH2DAO
\ No newline at end of file
org.skywalking.apm.collector.cache.dao.ApplicationH2CacheDAO
org.skywalking.apm.collector.cache.dao.InstanceH2CacheDAO
org.skywalking.apm.collector.cache.dao.ServiceNameH2CacheDAO
\ No newline at end of file
apm-collector/apm-collector-core/src/main/resources/application-default.yml
浏览文件 @
67bdb201
cluster
:
zookeeper
:
hostPort
:
localhost:2181
sessionTimeout
:
100000
# redis:
# host: localhost
# port: 6379
queue
:
disruptor
:
on
data_carrier
:
off
agentstream
:
#cluster:
# zookeeper:
# hostPort: localhost:2181
# sessionTimeout: 100000
agent_server
:
jetty
:
host
:
localhost
port
:
10800
context_path
:
/
agent_stream
:
grpc
:
host
:
localhost
port
:
1
0
00
port
:
1
18
00
jetty
:
host
:
localhost
port
:
20
00
port
:
128
00
context_path
:
/
discovery
:
grpc
:
localhost
port
:
1000
config
:
buffer_offset_max_file_size
:
10M
buffer_segment_max_file_size
:
500M
ui
:
jetty
:
host
:
localhost
port
:
12800
context_path
:
/
collector_inside
:
grpc
:
host
:
localhost
port
:
11800
#storage:
# elasticsearch:
# cluster_name: CollectorDBCluster
# cluster_transport_sniffer: true
# cluster_nodes: localhost:9300
# index_shards_number: 2
# index_replicas_number: 0
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录