From ba0d00c7bc963142049c171d71ede4491bfb7b3d Mon Sep 17 00:00:00 2001
From: peng-yongsheng <8082209@qq.com>
Date: Wed, 3 Jan 2018 15:00:21 +0800
Subject: [PATCH] Application reference metric and application metric test ok.

---
 .../application/ApplicationMetricAggregationWorker.java   | 8 +++++++-
 .../ApplicationReferenceMetricAggregationWorker.java      | 6 +++++-
 2 files changed, 12 insertions(+), 2 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/application/ApplicationMetricAggregationWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/ApplicationMetricAggregationWorker.java
index 66dc47b50..0580dd38f 100644
--- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/ApplicationMetricAggregationWorker.java
+++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/ApplicationMetricAggregationWorker.java
@@ -42,8 +42,14 @@ public class ApplicationMetricAggregationWorker extends AggregationWorker<Applic
     @Override protected ApplicationMetric transform(ApplicationReferenceMetric applicationReferenceMetric) {
         Integer applicationId = applicationReferenceMetric.getBehindApplicationId();
         Long timeBucket = applicationReferenceMetric.getTimeBucket();
-        ApplicationMetric applicationMetric = new ApplicationMetric(String.valueOf(timeBucket) + Const.ID_SPLIT + String.valueOf(applicationId));
+
+        String id = String.valueOf(timeBucket)
+            + Const.ID_SPLIT + String.valueOf(applicationId)
+            + Const.ID_SPLIT + applicationReferenceMetric.getSourceValue();
+
+        ApplicationMetric applicationMetric = new ApplicationMetric(id);
         applicationMetric.setApplicationId(applicationId);
+        applicationMetric.setSourceValue(applicationReferenceMetric.getSourceValue());
 
         applicationMetric.setTransactionCalls(applicationReferenceMetric.getTransactionCalls());
         applicationMetric.setTransactionDurationSum(applicationReferenceMetric.getTransactionDurationSum());
diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/ApplicationReferenceMetricAggregationWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/ApplicationReferenceMetricAggregationWorker.java
index 1c0cd86ff..75bc32225 100644
--- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/ApplicationReferenceMetricAggregationWorker.java
+++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/ApplicationReferenceMetricAggregationWorker.java
@@ -53,11 +53,15 @@ public class ApplicationReferenceMetricAggregationWorker extends AggregationWork
         Integer frontApplicationId = instanceCacheService.getApplicationId(instanceReferenceMetric.getFrontInstanceId());
         Integer behindApplicationId = instanceCacheService.getApplicationId(instanceReferenceMetric.getBehindInstanceId());
 
-        String id = instanceReferenceMetric.getTimeBucket() + Const.ID_SPLIT + frontApplicationId + Const.ID_SPLIT + behindApplicationId;
+        String id = instanceReferenceMetric.getTimeBucket()
+            + Const.ID_SPLIT + frontApplicationId
+            + Const.ID_SPLIT + behindApplicationId
+            + Const.ID_SPLIT + instanceReferenceMetric.getSourceValue();
 
         ApplicationReferenceMetric applicationReferenceMetric = new ApplicationReferenceMetric(id);
         applicationReferenceMetric.setFrontApplicationId(frontApplicationId);
         applicationReferenceMetric.setBehindApplicationId(behindApplicationId);
+        applicationReferenceMetric.setSourceValue(instanceReferenceMetric.getSourceValue());
 
         applicationReferenceMetric.setTransactionCalls(instanceReferenceMetric.getTransactionCalls());
         applicationReferenceMetric.setTransactionErrorCalls(instanceReferenceMetric.getTransactionErrorCalls());