Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
a3e03f61
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,体验更适合开发者的 AI 搜索 >>
提交
a3e03f61
编写于
1月 15, 2019
作者:
xiaoyuelangyan
提交者:
wu-sheng
1月 15, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Un-exchanged endpoint name in ref can't find the id (#2162)
* Update ReferenceIdExchanger.java Change comments of codes.
上级
4f3e2337
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
28 addition
and
4 deletion
+28
-4
oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/ReferenceIdExchanger.java
...provider/parser/standardization/ReferenceIdExchanger.java
+28
-4
未找到文件。
oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/ReferenceIdExchanger.java
浏览文件 @
a3e03f61
...
@@ -55,8 +55,7 @@ public class ReferenceIdExchanger implements IdExchanger<ReferenceDecorator> {
...
@@ -55,8 +55,7 @@ public class ReferenceIdExchanger implements IdExchanger<ReferenceDecorator> {
@Override
public
boolean
exchange
(
ReferenceDecorator
standardBuilder
,
int
serviceId
)
{
@Override
public
boolean
exchange
(
ReferenceDecorator
standardBuilder
,
int
serviceId
)
{
if
(
standardBuilder
.
getEntryEndpointId
()
==
0
)
{
if
(
standardBuilder
.
getEntryEndpointId
()
==
0
)
{
String
entryEndpointName
=
Strings
.
isNullOrEmpty
(
standardBuilder
.
getEntryEndpointName
())
?
Const
.
DOMAIN_OPERATION_NAME
:
standardBuilder
.
getEntryEndpointName
();
String
entryEndpointName
=
Strings
.
isNullOrEmpty
(
standardBuilder
.
getEntryEndpointName
())
?
Const
.
DOMAIN_OPERATION_NAME
:
standardBuilder
.
getEntryEndpointName
();
int
entryEndpointId
=
endpointInventoryRegister
.
get
(
serviceInstanceInventoryCache
.
get
(
standardBuilder
.
getEntryServiceInstanceId
()).
getServiceId
(),
entryEndpointName
,
DetectPoint
.
SERVER
.
ordinal
());
int
entryEndpointId
=
getEndpointId
(
standardBuilder
,
entryEndpointName
);
if
(
entryEndpointId
==
0
)
{
if
(
entryEndpointId
==
0
)
{
if
(
logger
.
isDebugEnabled
())
{
if
(
logger
.
isDebugEnabled
())
{
int
entryServiceId
=
serviceInstanceInventoryCache
.
get
(
standardBuilder
.
getEntryServiceInstanceId
()).
getServiceId
();
int
entryServiceId
=
serviceInstanceInventoryCache
.
get
(
standardBuilder
.
getEntryServiceInstanceId
()).
getServiceId
();
...
@@ -72,8 +71,8 @@ public class ReferenceIdExchanger implements IdExchanger<ReferenceDecorator> {
...
@@ -72,8 +71,8 @@ public class ReferenceIdExchanger implements IdExchanger<ReferenceDecorator> {
if
(
standardBuilder
.
getParentEndpointId
()
==
0
)
{
if
(
standardBuilder
.
getParentEndpointId
()
==
0
)
{
String
parentEndpointName
=
Strings
.
isNullOrEmpty
(
standardBuilder
.
getParentEndpointName
())
?
Const
.
DOMAIN_OPERATION_NAME
:
standardBuilder
.
getParentEndpointName
();
String
parentEndpointName
=
Strings
.
isNullOrEmpty
(
standardBuilder
.
getParentEndpointName
())
?
Const
.
DOMAIN_OPERATION_NAME
:
standardBuilder
.
getParentEndpointName
();
int
parentEndpointId
=
endpointInventoryRegister
.
get
(
serviceInstanceInventoryCache
.
get
(
standardBuilder
.
getParentServiceInstanceId
()).
getServiceId
(),
parentEndpointName
,
DetectPoint
.
SERVER
.
ordinal
()
);
int
parentEndpointId
=
getEndpointId
(
standardBuilder
,
parentEndpointName
);
if
(
parentEndpointId
==
0
)
{
if
(
parentEndpointId
==
0
)
{
if
(
logger
.
isDebugEnabled
())
{
if
(
logger
.
isDebugEnabled
())
{
int
parentServiceId
=
serviceInstanceInventoryCache
.
get
(
standardBuilder
.
getParentServiceInstanceId
()).
getServiceId
();
int
parentServiceId
=
serviceInstanceInventoryCache
.
get
(
standardBuilder
.
getParentServiceInstanceId
()).
getServiceId
();
...
@@ -103,4 +102,29 @@ public class ReferenceIdExchanger implements IdExchanger<ReferenceDecorator> {
...
@@ -103,4 +102,29 @@ public class ReferenceIdExchanger implements IdExchanger<ReferenceDecorator> {
}
}
return
true
;
return
true
;
}
}
/**
* Endpoint in ref could be local or exit span's operation name.
* Especially if it is local span operation name,
* exchange may not happen at agent, such as Java agent,
* then put literal endpoint string in the header,
* Need to try to get the id by assuming the endpoint name is detected at server, local or client.
*
* If agent does the exchange, then always use endpoint id.
*
* @param standardBuilder
* @param endpointName
* @return
*/
private
int
getEndpointId
(
ReferenceDecorator
standardBuilder
,
String
endpointName
)
{
int
serviceId
=
serviceInstanceInventoryCache
.
get
(
standardBuilder
.
getEntryServiceInstanceId
()).
getServiceId
();
int
endpointId
=
endpointInventoryRegister
.
get
(
serviceId
,
endpointName
,
DetectPoint
.
SERVER
.
ordinal
());
if
(
endpointId
==
Const
.
NONE
)
{
endpointId
=
endpointInventoryRegister
.
get
(
serviceId
,
endpointName
,
DetectPoint
.
CLIENT
.
ordinal
());
if
(
endpointId
==
Const
.
NONE
)
{
endpointId
=
endpointInventoryRegister
.
get
(
serviceId
,
endpointName
,
DetectPoint
.
UNRECOGNIZED
.
ordinal
());
}
}
return
endpointId
;
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录