Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gdyjdao
SkyWalking
提交
58a787f9
S
SkyWalking
项目概览
gdyjdao
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
1
Star
0
Fork
0
代码
文件
提交
分支
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,发现更多精彩内容 >>
未验证
提交
58a787f9
编写于
2月 27, 2020
作者:
wu-sheng
提交者:
GitHub
2月 27, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Support ref endpoint name register (#4422)
上级
b28c7d72
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
10 addition
and
20 deletion
+10
-20
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/EndpointInventoryRegister.java
...rver/core/register/service/EndpointInventoryRegister.java
+2
-2
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/IEndpointInventoryRegister.java
...ver/core/register/service/IEndpointInventoryRegister.java
+1
-1
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
+7
-17
未找到文件。
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/EndpointInventoryRegister.java
浏览文件 @
58a787f9
...
...
@@ -69,8 +69,8 @@ public class EndpointInventoryRegister implements IEndpointInventoryRegister {
}
@Override
public
int
get
(
int
serviceId
,
String
endpointName
,
int
detectPoint
)
{
return
getCacheService
().
getEndpointId
(
serviceId
,
endpointName
,
detectPoint
);
public
int
get
(
int
serviceId
,
String
endpointName
,
DetectPo
int
detectPoint
)
{
return
getCacheService
().
getEndpointId
(
serviceId
,
endpointName
,
detectPoint
.
ordinal
()
);
}
@Override
...
...
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/IEndpointInventoryRegister.java
浏览文件 @
58a787f9
...
...
@@ -25,7 +25,7 @@ public interface IEndpointInventoryRegister extends Service {
int
getOrCreate
(
int
serviceId
,
String
endpointName
,
DetectPoint
detectPoint
);
int
get
(
int
serviceId
,
String
endpointName
,
int
detectPoint
);
int
get
(
int
serviceId
,
String
endpointName
,
DetectPo
int
detectPoint
);
void
heartbeat
(
int
endpointId
,
long
heartBeatTime
);
}
oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/ReferenceIdExchanger.java
浏览文件 @
58a787f9
...
...
@@ -139,29 +139,19 @@ public class ReferenceIdExchanger implements IdExchanger<ReferenceDecorator> {
standardBuilder
.
setNetworkAddressId
(
networkAddressId
);
standardBuilder
.
setNetworkAddress
(
Const
.
EMPTY_STRING
);
}
}
else
{
/**
* Since 6.6.0, endpoint id could be -1, as it is not an endpoint. Such as local span and exist span.
*/
}
return
exchanged
;
}
/**
* 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.
* <p>
* If agent does the exchange, then always use endpoint id.
* @since 6.6.0 The endpoint in the ref should be server endpoint only. The agent will/should use `-1`, when it can't
* find the endpoint of entry span in the current tracing context when build the ref.
* @since 5.0 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. * <p> * If
* agent does the exchange, then always use endpoint id.
*/
private
int
getEndpointId
(
int
serviceId
,
String
endpointName
)
{
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
;
return
endpointInventoryRegister
.
getOrCreate
(
serviceId
,
endpointName
,
DetectPoint
.
SERVER
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录