Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
山不在高_有仙则灵
SkyWalking
提交
41840ce8
S
SkyWalking
项目概览
山不在高_有仙则灵
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
12
Star
0
Fork
2
代码
文件
提交
分支
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,发现更多精彩内容 >>
提交
41840ce8
编写于
3月 03, 2018
作者:
P
peng-yongsheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed the bug which the memory max non heap metric value is -1 when using JDK 1.8.
上级
6ba54530
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
25 addition
and
10 deletion
+25
-10
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/MemoryMetricEsUIDAO.java
.../apm/collector/storage/es/dao/ui/MemoryMetricEsUIDAO.java
+7
-1
apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/MemoryMetricH2UIDAO.java
.../apm/collector/storage/h2/dao/ui/MemoryMetricH2UIDAO.java
+6
-1
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ServerService.java
...he/skywalking/apm/collector/ui/service/ServerService.java
+12
-8
未找到文件。
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/MemoryMetricEsUIDAO.java
浏览文件 @
41840ce8
...
...
@@ -66,8 +66,14 @@ public class MemoryMetricEsUIDAO extends EsDAO implements IMemoryMetricUIDAO {
long
max
=
((
Number
)
response
.
getResponse
().
getSource
().
get
(
MemoryMetricTable
.
COLUMN_MAX
)).
longValue
();
long
used
=
((
Number
)
response
.
getResponse
().
getSource
().
get
(
MemoryMetricTable
.
COLUMN_USED
)).
longValue
();
long
times
=
((
Number
)
response
.
getResponse
().
getSource
().
get
(
MemoryMetricTable
.
COLUMN_TIMES
)).
longValue
();
trend
.
getMetrics
().
add
((
int
)(
used
/
times
));
trend
.
getMaxMetrics
().
add
((
int
)(
max
/
times
));
if
(
max
<
0
)
{
trend
.
getMaxMetrics
().
add
((
int
)(
used
/
times
));
}
else
{
trend
.
getMaxMetrics
().
add
((
int
)(
max
/
times
));
}
}
else
{
trend
.
getMetrics
().
add
(
0
);
trend
.
getMaxMetrics
().
add
(
0
);
...
...
apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/MemoryMetricH2UIDAO.java
浏览文件 @
41840ce8
...
...
@@ -71,7 +71,12 @@ public class MemoryMetricH2UIDAO extends H2DAO implements IMemoryMetricUIDAO {
long
used
=
rs
.
getLong
(
MemoryMetricTable
.
COLUMN_USED
);
long
times
=
rs
.
getLong
(
MemoryMetricTable
.
COLUMN_TIMES
);
trend
.
getMetrics
().
add
((
int
)(
used
/
times
));
trend
.
getMaxMetrics
().
add
((
int
)(
max
/
times
));
if
(
max
<
0
)
{
trend
.
getMaxMetrics
().
add
((
int
)(
used
/
times
));
}
else
{
trend
.
getMaxMetrics
().
add
((
int
)(
max
/
times
));
}
}
else
{
trend
.
getMetrics
().
add
(
0
);
trend
.
getMaxMetrics
().
add
(
0
);
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ServerService.java
浏览文件 @
41840ce8
...
...
@@ -26,7 +26,6 @@ import java.util.LinkedList;
import
java.util.List
;
import
org.apache.skywalking.apm.collector.cache.CacheModule
;
import
org.apache.skywalking.apm.collector.cache.service.ApplicationCacheService
;
import
org.apache.skywalking.apm.collector.cache.service.InstanceCacheService
;
import
org.apache.skywalking.apm.collector.core.module.ModuleManager
;
import
org.apache.skywalking.apm.collector.core.util.Const
;
import
org.apache.skywalking.apm.collector.core.util.StringUtils
;
...
...
@@ -59,7 +58,6 @@ public class ServerService {
private
final
ICpuMetricUIDAO
cpuMetricUIDAO
;
private
final
IGCMetricUIDAO
gcMetricUIDAO
;
private
final
IMemoryMetricUIDAO
memoryMetricUIDAO
;
private
final
InstanceCacheService
instanceCacheService
;
private
final
ApplicationCacheService
applicationCacheService
;
private
final
SecondBetweenService
secondBetweenService
;
...
...
@@ -69,18 +67,18 @@ public class ServerService {
this
.
cpuMetricUIDAO
=
moduleManager
.
find
(
StorageModule
.
NAME
).
getService
(
ICpuMetricUIDAO
.
class
);
this
.
gcMetricUIDAO
=
moduleManager
.
find
(
StorageModule
.
NAME
).
getService
(
IGCMetricUIDAO
.
class
);
this
.
memoryMetricUIDAO
=
moduleManager
.
find
(
StorageModule
.
NAME
).
getService
(
IMemoryMetricUIDAO
.
class
);
this
.
instanceCacheService
=
moduleManager
.
find
(
CacheModule
.
NAME
).
getService
(
InstanceCacheService
.
class
);
this
.
applicationCacheService
=
moduleManager
.
find
(
CacheModule
.
NAME
).
getService
(
ApplicationCacheService
.
class
);
this
.
secondBetweenService
=
new
SecondBetweenService
(
moduleManager
);
}
public
List
<
AppServerInfo
>
searchServer
(
String
keyword
,
long
startSecondTimeBucket
,
long
endSecondTimeBucket
)
{
List
<
AppServerInfo
>
serverInfos
=
instanceUIDAO
.
searchServer
(
keyword
,
startSecondTimeBucket
,
endSecondTimeBucket
);
serverInfos
.
forEach
(
serverInfo
->
{
if
(
serverInfo
.
getId
()
==
Const
.
NONE_INSTANCE_ID
)
{
serverInfos
.
remove
(
serverInfo
);
for
(
int
i
=
serverInfos
.
size
()
-
1
;
i
>=
0
;
i
--)
{
if
(
serverInfos
.
get
(
i
).
getId
()
==
Const
.
NONE_INSTANCE_ID
)
{
serverInfos
.
remove
(
i
);
}
}
);
}
buildAppServerInfo
(
serverInfos
);
return
serverInfos
;
...
...
@@ -164,6 +162,8 @@ public class ServerService {
private
void
buildAppServerInfo
(
List
<
AppServerInfo
>
serverInfos
)
{
serverInfos
.
forEach
(
serverInfo
->
{
serverInfo
.
setApplicationCode
(
applicationCacheService
.
getApplicationById
(
serverInfo
.
getApplicationId
()).
getApplicationCode
());
StringBuilder
nameBuilder
=
new
StringBuilder
();
nameBuilder
.
append
(
serverInfo
.
getApplicationCode
());
if
(
StringUtils
.
isNotEmpty
(
serverInfo
.
getOsInfo
()))
{
JsonObject
osInfoJson
=
gson
.
fromJson
(
serverInfo
.
getOsInfo
(),
JsonObject
.
class
);
if
(
osInfoJson
.
has
(
"osName"
))
{
...
...
@@ -180,10 +180,14 @@ public class ServerService {
JsonArray
ipv4Array
=
osInfoJson
.
get
(
"ipv4s"
).
getAsJsonArray
();
List
<
String
>
ipv4s
=
new
LinkedList
<>();
ipv4Array
.
forEach
(
ipv4
->
ipv4s
.
add
(
ipv4
.
getAsString
()));
ipv4Array
.
forEach
(
ipv4
->
{
ipv4s
.
add
(
ipv4
.
getAsString
());
nameBuilder
.
append
(
Const
.
ID_SPLIT
).
append
(
ipv4
.
getAsString
());
});
serverInfo
.
setIpv4
(
ipv4s
);
}
}
serverInfo
.
setName
(
nameBuilder
.
toString
());
});
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录