kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Instance metric and instance reference metric test ok.

This commit is contained in:
peng-yongsheng 2018-01-03 14:55:35 +08:00
parent cee7c71516
commit ba06a68c7a
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/InstanceMetricAggregationWorker.java
View File

@ -40,10 +40,12 @@ public class InstanceMetricAggregationWorker extends AggregationWorker<InstanceR
}
@Override protected InstanceMetric transform(InstanceReferenceMetric instanceReferenceMetric) {
String id = instanceReferenceMetric.getTimeBucket() + Const.ID_SPLIT + instanceReferenceMetric.getBehindInstanceId();
String id = instanceReferenceMetric.getTimeBucket() + Const.ID_SPLIT + instanceReferenceMetric.getBehindInstanceId() + Const.ID_SPLIT + instanceReferenceMetric.getSourceValue();
InstanceMetric instanceMetric = new InstanceMetric(id);
instanceMetric.setApplicationId(instanceReferenceMetric.getBehindApplicationId());
instanceMetric.setInstanceId(instanceReferenceMetric.getBehindInstanceId());
instanceMetric.setSourceValue(instanceReferenceMetric.getSourceValue());
instanceMetric.setTransactionCalls(instanceReferenceMetric.getTransactionCalls());
instanceMetric.setTransactionErrorCalls(instanceReferenceMetric.getTransactionErrorCalls());

9
apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/InstanceReferenceMetricAggregationWorker.java
View File

@ -40,11 +40,17 @@ public class InstanceReferenceMetricAggregationWorker extends AggregationWorker<
}
@Override protected InstanceReferenceMetric transform(ServiceReferenceMetric serviceReferenceMetric) {
String id = serviceReferenceMetric.getTimeBucket() + Const.ID_SPLIT + serviceReferenceMetric.getFrontInstanceId() + Const.ID_SPLIT + serviceReferenceMetric.getBehindInstanceId();
String id = serviceReferenceMetric.getTimeBucket()
+ Const.ID_SPLIT + serviceReferenceMetric.getFrontInstanceId()
+ Const.ID_SPLIT + serviceReferenceMetric.getBehindInstanceId()
+ Const.ID_SPLIT + serviceReferenceMetric.getSourceValue();
InstanceReferenceMetric instanceReferenceMetric = new InstanceReferenceMetric(id);
instanceReferenceMetric.setFrontApplicationId(serviceReferenceMetric.getFrontApplicationId());
instanceReferenceMetric.setFrontInstanceId(serviceReferenceMetric.getFrontInstanceId());
instanceReferenceMetric.setBehindApplicationId(serviceReferenceMetric.getBehindApplicationId());
instanceReferenceMetric.setBehindInstanceId(serviceReferenceMetric.getBehindInstanceId());
instanceReferenceMetric.setSourceValue(serviceReferenceMetric.getSourceValue());
instanceReferenceMetric.setTransactionCalls(serviceReferenceMetric.getTransactionCalls());
instanceReferenceMetric.setTransactionErrorCalls(serviceReferenceMetric.getTransactionErrorCalls());
@ -61,7 +67,6 @@ public class InstanceReferenceMetricAggregationWorker extends AggregationWorker<
instanceReferenceMetric.setMqTransactionDurationSum(instanceReferenceMetric.getMqTransactionDurationSum());
instanceReferenceMetric.setMqTransactionErrorDurationSum(instanceReferenceMetric.getMqTransactionErrorDurationSum());
instanceReferenceMetric.setSourceValue(serviceReferenceMetric.getSourceValue());
instanceReferenceMetric.setTimeBucket(serviceReferenceMetric.getTimeBucket());
return instanceReferenceMetric;
}