Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
javalover123888
SkyWalking
提交
ae8e87ad
S
SkyWalking
项目概览
javalover123888
/
SkyWalking
与 Fork 源项目一致
Fork自
山不在高_有仙则灵 / SkyWalking
通知
2
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,发现更多精彩内容 >>
提交
ae8e87ad
编写于
8月 18, 2018
作者:
P
peng-yongsheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename srcSpanType to detectPoint.
上级
4c04a599
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
9 addition
and
9 deletion
+9
-9
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/EndpointInventory.java
...kywalking/oap/server/core/register/EndpointInventory.java
+6
-6
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-core/src/main/java/org/apache/skywalking/oap/server/core/register/EndpointInventory.java
浏览文件 @
ae8e87ad
...
...
@@ -40,11 +40,11 @@ public class EndpointInventory extends RegisterSource {
private
static
final
String
SERVICE_ID
=
"service_id"
;
private
static
final
String
NAME
=
"name"
;
private
static
final
String
SRC_SPAN_TYPE
=
"src_span_type
"
;
private
static
final
String
DETECT_POINT
=
"detect_point
"
;
@Setter
@Getter
@Column
(
columnName
=
SERVICE_ID
)
private
int
serviceId
;
@Setter
@Getter
@Column
(
columnName
=
NAME
,
matchQuery
=
true
)
private
String
name
=
Const
.
EMPTY_STRING
;
@Setter
@Getter
@Column
(
columnName
=
SRC_SPAN_TYPE
)
private
int
srcSpanType
;
@Setter
@Getter
@Column
(
columnName
=
DETECT_POINT
)
private
int
detectPoint
;
public
static
String
buildId
(
int
serviceId
,
String
endpointName
)
{
return
serviceId
+
Const
.
ID_SPLIT
+
endpointName
;
...
...
@@ -82,7 +82,7 @@ public class EndpointInventory extends RegisterSource {
RemoteData
.
Builder
remoteBuilder
=
RemoteData
.
newBuilder
();
remoteBuilder
.
setDataIntegers
(
0
,
getSequence
());
remoteBuilder
.
setDataIntegers
(
1
,
serviceId
);
remoteBuilder
.
setDataIntegers
(
2
,
srcSpanType
);
remoteBuilder
.
setDataIntegers
(
2
,
detectPoint
);
remoteBuilder
.
setDataLongs
(
0
,
getRegisterTime
());
remoteBuilder
.
setDataLongs
(
1
,
getHeartbeatTime
());
...
...
@@ -94,7 +94,7 @@ public class EndpointInventory extends RegisterSource {
@Override
public
void
deserialize
(
RemoteData
remoteData
)
{
setSequence
(
remoteData
.
getDataIntegers
(
0
));
setServiceId
(
remoteData
.
getDataIntegers
(
1
));
set
SrcSpanType
(
remoteData
.
getDataIntegers
(
2
));
set
DetectPoint
(
remoteData
.
getDataIntegers
(
2
));
setRegisterTime
(
remoteData
.
getDataLongs
(
0
));
setHeartbeatTime
(
remoteData
.
getDataLongs
(
1
));
...
...
@@ -109,7 +109,7 @@ public class EndpointInventory extends RegisterSource {
inventory
.
setSequence
((
Integer
)
dbMap
.
get
(
SEQUENCE
));
inventory
.
setServiceId
((
Integer
)
dbMap
.
get
(
SERVICE_ID
));
inventory
.
setName
((
String
)
dbMap
.
get
(
NAME
));
inventory
.
set
SrcSpanType
((
Integer
)
dbMap
.
get
(
SRC_SPAN_TYPE
));
inventory
.
set
DetectPoint
((
Integer
)
dbMap
.
get
(
DETECT_POINT
));
inventory
.
setRegisterTime
((
Long
)
dbMap
.
get
(
REGISTER_TIME
));
inventory
.
setHeartbeatTime
((
Long
)
dbMap
.
get
(
HEARTBEAT_TIME
));
return
inventory
;
...
...
@@ -120,7 +120,7 @@ public class EndpointInventory extends RegisterSource {
map
.
put
(
SEQUENCE
,
storageData
.
getSequence
());
map
.
put
(
SERVICE_ID
,
storageData
.
getServiceId
());
map
.
put
(
NAME
,
storageData
.
getName
());
map
.
put
(
SRC_SPAN_TYPE
,
storageData
.
getSrcSpanType
());
map
.
put
(
DETECT_POINT
,
storageData
.
getDetectPoint
());
map
.
put
(
REGISTER_TIME
,
storageData
.
getRegisterTime
());
map
.
put
(
HEARTBEAT_TIME
,
storageData
.
getHeartbeatTime
());
return
map
;
...
...
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/EndpointInventoryRegister.java
浏览文件 @
ae8e87ad
...
...
@@ -48,14 +48,14 @@ public class EndpointInventoryRegister implements IEndpointInventoryRegister {
return
cacheService
;
}
@Override
public
int
getOrCreate
(
int
serviceId
,
String
endpointName
,
int
srcSpanType
)
{
@Override
public
int
getOrCreate
(
int
serviceId
,
String
endpointName
,
int
detectPoint
)
{
int
endpointId
=
getCacheService
().
getEndpointId
(
serviceId
,
endpointName
);
if
(
endpointId
==
Const
.
NONE
)
{
EndpointInventory
endpointInventory
=
new
EndpointInventory
();
endpointInventory
.
setServiceId
(
serviceId
);
endpointInventory
.
setName
(
endpointName
);
endpointInventory
.
set
SrcSpanType
(
srcSpanType
);
endpointInventory
.
set
DetectPoint
(
detectPoint
);
long
now
=
System
.
currentTimeMillis
();
endpointInventory
.
setRegisterTime
(
now
);
...
...
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/IEndpointInventoryRegister.java
浏览文件 @
ae8e87ad
...
...
@@ -25,7 +25,7 @@ import org.apache.skywalking.oap.server.library.module.Service;
*/
public
interface
IEndpointInventoryRegister
extends
Service
{
int
getOrCreate
(
int
serviceId
,
String
endpointName
,
int
srcSpanType
);
int
getOrCreate
(
int
serviceId
,
String
endpointName
,
int
detectPoint
);
int
get
(
int
serviceId
,
String
endpointName
);
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录