Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
4e99e896
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 搜索 >>
未验证
提交
4e99e896
编写于
10月 17, 2018
作者:
彭
彭勇升 pengys
提交者:
GitHub
10月 17, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Set instance attributes into return value. (#1783)
* Set instance attributes into return value. * Delete unused code.
上级
cb0b817f
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
20 addition
and
4 deletion
+20
-4
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Attribute.java
...he/skywalking/oap/server/core/query/entity/Attribute.java
+8
-0
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInstanceInventory.java
...ng/oap/server/core/register/ServiceInstanceInventory.java
+4
-4
oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java
...torage/plugin/elasticsearch/query/MetadataQueryEsDAO.java
+8
-0
未找到文件。
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Attribute.java
浏览文件 @
4e99e896
...
...
@@ -28,4 +28,12 @@ import lombok.*;
public
class
Attribute
{
private
String
name
;
private
String
value
;
public
Attribute
(
String
name
,
String
value
)
{
this
.
name
=
name
;
this
.
value
=
value
;
}
public
Attribute
()
{
}
}
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInstanceInventory.java
浏览文件 @
4e99e896
...
...
@@ -45,10 +45,10 @@ public class ServiceInstanceInventory extends RegisterSource {
public
static
final
String
SERVICE_ID
=
"service_id"
;
private
static
final
String
IS_ADDRESS
=
"is_address"
;
private
static
final
String
ADDRESS_ID
=
"address_id"
;
p
rivate
static
final
String
OS_NAME
=
"os_name"
;
p
rivate
static
final
String
HOST_NAME
=
"host_name"
;
p
rivate
static
final
String
PROCESS_NO
=
"process_no"
;
p
rivate
static
final
String
IPV4S
=
"ipv4s"
;
p
ublic
static
final
String
OS_NAME
=
"os_name"
;
p
ublic
static
final
String
HOST_NAME
=
"host_name"
;
p
ublic
static
final
String
PROCESS_NO
=
"process_no"
;
p
ublic
static
final
String
IPV4S
=
"ipv4s"
;
public
static
final
String
LANGUAGE
=
"language"
;
@Setter
@Getter
@Column
(
columnName
=
NAME
,
matchQuery
=
true
)
private
String
name
=
Const
.
EMPTY_STRING
;
...
...
oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java
浏览文件 @
4e99e896
...
...
@@ -188,6 +188,14 @@ public class MetadataQueryEsDAO extends EsDAO implements IMetadataQueryDAO {
serviceInstance
.
setName
((
String
)
sourceAsMap
.
get
(
ServiceInstanceInventory
.
NAME
));
int
languageId
=
((
Number
)
sourceAsMap
.
get
(
ServiceInstanceInventory
.
LANGUAGE
)).
intValue
();
serviceInstance
.
setLanguage
(
LanguageTrans
.
INSTANCE
.
value
(
languageId
));
serviceInstance
.
getAttributes
().
add
(
new
Attribute
(
ServiceInstanceInventory
.
OS_NAME
,
(
String
)
sourceAsMap
.
get
(
ServiceInstanceInventory
.
OS_NAME
)));
serviceInstance
.
getAttributes
().
add
(
new
Attribute
(
ServiceInstanceInventory
.
HOST_NAME
,
(
String
)
sourceAsMap
.
get
(
ServiceInstanceInventory
.
HOST_NAME
)));
serviceInstance
.
getAttributes
().
add
(
new
Attribute
(
ServiceInstanceInventory
.
PROCESS_NO
,
String
.
valueOf
(((
Number
)
sourceAsMap
.
get
(
ServiceInstanceInventory
.
PROCESS_NO
)).
intValue
())));
List
<
String
>
ipv4s
=
ServiceInstanceInventory
.
AgentOsInfo
.
ipv4sDeserialize
((
String
)
sourceAsMap
.
get
(
ServiceInstanceInventory
.
IPV4S
));
for
(
String
ipv4
:
ipv4s
)
{
serviceInstance
.
getAttributes
().
add
(
new
Attribute
(
ServiceInstanceInventory
.
IPV4S
,
ipv4
));
}
serviceInstances
.
add
(
serviceInstance
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录