Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
javalover123888
SkyWalking
提交
dbf0444e
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,发现更多精彩内容 >>
未验证
提交
dbf0444e
编写于
10月 30, 2018
作者:
wu-sheng
提交者:
GitHub
10月 30, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix NPE in protobuf and illegal query parameter. (#1847)
上级
041ed433
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
27 addition
and
11 deletion
+27
-11
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetricQueryService.java
.../skywalking/oap/server/core/query/MetricQueryService.java
+5
-0
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/EndpointInventory.java
...kywalking/oap/server/core/register/EndpointInventory.java
+8
-4
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/NetworkAddressInventory.java
...ing/oap/server/core/register/NetworkAddressInventory.java
+2
-1
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInstanceInventory.java
...ng/oap/server/core/register/ServiceInstanceInventory.java
+6
-5
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java
...skywalking/oap/server/core/register/ServiceInventory.java
+2
-1
oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/StringUtils.java
...pache/skywalking/oap/server/library/util/StringUtils.java
+4
-0
未找到文件。
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetricQueryService.java
浏览文件 @
dbf0444e
...
...
@@ -31,6 +31,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.ValueColumnIds;
import
org.apache.skywalking.oap.server.core.storage.query.IMetricQueryDAO
;
import
org.apache.skywalking.oap.server.library.module.*
;
import
org.apache.skywalking.oap.server.library.module.Service
;
import
org.apache.skywalking.oap.server.library.util.CollectionUtils
;
import
org.slf4j.*
;
/**
...
...
@@ -56,6 +57,10 @@ public class MetricQueryService implements Service {
public
IntValues
getValues
(
final
String
indName
,
final
List
<
String
>
ids
,
final
Step
step
,
final
long
startTB
,
final
long
endTB
)
throws
IOException
{
if
(
CollectionUtils
.
isEmpty
(
ids
))
{
throw
new
RuntimeException
(
"IDs can't be null"
);
}
Where
where
=
new
Where
();
KeyValues
intKeyValues
=
new
KeyValues
();
intKeyValues
.
setKey
(
Indicator
.
ENTITY_ID
);
...
...
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/EndpointInventory.java
浏览文件 @
dbf0444e
...
...
@@ -18,15 +18,19 @@
package
org.apache.skywalking.oap.server.core.register
;
import
java.util.*
;
import
lombok.*
;
import
java.util.HashMap
;
import
java.util.Map
;
import
lombok.Getter
;
import
lombok.Setter
;
import
org.apache.skywalking.oap.server.core.Const
;
import
org.apache.skywalking.oap.server.core.register.annotation.InventoryType
;
import
org.apache.skywalking.oap.server.core.remote.annotation.StreamData
;
import
org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData
;
import
org.apache.skywalking.oap.server.core.source.Scope
;
import
org.apache.skywalking.oap.server.core.storage.StorageBuilder
;
import
org.apache.skywalking.oap.server.core.storage.annotation.*
;
import
org.apache.skywalking.oap.server.core.storage.annotation.Column
;
import
org.apache.skywalking.oap.server.core.storage.annotation.StorageEntity
;
import
org.apache.skywalking.oap.server.library.util.StringUtils
;
/**
* @author peng-yongsheng
...
...
@@ -87,7 +91,7 @@ public class EndpointInventory extends RegisterSource {
remoteBuilder
.
addDataLongs
(
getRegisterTime
());
remoteBuilder
.
addDataLongs
(
getHeartbeatTime
());
remoteBuilder
.
addDataStrings
(
name
);
remoteBuilder
.
addDataStrings
(
StringUtils
.
getOrDefault
(
name
,
Const
.
EMPTY_STRING
)
);
return
remoteBuilder
;
}
...
...
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/NetworkAddressInventory.java
浏览文件 @
dbf0444e
...
...
@@ -27,6 +27,7 @@ import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData;
import
org.apache.skywalking.oap.server.core.source.Scope
;
import
org.apache.skywalking.oap.server.core.storage.StorageBuilder
;
import
org.apache.skywalking.oap.server.core.storage.annotation.*
;
import
org.apache.skywalking.oap.server.library.util.StringUtils
;
/**
* @author peng-yongsheng
...
...
@@ -87,7 +88,7 @@ public class NetworkAddressInventory extends RegisterSource {
remoteBuilder
.
addDataLongs
(
getRegisterTime
());
remoteBuilder
.
addDataLongs
(
getHeartbeatTime
());
remoteBuilder
.
addDataStrings
(
name
);
remoteBuilder
.
addDataStrings
(
StringUtils
.
getOrDefault
(
name
,
Const
.
EMPTY_STRING
)
);
return
remoteBuilder
;
}
...
...
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInstanceInventory.java
浏览文件 @
dbf0444e
...
...
@@ -30,6 +30,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
import
org.apache.skywalking.oap.server.core.storage.StorageBuilder
;
import
org.apache.skywalking.oap.server.core.storage.annotation.*
;
import
org.apache.skywalking.oap.server.library.util.BooleanUtils
;
import
org.apache.skywalking.oap.server.library.util.StringUtils
;
/**
* @author peng-yongsheng
...
...
@@ -122,11 +123,11 @@ public class ServiceInstanceInventory extends RegisterSource {
remoteBuilder
.
addDataLongs
(
getRegisterTime
());
remoteBuilder
.
addDataLongs
(
getHeartbeatTime
());
remoteBuilder
.
addDataStrings
(
name
);
remoteBuilder
.
addDataStrings
(
osName
);
remoteBuilder
.
addDataStrings
(
hostName
);
remoteBuilder
.
addDataStrings
(
ipv4s
);
remoteBuilder
.
addDataStrings
(
instanceUUID
);
remoteBuilder
.
addDataStrings
(
StringUtils
.
getOrDefault
(
name
,
Const
.
EMPTY_STRING
)
);
remoteBuilder
.
addDataStrings
(
StringUtils
.
getOrDefault
(
osName
,
Const
.
EMPTY_STRING
)
);
remoteBuilder
.
addDataStrings
(
StringUtils
.
getOrDefault
(
hostName
,
Const
.
EMPTY_STRING
)
);
remoteBuilder
.
addDataStrings
(
StringUtils
.
getOrDefault
(
ipv4s
,
Const
.
EMPTY_STRING
)
);
remoteBuilder
.
addDataStrings
(
StringUtils
.
getOrDefault
(
instanceUUID
,
Const
.
EMPTY_STRING
)
);
return
remoteBuilder
;
}
...
...
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java
浏览文件 @
dbf0444e
...
...
@@ -28,6 +28,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
import
org.apache.skywalking.oap.server.core.storage.StorageBuilder
;
import
org.apache.skywalking.oap.server.core.storage.annotation.*
;
import
org.apache.skywalking.oap.server.library.util.BooleanUtils
;
import
org.apache.skywalking.oap.server.library.util.StringUtils
;
/**
* @author peng-yongsheng
...
...
@@ -105,7 +106,7 @@ public class ServiceInventory extends RegisterSource {
remoteBuilder
.
addDataLongs
(
getHeartbeatTime
());
remoteBuilder
.
addDataLongs
(
getMappingLastUpdateTime
());
remoteBuilder
.
addDataStrings
(
name
);
remoteBuilder
.
addDataStrings
(
StringUtils
.
getOrDefault
(
name
,
Const
.
EMPTY_STRING
)
);
return
remoteBuilder
;
}
...
...
oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/StringUtils.java
浏览文件 @
dbf0444e
...
...
@@ -32,4 +32,8 @@ public class StringUtils {
public
static
boolean
isNotEmpty
(
Object
str
)
{
return
!
isEmpty
(
str
);
}
public
static
String
getOrDefault
(
String
value
,
String
defaultValue
)
{
return
value
==
null
?
defaultValue
:
value
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录