From ba06a68c7a1dae38dc220466bdc4d6ca78247150 Mon Sep 17 00:00:00 2001
From: peng-yongsheng <8082209@qq.com>
Date: Wed, 3 Jan 2018 14:55:35 +0800
Subject: [PATCH] Instance metric and instance reference metric test ok.

---
 .../worker/instance/InstanceMetricAggregationWorker.java | 4 +++-
 .../InstanceReferenceMetricAggregationWorker.java        | 9 +++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/InstanceMetricAggregationWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/InstanceMetricAggregationWorker.java
index 569c972936..237a713ec8 100644
--- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/InstanceMetricAggregationWorker.java
+++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/InstanceMetricAggregationWorker.java
@@ -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());
diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/InstanceReferenceMetricAggregationWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/InstanceReferenceMetricAggregationWorker.java
index 69f001eaa1..138e904345 100644
--- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/InstanceReferenceMetricAggregationWorker.java
+++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/InstanceReferenceMetricAggregationWorker.java
@@ -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;
     }
-- 
GitLab