Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
6d027a72
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 搜索 >>
提交
6d027a72
编写于
12月 02, 2017
作者:
P
peng-yongsheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make service reference metric contains transaction, business transaction, mq transaction.
上级
9880f8c5
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
255 addition
and
80 deletion
+255
-80
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/service/ServiceReferenceMetric.java
...llector/storage/table/service/ServiceReferenceMetric.java
+90
-18
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/service/ServiceReferenceMetricTable.java
...or/storage/table/service/ServiceReferenceMetricTable.java
+12
-4
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ServiceReferenceEsUIDAO.java
...apm/collector/storage/es/dao/ServiceReferenceEsUIDAO.java
+12
-12
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ServiceReferenceMetricEsPersistenceDAO.java
...torage/es/dao/ServiceReferenceMetricEsPersistenceDAO.java
+48
-12
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ServiceReferenceMetricEsTableDefine.java
...torage/es/define/ServiceReferenceMetricEsTableDefine.java
+16
-4
apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ServiceReferenceH2UIDAO.java
...apm/collector/storage/h2/dao/ServiceReferenceH2UIDAO.java
+10
-10
apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ServiceReferenceMetricH2PersistenceDAO.java
...torage/h2/dao/ServiceReferenceMetricH2PersistenceDAO.java
+47
-12
apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ServiceReferenceMetricH2TableDefine.java
...torage/h2/define/ServiceReferenceMetricH2TableDefine.java
+16
-4
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/ServiceTreeService.java
...ywalking/apm/collector/ui/service/ServiceTreeService.java
+4
-4
未找到文件。
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/service/ServiceReferenceMetric.java
浏览文件 @
6d027a72
...
...
@@ -34,10 +34,18 @@ public class ServiceReferenceMetric extends Data {
};
private
static
final
Column
[]
LONG_COLUMNS
=
{
new
Column
(
ServiceReferenceMetricTable
.
COLUMN_CALLS
,
new
AddOperation
()),
new
Column
(
ServiceReferenceMetricTable
.
COLUMN_ERROR_CALLS
,
new
AddOperation
()),
new
Column
(
ServiceReferenceMetricTable
.
COLUMN_DURATION_SUM
,
new
AddOperation
()),
new
Column
(
ServiceReferenceMetricTable
.
COLUMN_ERROR_DURATION_SUM
,
new
AddOperation
()),
new
Column
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_CALLS
,
new
AddOperation
()),
new
Column
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_ERROR_CALLS
,
new
AddOperation
()),
new
Column
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_DURATION_SUM
,
new
AddOperation
()),
new
Column
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_ERROR_DURATION_SUM
,
new
AddOperation
()),
new
Column
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_CALLS
,
new
AddOperation
()),
new
Column
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_ERROR_CALLS
,
new
AddOperation
()),
new
Column
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_DURATION_SUM
,
new
AddOperation
()),
new
Column
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_ERROR_DURATION_SUM
,
new
AddOperation
()),
new
Column
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_CALLS
,
new
AddOperation
()),
new
Column
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_ERROR_CALLS
,
new
AddOperation
()),
new
Column
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_DURATION_SUM
,
new
AddOperation
()),
new
Column
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_ERROR_DURATION_SUM
,
new
AddOperation
()),
new
Column
(
ServiceReferenceMetricTable
.
COLUMN_TIME_BUCKET
,
new
CoverOperation
()),
};
...
...
@@ -81,43 +89,107 @@ public class ServiceReferenceMetric extends Data {
setDataInteger
(
2
,
behindServiceId
);
}
public
long
get
Calls
()
{
public
Long
getTransaction
Calls
()
{
return
getDataLong
(
0
);
}
public
void
set
Calls
(
long
c
alls
)
{
setDataLong
(
0
,
c
alls
);
public
void
set
TransactionCalls
(
Long
transactionC
alls
)
{
setDataLong
(
0
,
transactionC
alls
);
}
public
long
get
ErrorCalls
()
{
public
Long
getTransaction
ErrorCalls
()
{
return
getDataLong
(
1
);
}
public
void
set
ErrorCalls
(
long
e
rrorCalls
)
{
setDataLong
(
1
,
e
rrorCalls
);
public
void
set
TransactionErrorCalls
(
Long
transactionE
rrorCalls
)
{
setDataLong
(
1
,
transactionE
rrorCalls
);
}
public
long
get
DurationSum
()
{
public
Long
getTransaction
DurationSum
()
{
return
getDataLong
(
2
);
}
public
void
set
DurationSum
(
long
d
urationSum
)
{
setDataLong
(
2
,
d
urationSum
);
public
void
set
TransactionDurationSum
(
Long
transactionD
urationSum
)
{
setDataLong
(
2
,
transactionD
urationSum
);
}
public
long
get
ErrorDurationSum
()
{
public
Long
getTransaction
ErrorDurationSum
()
{
return
getDataLong
(
3
);
}
public
void
set
ErrorDurationSum
(
long
e
rrorDurationSum
)
{
setDataLong
(
3
,
e
rrorDurationSum
);
public
void
set
TransactionErrorDurationSum
(
Long
transactionE
rrorDurationSum
)
{
setDataLong
(
3
,
transactionE
rrorDurationSum
);
}
public
Long
get
TimeBucket
()
{
public
Long
get
BusinessTransactionCalls
()
{
return
getDataLong
(
4
);
}
public
void
setBusinessTransactionCalls
(
Long
businessTransactionCalls
)
{
setDataLong
(
4
,
businessTransactionCalls
);
}
public
Long
getBusinessTransactionErrorCalls
()
{
return
getDataLong
(
5
);
}
public
void
setBusinessTransactionErrorCalls
(
Long
businessTransactionErrorCalls
)
{
setDataLong
(
5
,
businessTransactionErrorCalls
);
}
public
Long
getBusinessTransactionDurationSum
()
{
return
getDataLong
(
6
);
}
public
void
setBusinessTransactionDurationSum
(
Long
businessTransactionDurationSum
)
{
setDataLong
(
6
,
businessTransactionDurationSum
);
}
public
Long
getBusinessTransactionErrorDurationSum
()
{
return
getDataLong
(
7
);
}
public
void
setBusinessTransactionErrorDurationSum
(
Long
businessTransactionErrorDurationSum
)
{
setDataLong
(
7
,
businessTransactionErrorDurationSum
);
}
public
Long
getMqTransactionCalls
()
{
return
getDataLong
(
8
);
}
public
void
setMqTransactionCalls
(
Long
mqTransactionCalls
)
{
setDataLong
(
8
,
mqTransactionCalls
);
}
public
Long
getMqTransactionErrorCalls
()
{
return
getDataLong
(
9
);
}
public
void
setMqTransactionErrorCalls
(
Long
mqTransactionErrorCalls
)
{
setDataLong
(
9
,
mqTransactionErrorCalls
);
}
public
Long
getMqTransactionDurationSum
()
{
return
getDataLong
(
10
);
}
public
void
setMqTransactionDurationSum
(
Long
mqTransactionDurationSum
)
{
setDataLong
(
10
,
mqTransactionDurationSum
);
}
public
Long
getMqTransactionErrorDurationSum
()
{
return
getDataLong
(
11
);
}
public
void
setMqTransactionErrorDurationSum
(
Long
mqTransactionErrorDurationSum
)
{
setDataLong
(
11
,
mqTransactionErrorDurationSum
);
}
public
Long
getTimeBucket
()
{
return
getDataLong
(
12
);
}
public
void
setTimeBucket
(
Long
timeBucket
)
{
setDataLong
(
4
,
timeBucket
);
setDataLong
(
12
,
timeBucket
);
}
}
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/service/ServiceReferenceMetricTable.java
浏览文件 @
6d027a72
...
...
@@ -28,8 +28,16 @@ public class ServiceReferenceMetricTable extends CommonTable {
public
static
final
String
COLUMN_ENTRY_SERVICE_ID
=
"entry_service_id"
;
public
static
final
String
COLUMN_FRONT_SERVICE_ID
=
"front_service_id"
;
public
static
final
String
COLUMN_BEHIND_SERVICE_ID
=
"behind_service_id"
;
public
static
final
String
COLUMN_CALLS
=
"calls"
;
public
static
final
String
COLUMN_ERROR_CALLS
=
"error_calls"
;
public
static
final
String
COLUMN_DURATION_SUM
=
"duration_sum"
;
public
static
final
String
COLUMN_ERROR_DURATION_SUM
=
"error_duration_sum"
;
public
static
final
String
COLUMN_TRANSACTION_CALLS
=
"transaction_calls"
;
public
static
final
String
COLUMN_TRANSACTION_ERROR_CALLS
=
"transaction_error_calls"
;
public
static
final
String
COLUMN_TRANSACTION_DURATION_SUM
=
"transaction_duration_sum"
;
public
static
final
String
COLUMN_TRANSACTION_ERROR_DURATION_SUM
=
"transaction_error_duration_sum"
;
public
static
final
String
COLUMN_BUSINESS_TRANSACTION_CALLS
=
"business_transaction_calls"
;
public
static
final
String
COLUMN_BUSINESS_TRANSACTION_ERROR_CALLS
=
"business_transaction_error_calls"
;
public
static
final
String
COLUMN_BUSINESS_TRANSACTION_DURATION_SUM
=
"business_transaction_duration_sum"
;
public
static
final
String
COLUMN_BUSINESS_TRANSACTION_ERROR_DURATION_SUM
=
"business_transaction_error_duration_sum"
;
public
static
final
String
COLUMN_MQ_TRANSACTION_CALLS
=
"mq_transaction_calls"
;
public
static
final
String
COLUMN_MQ_TRANSACTION_ERROR_CALLS
=
"mq_transaction_error_calls"
;
public
static
final
String
COLUMN_MQ_TRANSACTION_DURATION_SUM
=
"mq_transaction_duration_sum"
;
public
static
final
String
COLUMN_MQ_TRANSACTION_ERROR_DURATION_SUM
=
"mq_transaction_error_duration_sum"
;
}
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ServiceReferenceEsUIDAO.java
浏览文件 @
6d027a72
...
...
@@ -69,10 +69,10 @@ public class ServiceReferenceEsUIDAO extends EsDAO implements IServiceReferenceU
private
Map
<
String
,
JsonObject
>
load
(
SearchRequestBuilder
searchRequestBuilder
)
{
searchRequestBuilder
.
addAggregation
(
AggregationBuilders
.
terms
(
ServiceReferenceMetricTable
.
COLUMN_FRONT_SERVICE_ID
).
field
(
ServiceReferenceMetricTable
.
COLUMN_FRONT_SERVICE_ID
).
size
(
100
)
.
subAggregation
(
AggregationBuilders
.
terms
(
ServiceReferenceMetricTable
.
COLUMN_BEHIND_SERVICE_ID
).
field
(
ServiceReferenceMetricTable
.
COLUMN_BEHIND_SERVICE_ID
).
size
(
100
)
.
subAggregation
(
AggregationBuilders
.
sum
(
ServiceReferenceMetricTable
.
COLUMN_
CALLS
).
field
(
ServiceReferenceMetricTable
.
COLUM
N_CALLS
))
.
subAggregation
(
AggregationBuilders
.
sum
(
ServiceReferenceMetricTable
.
COLUMN_
ERROR_CALLS
).
field
(
ServiceReferenceMetricTable
.
COLUM
N_ERROR_CALLS
))
.
subAggregation
(
AggregationBuilders
.
sum
(
ServiceReferenceMetricTable
.
COLUMN_
DURATION_SUM
).
field
(
ServiceReferenceMetricTable
.
COLUM
N_DURATION_SUM
))
.
subAggregation
(
AggregationBuilders
.
sum
(
ServiceReferenceMetricTable
.
COLUMN_
ERROR_DURATION_SUM
).
field
(
ServiceReferenceMetricTable
.
COLUM
N_ERROR_DURATION_SUM
))));
.
subAggregation
(
AggregationBuilders
.
sum
(
ServiceReferenceMetricTable
.
COLUMN_
TRANSACTION_CALLS
).
field
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTIO
N_CALLS
))
.
subAggregation
(
AggregationBuilders
.
sum
(
ServiceReferenceMetricTable
.
COLUMN_
TRANSACTION_ERROR_CALLS
).
field
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTIO
N_ERROR_CALLS
))
.
subAggregation
(
AggregationBuilders
.
sum
(
ServiceReferenceMetricTable
.
COLUMN_
TRANSACTION_DURATION_SUM
).
field
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTIO
N_DURATION_SUM
))
.
subAggregation
(
AggregationBuilders
.
sum
(
ServiceReferenceMetricTable
.
COLUMN_
TRANSACTION_ERROR_DURATION_SUM
).
field
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTIO
N_ERROR_DURATION_SUM
))));
Map
<
String
,
JsonObject
>
serviceReferenceMap
=
new
LinkedHashMap
<>();
...
...
@@ -95,18 +95,18 @@ public class ServiceReferenceEsUIDAO extends EsDAO implements IServiceReferenceU
for
(
Terms
.
Bucket
behindServiceIdBucket
:
behindServiceIdTerms
.
getBuckets
())
{
int
behindServiceId
=
behindServiceIdBucket
.
getKeyAsNumber
().
intValue
();
if
(
behindServiceId
!=
0
)
{
Sum
calls
=
behindServiceIdBucket
.
getAggregations
().
get
(
ServiceReferenceMetricTable
.
COLUMN_CALLS
);
Sum
errorCalls
=
behindServiceIdBucket
.
getAggregations
().
get
(
ServiceReferenceMetricTable
.
COLUMN_ERROR_CALLS
);
Sum
durationSum
=
behindServiceIdBucket
.
getAggregations
().
get
(
ServiceReferenceMetricTable
.
COLUMN_DURATION_SUM
);
Sum
errorDurationSum
=
behindServiceIdBucket
.
getAggregations
().
get
(
ServiceReferenceMetricTable
.
COLUMN_ERROR_DURATION_SUM
);
Sum
calls
=
behindServiceIdBucket
.
getAggregations
().
get
(
ServiceReferenceMetricTable
.
COLUMN_
TRANSACTION_
CALLS
);
Sum
errorCalls
=
behindServiceIdBucket
.
getAggregations
().
get
(
ServiceReferenceMetricTable
.
COLUMN_
TRANSACTION_
ERROR_CALLS
);
Sum
durationSum
=
behindServiceIdBucket
.
getAggregations
().
get
(
ServiceReferenceMetricTable
.
COLUMN_
TRANSACTION_
DURATION_SUM
);
Sum
errorDurationSum
=
behindServiceIdBucket
.
getAggregations
().
get
(
ServiceReferenceMetricTable
.
COLUMN_
TRANSACTION_
ERROR_DURATION_SUM
);
JsonObject
serviceReference
=
new
JsonObject
();
serviceReference
.
addProperty
(
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_FRONT_SERVICE_ID
),
frontServiceId
);
serviceReference
.
addProperty
(
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_BEHIND_SERVICE_ID
),
behindServiceId
);
serviceReference
.
addProperty
(
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_CALLS
),
(
long
)
calls
.
getValue
());
serviceReference
.
addProperty
(
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_ERROR_CALLS
),
(
long
)
errorCalls
.
getValue
());
serviceReference
.
addProperty
(
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_DURATION_SUM
),
(
long
)
durationSum
.
getValue
());
serviceReference
.
addProperty
(
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_ERROR_DURATION_SUM
),
(
long
)
errorDurationSum
.
getValue
());
serviceReference
.
addProperty
(
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_
TRANSACTION_
CALLS
),
(
long
)
calls
.
getValue
());
serviceReference
.
addProperty
(
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_
TRANSACTION_
ERROR_CALLS
),
(
long
)
errorCalls
.
getValue
());
serviceReference
.
addProperty
(
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_
TRANSACTION_
DURATION_SUM
),
(
long
)
durationSum
.
getValue
());
serviceReference
.
addProperty
(
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_
TRANSACTION_
ERROR_DURATION_SUM
),
(
long
)
errorDurationSum
.
getValue
());
String
id
=
serviceReference
.
get
(
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_FRONT_SERVICE_ID
))
+
Const
.
ID_SPLIT
+
serviceReference
.
get
(
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_BEHIND_SERVICE_ID
));
serviceReferenceMap
.
put
(
id
,
serviceReference
);
...
...
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ServiceReferenceMetricEsPersistenceDAO.java
浏览文件 @
6d027a72
...
...
@@ -53,10 +53,22 @@ public class ServiceReferenceMetricEsPersistenceDAO extends EsDAO implements ISe
serviceReferenceMetric
.
setEntryServiceId
(((
Number
)
source
.
get
(
ServiceReferenceMetricTable
.
COLUMN_ENTRY_SERVICE_ID
)).
intValue
());
serviceReferenceMetric
.
setFrontServiceId
(((
Number
)
source
.
get
(
ServiceReferenceMetricTable
.
COLUMN_FRONT_SERVICE_ID
)).
intValue
());
serviceReferenceMetric
.
setBehindServiceId
(((
Number
)
source
.
get
(
ServiceReferenceMetricTable
.
COLUMN_BEHIND_SERVICE_ID
)).
intValue
());
serviceReferenceMetric
.
setCalls
(((
Number
)
source
.
get
(
ServiceReferenceMetricTable
.
COLUMN_CALLS
)).
longValue
());
serviceReferenceMetric
.
setErrorCalls
(((
Number
)
source
.
get
(
ServiceReferenceMetricTable
.
COLUMN_ERROR_CALLS
)).
longValue
());
serviceReferenceMetric
.
setDurationSum
(((
Number
)
source
.
get
(
ServiceReferenceMetricTable
.
COLUMN_DURATION_SUM
)).
longValue
());
serviceReferenceMetric
.
setErrorDurationSum
(((
Number
)
source
.
get
(
ServiceReferenceMetricTable
.
COLUMN_ERROR_DURATION_SUM
)).
longValue
());
serviceReferenceMetric
.
setTransactionCalls
(((
Number
)
source
.
get
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_CALLS
)).
longValue
());
serviceReferenceMetric
.
setTransactionErrorCalls
(((
Number
)
source
.
get
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_ERROR_CALLS
)).
longValue
());
serviceReferenceMetric
.
setTransactionDurationSum
(((
Number
)
source
.
get
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_DURATION_SUM
)).
longValue
());
serviceReferenceMetric
.
setTransactionErrorDurationSum
(((
Number
)
source
.
get
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_ERROR_DURATION_SUM
)).
longValue
());
serviceReferenceMetric
.
setBusinessTransactionCalls
(((
Number
)
source
.
get
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_CALLS
)).
longValue
());
serviceReferenceMetric
.
setBusinessTransactionErrorCalls
(((
Number
)
source
.
get
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_ERROR_CALLS
)).
longValue
());
serviceReferenceMetric
.
setBusinessTransactionDurationSum
(((
Number
)
source
.
get
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_DURATION_SUM
)).
longValue
());
serviceReferenceMetric
.
setBusinessTransactionErrorDurationSum
(((
Number
)
source
.
get
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_ERROR_DURATION_SUM
)).
longValue
());
serviceReferenceMetric
.
setMqTransactionCalls
(((
Number
)
source
.
get
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_CALLS
)).
longValue
());
serviceReferenceMetric
.
setMqTransactionErrorCalls
(((
Number
)
source
.
get
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_ERROR_CALLS
)).
longValue
());
serviceReferenceMetric
.
setMqTransactionDurationSum
(((
Number
)
source
.
get
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_DURATION_SUM
)).
longValue
());
serviceReferenceMetric
.
setMqTransactionErrorDurationSum
(((
Number
)
source
.
get
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_ERROR_DURATION_SUM
)).
longValue
());
serviceReferenceMetric
.
setTimeBucket
(((
Number
)
source
.
get
(
ServiceReferenceMetricTable
.
COLUMN_TIME_BUCKET
)).
longValue
());
return
serviceReferenceMetric
;
}
else
{
...
...
@@ -69,10 +81,22 @@ public class ServiceReferenceMetricEsPersistenceDAO extends EsDAO implements ISe
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_ENTRY_SERVICE_ID
,
data
.
getEntryServiceId
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_FRONT_SERVICE_ID
,
data
.
getFrontServiceId
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_BEHIND_SERVICE_ID
,
data
.
getBehindServiceId
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_CALLS
,
data
.
getCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_ERROR_CALLS
,
data
.
getErrorCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_DURATION_SUM
,
data
.
getDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_ERROR_DURATION_SUM
,
data
.
getErrorDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_CALLS
,
data
.
getTransactionCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_ERROR_CALLS
,
data
.
getTransactionErrorCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_DURATION_SUM
,
data
.
getTransactionDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_ERROR_DURATION_SUM
,
data
.
getTransactionErrorDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_CALLS
,
data
.
getBusinessTransactionCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_ERROR_CALLS
,
data
.
getBusinessTransactionErrorCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_DURATION_SUM
,
data
.
getBusinessTransactionDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_ERROR_DURATION_SUM
,
data
.
getBusinessTransactionErrorDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_CALLS
,
data
.
getMqTransactionCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_ERROR_CALLS
,
data
.
getMqTransactionErrorCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_DURATION_SUM
,
data
.
getMqTransactionDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_ERROR_DURATION_SUM
,
data
.
getMqTransactionErrorDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_TIME_BUCKET
,
data
.
getTimeBucket
());
return
getClient
().
prepareIndex
(
ServiceReferenceMetricTable
.
TABLE
,
data
.
getId
()).
setSource
(
source
);
...
...
@@ -83,10 +107,22 @@ public class ServiceReferenceMetricEsPersistenceDAO extends EsDAO implements ISe
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_ENTRY_SERVICE_ID
,
data
.
getEntryServiceId
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_FRONT_SERVICE_ID
,
data
.
getFrontServiceId
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_BEHIND_SERVICE_ID
,
data
.
getBehindServiceId
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_CALLS
,
data
.
getCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_ERROR_CALLS
,
data
.
getErrorCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_DURATION_SUM
,
data
.
getDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_ERROR_DURATION_SUM
,
data
.
getErrorDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_CALLS
,
data
.
getTransactionCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_ERROR_CALLS
,
data
.
getTransactionErrorCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_DURATION_SUM
,
data
.
getTransactionDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_ERROR_DURATION_SUM
,
data
.
getTransactionErrorDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_CALLS
,
data
.
getBusinessTransactionCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_ERROR_CALLS
,
data
.
getBusinessTransactionErrorCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_DURATION_SUM
,
data
.
getBusinessTransactionDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_ERROR_DURATION_SUM
,
data
.
getBusinessTransactionErrorDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_CALLS
,
data
.
getMqTransactionCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_ERROR_CALLS
,
data
.
getMqTransactionErrorCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_DURATION_SUM
,
data
.
getMqTransactionDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_ERROR_DURATION_SUM
,
data
.
getMqTransactionErrorDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_TIME_BUCKET
,
data
.
getTimeBucket
());
return
getClient
().
prepareUpdate
(
ServiceReferenceMetricTable
.
TABLE
,
data
.
getId
()).
setDoc
(
source
);
...
...
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ServiceReferenceMetricEsTableDefine.java
浏览文件 @
6d027a72
...
...
@@ -39,10 +39,22 @@ public class ServiceReferenceMetricEsTableDefine extends ElasticSearchTableDefin
addColumn
(
new
ElasticSearchColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_ENTRY_SERVICE_ID
,
ElasticSearchColumnDefine
.
Type
.
Integer
.
name
()));
addColumn
(
new
ElasticSearchColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_FRONT_SERVICE_ID
,
ElasticSearchColumnDefine
.
Type
.
Integer
.
name
()));
addColumn
(
new
ElasticSearchColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_BEHIND_SERVICE_ID
,
ElasticSearchColumnDefine
.
Type
.
Integer
.
name
()));
addColumn
(
new
ElasticSearchColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_CALLS
,
ElasticSearchColumnDefine
.
Type
.
Long
.
name
()));
addColumn
(
new
ElasticSearchColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_ERROR_CALLS
,
ElasticSearchColumnDefine
.
Type
.
Long
.
name
()));
addColumn
(
new
ElasticSearchColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_DURATION_SUM
,
ElasticSearchColumnDefine
.
Type
.
Long
.
name
()));
addColumn
(
new
ElasticSearchColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_ERROR_DURATION_SUM
,
ElasticSearchColumnDefine
.
Type
.
Long
.
name
()));
addColumn
(
new
ElasticSearchColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_CALLS
,
ElasticSearchColumnDefine
.
Type
.
Long
.
name
()));
addColumn
(
new
ElasticSearchColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_ERROR_CALLS
,
ElasticSearchColumnDefine
.
Type
.
Long
.
name
()));
addColumn
(
new
ElasticSearchColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_DURATION_SUM
,
ElasticSearchColumnDefine
.
Type
.
Long
.
name
()));
addColumn
(
new
ElasticSearchColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_ERROR_DURATION_SUM
,
ElasticSearchColumnDefine
.
Type
.
Long
.
name
()));
addColumn
(
new
ElasticSearchColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_CALLS
,
ElasticSearchColumnDefine
.
Type
.
Long
.
name
()));
addColumn
(
new
ElasticSearchColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_ERROR_CALLS
,
ElasticSearchColumnDefine
.
Type
.
Long
.
name
()));
addColumn
(
new
ElasticSearchColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_DURATION_SUM
,
ElasticSearchColumnDefine
.
Type
.
Long
.
name
()));
addColumn
(
new
ElasticSearchColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_ERROR_DURATION_SUM
,
ElasticSearchColumnDefine
.
Type
.
Long
.
name
()));
addColumn
(
new
ElasticSearchColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_CALLS
,
ElasticSearchColumnDefine
.
Type
.
Long
.
name
()));
addColumn
(
new
ElasticSearchColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_ERROR_CALLS
,
ElasticSearchColumnDefine
.
Type
.
Long
.
name
()));
addColumn
(
new
ElasticSearchColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_DURATION_SUM
,
ElasticSearchColumnDefine
.
Type
.
Long
.
name
()));
addColumn
(
new
ElasticSearchColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_ERROR_DURATION_SUM
,
ElasticSearchColumnDefine
.
Type
.
Long
.
name
()));
addColumn
(
new
ElasticSearchColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_TIME_BUCKET
,
ElasticSearchColumnDefine
.
Type
.
Long
.
name
()));
}
}
apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ServiceReferenceH2UIDAO.java
浏览文件 @
6d027a72
...
...
@@ -54,8 +54,8 @@ public class ServiceReferenceH2UIDAO extends H2DAO implements IServiceReferenceU
String
sql
=
SqlBuilder
.
buildSql
(
GET_SRV_REF_LOAD1
,
ServiceReferenceMetricTable
.
TABLE
,
ServiceReferenceMetricTable
.
COLUMN_TIME_BUCKET
,
ServiceReferenceMetricTable
.
COLUMN_ENTRY_SERVICE_ID
,
ServiceReferenceMetricTable
.
COLUMN_FRONT_SERVICE_ID
,
ServiceReferenceMetricTable
.
COLUMN_BEHIND_SERVICE_ID
,
ServiceReferenceMetricTable
.
COLUMN_
CALLS
,
ServiceReferenceMetricTable
.
COLUMN_ERROR_CALLS
,
ServiceReferenceMetricTable
.
COLUM
N_DURATION_SUM
,
ServiceReferenceMetricTable
.
COLUMN_ERROR_DURATION_SUM
);
ServiceReferenceMetricTable
.
COLUMN_
TRANSACTION_CALLS
,
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_ERROR_CALLS
,
ServiceReferenceMetricTable
.
COLUMN_TRANSACTIO
N_DURATION_SUM
,
ServiceReferenceMetricTable
.
COLUMN_
TRANSACTION_
ERROR_DURATION_SUM
);
Object
[]
params
=
new
Object
[]
{
startTime
,
endTime
,
entryServiceId
};
return
load
(
client
,
params
,
sql
);
...
...
@@ -80,18 +80,18 @@ public class ServiceReferenceH2UIDAO extends H2DAO implements IServiceReferenceU
try
{
int
behindServiceId
=
rs
.
getInt
(
ServiceReferenceMetricTable
.
COLUMN_BEHIND_SERVICE_ID
);
if
(
behindServiceId
!=
0
)
{
long
calls
=
rs
.
getLong
(
ServiceReferenceMetricTable
.
COLUMN_CALLS
);
long
errorCalls
=
rs
.
getLong
(
ServiceReferenceMetricTable
.
COLUMN_ERROR_CALLS
);
long
durationSum
=
rs
.
getLong
(
ServiceReferenceMetricTable
.
COLUMN_DURATION_SUM
);
long
errorDurationSum
=
rs
.
getLong
(
ServiceReferenceMetricTable
.
COLUMN_ERROR_DURATION_SUM
);
long
calls
=
rs
.
getLong
(
ServiceReferenceMetricTable
.
COLUMN_
TRANSACTION_
CALLS
);
long
errorCalls
=
rs
.
getLong
(
ServiceReferenceMetricTable
.
COLUMN_
TRANSACTION_
ERROR_CALLS
);
long
durationSum
=
rs
.
getLong
(
ServiceReferenceMetricTable
.
COLUMN_
TRANSACTION_
DURATION_SUM
);
long
errorDurationSum
=
rs
.
getLong
(
ServiceReferenceMetricTable
.
COLUMN_
TRANSACTION_
ERROR_DURATION_SUM
);
JsonObject
serviceReference
=
new
JsonObject
();
serviceReference
.
addProperty
(
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_FRONT_SERVICE_ID
),
frontServiceId
);
serviceReference
.
addProperty
(
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_BEHIND_SERVICE_ID
),
behindServiceId
);
serviceReference
.
addProperty
(
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_CALLS
),
calls
);
serviceReference
.
addProperty
(
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_ERROR_CALLS
),
errorCalls
);
serviceReference
.
addProperty
(
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_DURATION_SUM
),
durationSum
);
serviceReference
.
addProperty
(
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_ERROR_DURATION_SUM
),
errorDurationSum
);
serviceReference
.
addProperty
(
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_
TRANSACTION_
CALLS
),
calls
);
serviceReference
.
addProperty
(
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_
TRANSACTION_
ERROR_CALLS
),
errorCalls
);
serviceReference
.
addProperty
(
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_
TRANSACTION_
DURATION_SUM
),
durationSum
);
serviceReference
.
addProperty
(
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_
TRANSACTION_
ERROR_DURATION_SUM
),
errorDurationSum
);
String
id
=
serviceReference
.
get
(
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_FRONT_SERVICE_ID
))
+
Const
.
ID_SPLIT
+
serviceReference
.
get
(
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_BEHIND_SERVICE_ID
));
serviceReferenceMap
.
put
(
id
,
serviceReference
);
...
...
apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ServiceReferenceMetricH2PersistenceDAO.java
浏览文件 @
6d027a72
...
...
@@ -58,10 +58,22 @@ public class ServiceReferenceMetricH2PersistenceDAO extends H2DAO implements ISe
serviceReferenceMetric
.
setEntryServiceId
(
rs
.
getInt
(
ServiceReferenceMetricTable
.
COLUMN_ENTRY_SERVICE_ID
));
serviceReferenceMetric
.
setFrontServiceId
(
rs
.
getInt
(
ServiceReferenceMetricTable
.
COLUMN_FRONT_SERVICE_ID
));
serviceReferenceMetric
.
setBehindServiceId
(
rs
.
getInt
(
ServiceReferenceMetricTable
.
COLUMN_BEHIND_SERVICE_ID
));
serviceReferenceMetric
.
setCalls
(
rs
.
getLong
(
ServiceReferenceMetricTable
.
COLUMN_CALLS
));
serviceReferenceMetric
.
setErrorCalls
(
rs
.
getLong
(
ServiceReferenceMetricTable
.
COLUMN_ERROR_CALLS
));
serviceReferenceMetric
.
setDurationSum
(
rs
.
getLong
(
ServiceReferenceMetricTable
.
COLUMN_DURATION_SUM
));
serviceReferenceMetric
.
setErrorDurationSum
(
rs
.
getLong
(
ServiceReferenceMetricTable
.
COLUMN_ERROR_DURATION_SUM
));
serviceReferenceMetric
.
setTransactionCalls
(
rs
.
getLong
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_CALLS
));
serviceReferenceMetric
.
setTransactionErrorCalls
(
rs
.
getLong
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_ERROR_CALLS
));
serviceReferenceMetric
.
setTransactionDurationSum
(
rs
.
getLong
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_DURATION_SUM
));
serviceReferenceMetric
.
setTransactionErrorDurationSum
(
rs
.
getLong
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_ERROR_DURATION_SUM
));
serviceReferenceMetric
.
setBusinessTransactionCalls
(
rs
.
getLong
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_CALLS
));
serviceReferenceMetric
.
setBusinessTransactionErrorCalls
(
rs
.
getLong
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_ERROR_CALLS
));
serviceReferenceMetric
.
setBusinessTransactionDurationSum
(
rs
.
getLong
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_DURATION_SUM
));
serviceReferenceMetric
.
setBusinessTransactionErrorDurationSum
(
rs
.
getLong
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_ERROR_DURATION_SUM
));
serviceReferenceMetric
.
setMqTransactionCalls
(
rs
.
getLong
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_CALLS
));
serviceReferenceMetric
.
setMqTransactionErrorCalls
(
rs
.
getLong
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_ERROR_CALLS
));
serviceReferenceMetric
.
setMqTransactionDurationSum
(
rs
.
getLong
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_DURATION_SUM
));
serviceReferenceMetric
.
setMqTransactionErrorDurationSum
(
rs
.
getLong
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_ERROR_DURATION_SUM
));
serviceReferenceMetric
.
setTimeBucket
(
rs
.
getLong
(
ServiceReferenceMetricTable
.
COLUMN_TIME_BUCKET
));
return
serviceReferenceMetric
;
}
...
...
@@ -79,10 +91,22 @@ public class ServiceReferenceMetricH2PersistenceDAO extends H2DAO implements ISe
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_ENTRY_SERVICE_ID
,
data
.
getEntryServiceId
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_FRONT_SERVICE_ID
,
data
.
getFrontServiceId
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_BEHIND_SERVICE_ID
,
data
.
getBehindServiceId
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_CALLS
,
data
.
getCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_ERROR_CALLS
,
data
.
getErrorCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_DURATION_SUM
,
data
.
getDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_ERROR_DURATION_SUM
,
data
.
getErrorDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_CALLS
,
data
.
getTransactionCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_ERROR_CALLS
,
data
.
getTransactionErrorCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_DURATION_SUM
,
data
.
getTransactionDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_ERROR_DURATION_SUM
,
data
.
getTransactionErrorDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_CALLS
,
data
.
getBusinessTransactionCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_ERROR_CALLS
,
data
.
getBusinessTransactionErrorCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_DURATION_SUM
,
data
.
getBusinessTransactionDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_ERROR_DURATION_SUM
,
data
.
getBusinessTransactionErrorDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_CALLS
,
data
.
getMqTransactionCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_ERROR_CALLS
,
data
.
getMqTransactionErrorCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_DURATION_SUM
,
data
.
getMqTransactionDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_ERROR_DURATION_SUM
,
data
.
getMqTransactionErrorDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_TIME_BUCKET
,
data
.
getTimeBucket
());
String
sql
=
SqlBuilder
.
buildBatchInsertSql
(
ServiceReferenceMetricTable
.
TABLE
,
source
.
keySet
());
...
...
@@ -98,10 +122,21 @@ public class ServiceReferenceMetricH2PersistenceDAO extends H2DAO implements ISe
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_ENTRY_SERVICE_ID
,
data
.
getEntryServiceId
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_FRONT_SERVICE_ID
,
data
.
getFrontServiceId
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_BEHIND_SERVICE_ID
,
data
.
getBehindServiceId
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_CALLS
,
data
.
getCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_ERROR_CALLS
,
data
.
getErrorCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_DURATION_SUM
,
data
.
getDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_ERROR_DURATION_SUM
,
data
.
getErrorDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_CALLS
,
data
.
getTransactionCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_ERROR_CALLS
,
data
.
getTransactionErrorCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_DURATION_SUM
,
data
.
getTransactionDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_ERROR_DURATION_SUM
,
data
.
getTransactionErrorDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_CALLS
,
data
.
getBusinessTransactionCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_ERROR_CALLS
,
data
.
getBusinessTransactionErrorCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_DURATION_SUM
,
data
.
getBusinessTransactionDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_ERROR_DURATION_SUM
,
data
.
getBusinessTransactionErrorDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_CALLS
,
data
.
getMqTransactionCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_ERROR_CALLS
,
data
.
getMqTransactionErrorCalls
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_DURATION_SUM
,
data
.
getMqTransactionDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_ERROR_DURATION_SUM
,
data
.
getMqTransactionErrorDurationSum
());
source
.
put
(
ServiceReferenceMetricTable
.
COLUMN_TIME_BUCKET
,
data
.
getTimeBucket
());
String
sql
=
SqlBuilder
.
buildBatchUpdateSql
(
ServiceReferenceMetricTable
.
TABLE
,
source
.
keySet
(),
ServiceReferenceMetricTable
.
COLUMN_ID
);
...
...
apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ServiceReferenceMetricH2TableDefine.java
浏览文件 @
6d027a72
...
...
@@ -36,10 +36,22 @@ public class ServiceReferenceMetricH2TableDefine extends H2TableDefine {
addColumn
(
new
H2ColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_ENTRY_SERVICE_ID
,
H2ColumnDefine
.
Type
.
Int
.
name
()));
addColumn
(
new
H2ColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_FRONT_SERVICE_ID
,
H2ColumnDefine
.
Type
.
Int
.
name
()));
addColumn
(
new
H2ColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_BEHIND_SERVICE_ID
,
H2ColumnDefine
.
Type
.
Int
.
name
()));
addColumn
(
new
H2ColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_CALLS
,
H2ColumnDefine
.
Type
.
Bigint
.
name
()));
addColumn
(
new
H2ColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_ERROR_CALLS
,
H2ColumnDefine
.
Type
.
Bigint
.
name
()));
addColumn
(
new
H2ColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_DURATION_SUM
,
H2ColumnDefine
.
Type
.
Bigint
.
name
()));
addColumn
(
new
H2ColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_ERROR_DURATION_SUM
,
H2ColumnDefine
.
Type
.
Bigint
.
name
()));
addColumn
(
new
H2ColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_CALLS
,
H2ColumnDefine
.
Type
.
Bigint
.
name
()));
addColumn
(
new
H2ColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_ERROR_CALLS
,
H2ColumnDefine
.
Type
.
Bigint
.
name
()));
addColumn
(
new
H2ColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_DURATION_SUM
,
H2ColumnDefine
.
Type
.
Bigint
.
name
()));
addColumn
(
new
H2ColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_TRANSACTION_ERROR_DURATION_SUM
,
H2ColumnDefine
.
Type
.
Bigint
.
name
()));
addColumn
(
new
H2ColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_CALLS
,
H2ColumnDefine
.
Type
.
Bigint
.
name
()));
addColumn
(
new
H2ColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_ERROR_CALLS
,
H2ColumnDefine
.
Type
.
Bigint
.
name
()));
addColumn
(
new
H2ColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_DURATION_SUM
,
H2ColumnDefine
.
Type
.
Bigint
.
name
()));
addColumn
(
new
H2ColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_BUSINESS_TRANSACTION_ERROR_DURATION_SUM
,
H2ColumnDefine
.
Type
.
Bigint
.
name
()));
addColumn
(
new
H2ColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_CALLS
,
H2ColumnDefine
.
Type
.
Bigint
.
name
()));
addColumn
(
new
H2ColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_ERROR_CALLS
,
H2ColumnDefine
.
Type
.
Bigint
.
name
()));
addColumn
(
new
H2ColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_DURATION_SUM
,
H2ColumnDefine
.
Type
.
Bigint
.
name
()));
addColumn
(
new
H2ColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_MQ_TRANSACTION_ERROR_DURATION_SUM
,
H2ColumnDefine
.
Type
.
Bigint
.
name
()));
addColumn
(
new
H2ColumnDefine
(
ServiceReferenceMetricTable
.
COLUMN_TIME_BUCKET
,
H2ColumnDefine
.
Type
.
Bigint
.
name
()));
}
}
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/ServiceTreeService.java
浏览文件 @
6d027a72
...
...
@@ -125,10 +125,10 @@ public class ServiceTreeService {
if
(
serviceReferenceMap
.
containsKey
(
id
))
{
JsonObject
reference
=
serviceReferenceMap
.
get
(
id
);
add
(
reference
,
serviceReference
,
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_CALLS
));
add
(
reference
,
serviceReference
,
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_ERROR_CALLS
));
add
(
reference
,
serviceReference
,
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_DURATION_SUM
));
add
(
reference
,
serviceReference
,
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_ERROR_DURATION_SUM
));
add
(
reference
,
serviceReference
,
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_
TRANSACTION_
CALLS
));
add
(
reference
,
serviceReference
,
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_
TRANSACTION_
ERROR_CALLS
));
add
(
reference
,
serviceReference
,
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_
TRANSACTION_
DURATION_SUM
));
add
(
reference
,
serviceReference
,
ColumnNameUtils
.
INSTANCE
.
rename
(
ServiceReferenceMetricTable
.
COLUMN_
TRANSACTION_
ERROR_DURATION_SUM
));
}
else
{
serviceReferenceMap
.
put
(
id
,
serviceReference
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录