Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
javalover123888
SkyWalking
提交
62d51482
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,发现更多精彩内容 >>
提交
62d51482
编写于
2月 28, 2018
作者:
P
peng-yongsheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1. Changed the attribute name from TPS to callsPerSec.
2. Calculate the callsPerSec.
上级
40861229
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
33 addition
and
33 deletion
+33
-33
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ui/IApplicationMetricUIDAO.java
...apm/collector/storage/dao/ui/IApplicationMetricUIDAO.java
+2
-2
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/overview/ApplicationTPS.java
...ing/apm/collector/storage/ui/overview/ApplicationTPS.java
+5
-5
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ApplicationMetricEsUIDAO.java
...collector/storage/es/dao/ui/ApplicationMetricEsUIDAO.java
+4
-5
apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/ApplicationMetricH2UIDAO.java
...collector/storage/h2/dao/ui/ApplicationMetricH2UIDAO.java
+2
-2
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/OverViewLayerQuery.java
...skywalking/apm/collector/ui/query/OverViewLayerQuery.java
+3
-3
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ApplicationService.java
...ywalking/apm/collector/ui/service/ApplicationService.java
+4
-3
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/utils/DurationUtils.java
...ache/skywalking/apm/collector/ui/utils/DurationUtils.java
+12
-12
apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/overview-layer.graphqls
...col/src/main/resources/ui-graphql/overview-layer.graphqls
+1
-1
未找到文件。
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ui/IApplicationMetricUIDAO.java
浏览文件 @
62d51482
...
...
@@ -28,8 +28,8 @@ import org.apache.skywalking.apm.collector.storage.ui.overview.ApplicationTPS;
* @author peng-yongsheng
*/
public
interface
IApplicationMetricUIDAO
extends
DAO
{
List
<
ApplicationTPS
>
getTopNApplicationThroughput
(
Step
step
,
long
start
,
long
end
,
long
betweenSecond
,
int
topN
,
MetricSource
metricSource
);
List
<
ApplicationTPS
>
getTopNApplicationThroughput
(
Step
step
,
long
start
TimeBucket
,
long
endTimeBucket
,
int
betweenSecond
,
int
topN
,
MetricSource
metricSource
);
List
<
ApplicationMetric
>
getApplications
(
Step
step
,
long
startTimeBucket
,
long
endTimeBucket
,
MetricSource
metricSource
);
...
...
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/overview/ApplicationTPS.java
浏览文件 @
62d51482
...
...
@@ -24,7 +24,7 @@ package org.apache.skywalking.apm.collector.storage.ui.overview;
public
class
ApplicationTPS
{
private
int
applicationId
;
private
String
applicationCode
;
private
int
tps
;
private
int
callsPerSec
;
public
int
getApplicationId
()
{
return
applicationId
;
...
...
@@ -42,11 +42,11 @@ public class ApplicationTPS {
this
.
applicationCode
=
applicationCode
;
}
public
int
get
Tps
()
{
return
tps
;
public
int
get
CallsPerSec
()
{
return
callsPerSec
;
}
public
void
set
Tps
(
int
tps
)
{
this
.
tps
=
tps
;
public
void
set
CallsPerSec
(
int
callsPerSec
)
{
this
.
callsPerSec
=
callsPerSec
;
}
}
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ApplicationMetricEsUIDAO.java
浏览文件 @
62d51482
...
...
@@ -55,9 +55,8 @@ public class ApplicationMetricEsUIDAO extends EsDAO implements IApplicationMetri
private
static
final
String
AVG_TPS
=
"avg_tps"
;
@Override
public
List
<
ApplicationTPS
>
getTopNApplicationThroughput
(
Step
step
,
long
start
,
long
end
,
long
betweenSecond
,
int
topN
,
MetricSource
metricSource
)
{
public
List
<
ApplicationTPS
>
getTopNApplicationThroughput
(
Step
step
,
long
startTimeBucket
,
long
endTimeBucket
,
int
betweenSecond
,
int
topN
,
MetricSource
metricSource
)
{
String
tableName
=
TimePyramidTableNameBuilder
.
build
(
step
,
ApplicationMetricTable
.
TABLE
);
SearchRequestBuilder
searchRequestBuilder
=
getClient
().
prepareSearch
(
tableName
);
...
...
@@ -65,7 +64,7 @@ public class ApplicationMetricEsUIDAO extends EsDAO implements IApplicationMetri
searchRequestBuilder
.
setSearchType
(
SearchType
.
DFS_QUERY_THEN_FETCH
);
BoolQueryBuilder
boolQuery
=
QueryBuilders
.
boolQuery
();
boolQuery
.
must
().
add
(
QueryBuilders
.
rangeQuery
(
ApplicationMetricTable
.
COLUMN_TIME_BUCKET
).
gte
(
start
).
lte
(
end
));
boolQuery
.
must
().
add
(
QueryBuilders
.
rangeQuery
(
ApplicationMetricTable
.
COLUMN_TIME_BUCKET
).
gte
(
start
TimeBucket
).
lte
(
endTimeBucket
));
boolQuery
.
must
().
add
(
QueryBuilders
.
termQuery
(
ApplicationMetricTable
.
COLUMN_SOURCE_VALUE
,
metricSource
.
getValue
()));
searchRequestBuilder
.
setQuery
(
boolQuery
);
...
...
@@ -97,7 +96,7 @@ public class ApplicationMetricEsUIDAO extends EsDAO implements IApplicationMetri
InternalSimpleValue
simpleValue
=
applicationIdTerm
.
getAggregations
().
get
(
AVG_TPS
);
applicationTPS
.
setApplicationId
(
applicationId
);
applicationTPS
.
set
Tps
((
int
)
simpleValue
.
getValue
());
applicationTPS
.
set
CallsPerSec
((
int
)
simpleValue
.
getValue
());
applicationTPSs
.
add
(
applicationTPS
);
});
return
applicationTPSs
;
...
...
apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/ApplicationMetricH2UIDAO.java
浏览文件 @
62d51482
...
...
@@ -40,8 +40,8 @@ public class ApplicationMetricH2UIDAO extends H2DAO implements IApplicationMetri
}
@Override
public
List
<
ApplicationTPS
>
getTopNApplicationThroughput
(
Step
step
,
long
start
,
long
end
,
long
betweenSecond
,
int
topN
,
MetricSource
metricSource
)
{
public
List
<
ApplicationTPS
>
getTopNApplicationThroughput
(
Step
step
,
long
start
TimeBucket
,
long
endTimeBucket
,
int
betweenSecond
,
int
topN
,
MetricSource
metricSource
)
{
return
null
;
}
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/OverViewLayerQuery.java
浏览文件 @
62d51482
...
...
@@ -157,9 +157,9 @@ public class OverViewLayerQuery implements Query {
public
List
<
ApplicationTPS
>
getTopNApplicationThroughput
(
Duration
duration
,
int
topN
)
throws
ParseException
{
long
start
=
DurationUtils
.
INSTANCE
.
exchangeToTimeBucket
(
duration
.
getStart
());
long
end
=
DurationUtils
.
INSTANCE
.
exchangeToTimeBucket
(
duration
.
getEnd
());
long
start
TimeBucket
=
DurationUtils
.
INSTANCE
.
exchangeToTimeBucket
(
duration
.
getStart
());
long
end
TimeBucket
=
DurationUtils
.
INSTANCE
.
exchangeToTimeBucket
(
duration
.
getEnd
());
return
getApplicationService
().
getTopNApplicationThroughput
(
duration
.
getStep
(),
start
,
end
,
topN
);
return
getApplicationService
().
getTopNApplicationThroughput
(
duration
.
getStep
(),
start
TimeBucket
,
endTimeBucket
,
topN
);
}
}
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ApplicationService.java
浏览文件 @
62d51482
...
...
@@ -37,6 +37,7 @@ import org.apache.skywalking.apm.collector.storage.ui.overview.ApplicationTPS;
import
org.apache.skywalking.apm.collector.storage.ui.overview.ConjecturalApp
;
import
org.apache.skywalking.apm.collector.storage.ui.overview.ConjecturalAppBrief
;
import
org.apache.skywalking.apm.collector.storage.ui.service.ServiceMetric
;
import
org.apache.skywalking.apm.collector.ui.utils.DurationUtils
;
/**
* @author peng-yongsheng
...
...
@@ -80,10 +81,10 @@ public class ApplicationService {
return
slowServices
;
}
public
List
<
ApplicationTPS
>
getTopNApplicationThroughput
(
Step
step
,
long
start
,
long
end
,
public
List
<
ApplicationTPS
>
getTopNApplicationThroughput
(
Step
step
,
long
start
TimeBucket
,
long
endTimeBucket
,
int
topN
)
throws
ParseException
{
//TODO
List
<
ApplicationTPS
>
applicationThroughput
=
applicationMetricUIDAO
.
getTopNApplicationThroughput
(
step
,
start
,
end
,
1000
,
topN
,
MetricSource
.
Callee
);
int
secondsBetween
=
DurationUtils
.
INSTANCE
.
secondsBetween
(
step
,
startTimeBucket
,
endTimeBucket
);
List
<
ApplicationTPS
>
applicationThroughput
=
applicationMetricUIDAO
.
getTopNApplicationThroughput
(
step
,
start
TimeBucket
,
endTimeBucket
,
secondsBetween
,
topN
,
MetricSource
.
Callee
);
applicationThroughput
.
forEach
(
applicationTPS
->
{
String
applicationCode
=
applicationCacheService
.
getApplicationById
(
applicationTPS
.
getApplicationId
()).
getApplicationCode
();
applicationTPS
.
setApplicationCode
(
applicationCode
);
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/utils/DurationUtils.java
浏览文件 @
62d51482
...
...
@@ -64,36 +64,36 @@ public enum DurationUtils {
return
secondTimeBucket
;
}
public
long
secondsBetween
(
Step
step
,
long
start
,
long
end
)
throws
ParseException
{
public
int
secondsBetween
(
Step
step
,
long
startTimeBucket
,
long
endTimeBucket
)
throws
ParseException
{
Date
startDate
=
null
;
Date
endDate
=
null
;
switch
(
step
)
{
case
MONTH:
startDate
=
new
SimpleDateFormat
(
"yyyyMM"
).
parse
(
String
.
valueOf
(
start
));
endDate
=
new
SimpleDateFormat
(
"yyyyMM"
).
parse
(
String
.
valueOf
(
end
));
startDate
=
new
SimpleDateFormat
(
"yyyyMM"
).
parse
(
String
.
valueOf
(
start
TimeBucket
));
endDate
=
new
SimpleDateFormat
(
"yyyyMM"
).
parse
(
String
.
valueOf
(
end
TimeBucket
));
break
;
case
DAY:
startDate
=
new
SimpleDateFormat
(
"yyyyMMdd"
).
parse
(
String
.
valueOf
(
start
));
endDate
=
new
SimpleDateFormat
(
"yyyyMMdd"
).
parse
(
String
.
valueOf
(
end
));
startDate
=
new
SimpleDateFormat
(
"yyyyMMdd"
).
parse
(
String
.
valueOf
(
start
TimeBucket
));
endDate
=
new
SimpleDateFormat
(
"yyyyMMdd"
).
parse
(
String
.
valueOf
(
end
TimeBucket
));
break
;
case
HOUR:
startDate
=
new
SimpleDateFormat
(
"yyyyMMddHH"
).
parse
(
String
.
valueOf
(
start
));
endDate
=
new
SimpleDateFormat
(
"yyyyMMddHH"
).
parse
(
String
.
valueOf
(
end
));
startDate
=
new
SimpleDateFormat
(
"yyyyMMddHH"
).
parse
(
String
.
valueOf
(
start
TimeBucket
));
endDate
=
new
SimpleDateFormat
(
"yyyyMMddHH"
).
parse
(
String
.
valueOf
(
end
TimeBucket
));
break
;
case
MINUTE:
startDate
=
new
SimpleDateFormat
(
"yyyyMMddHHmm"
).
parse
(
String
.
valueOf
(
start
));
endDate
=
new
SimpleDateFormat
(
"yyyyMMddHHmm"
).
parse
(
String
.
valueOf
(
end
));
startDate
=
new
SimpleDateFormat
(
"yyyyMMddHHmm"
).
parse
(
String
.
valueOf
(
start
TimeBucket
));
endDate
=
new
SimpleDateFormat
(
"yyyyMMddHHmm"
).
parse
(
String
.
valueOf
(
end
TimeBucket
));
break
;
case
SECOND:
startDate
=
new
SimpleDateFormat
(
"yyyyMMddHHmmss"
).
parse
(
String
.
valueOf
(
start
));
endDate
=
new
SimpleDateFormat
(
"yyyyMMddHHmmss"
).
parse
(
String
.
valueOf
(
end
));
startDate
=
new
SimpleDateFormat
(
"yyyyMMddHHmmss"
).
parse
(
String
.
valueOf
(
start
TimeBucket
));
endDate
=
new
SimpleDateFormat
(
"yyyyMMddHHmmss"
).
parse
(
String
.
valueOf
(
end
TimeBucket
));
break
;
}
return
Seconds
.
secondsBetween
(
new
DateTime
(
startDate
),
new
DateTime
(
endDate
)).
getSeconds
();
}
public
long
secondsBetween
(
Step
step
,
DateTime
dateTime
)
throws
ParseException
{
public
int
secondsBetween
(
Step
step
,
DateTime
dateTime
)
throws
ParseException
{
switch
(
step
)
{
case
MONTH:
return
dateTime
.
dayOfMonth
().
getMaximumValue
()
*
24
*
60
*
60
;
...
...
apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/overview-layer.graphqls
浏览文件 @
62d51482
...
...
@@ -30,7 +30,7 @@ type ConjecturalApp {
type ApplicationTPS {
applicationId: Int!
applicationCode: String
tps
: Int!
callsPerSec
: Int!
}
extend type Query {
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录