From cee7c7151673731fe0221ac7a7a13317ef430918 Mon Sep 17 00:00:00 2001
From: peng-yongsheng <8082209@qq.com>
Date: Wed, 3 Jan 2018 14:50:58 +0800
Subject: [PATCH] Service metric test ok.

---
 .../worker/service/ServiceMetricAggregationWorker.java   | 9 ++++++++-
 .../service/ServiceReferenceMetricSpanListener.java      | 4 ++--
 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/service/ServiceMetricAggregationWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/ServiceMetricAggregationWorker.java
index b110005e7..5930b2786 100644
--- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/ServiceMetricAggregationWorker.java
+++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/ServiceMetricAggregationWorker.java
@@ -42,8 +42,15 @@ public class ServiceMetricAggregationWorker extends AggregationWorker<ServiceRef
     @Override protected ServiceMetric transform(ServiceReferenceMetric serviceReferenceMetric) {
         Integer serviceId = serviceReferenceMetric.getBehindServiceId();
         Long timeBucket = serviceReferenceMetric.getTimeBucket();
-        ServiceMetric serviceMetric = new ServiceMetric(String.valueOf(timeBucket) + Const.ID_SPLIT + String.valueOf(serviceId));
+        Integer sourceValue = serviceReferenceMetric.getSourceValue();
+
+        String id = String.valueOf(timeBucket) + Const.ID_SPLIT + String.valueOf(serviceId) + Const.ID_SPLIT + String.valueOf(sourceValue);
+
+        ServiceMetric serviceMetric = new ServiceMetric(id);
+        serviceMetric.setApplicationId(serviceReferenceMetric.getBehindApplicationId());
+        serviceMetric.setInstanceId(serviceReferenceMetric.getBehindInstanceId());
         serviceMetric.setServiceId(serviceId);
+        serviceMetric.setSourceValue(sourceValue);
 
         serviceMetric.setTransactionCalls(serviceReferenceMetric.getTransactionCalls());
         serviceMetric.setTransactionDurationSum(serviceReferenceMetric.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/service/ServiceReferenceMetricSpanListener.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/ServiceReferenceMetricSpanListener.java
index fe23c5b7b..1f7ace13d 100644
--- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/ServiceReferenceMetricSpanListener.java
+++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/ServiceReferenceMetricSpanListener.java
@@ -152,7 +152,7 @@ public class ServiceReferenceMetricSpanListener implements FirstSpanListener, En
         logger.debug("service reference listener build");
         Graph<ServiceReferenceMetric> graph = GraphManager.INSTANCE.findGraph(MetricGraphIdDefine.SERVICE_REFERENCE_METRIC_GRAPH_ID, ServiceReferenceMetric.class);
         entryReferenceMetric.forEach(serviceReferenceMetric -> {
-            String id = timeBucket + Const.ID_SPLIT + serviceReferenceMetric.getFrontServiceId() + Const.ID_SPLIT + serviceReferenceMetric.getBehindServiceId();
+            String id = timeBucket + Const.ID_SPLIT + serviceReferenceMetric.getFrontServiceId() + Const.ID_SPLIT + serviceReferenceMetric.getBehindServiceId() + Const.ID_SPLIT + serviceReferenceMetric.getSourceValue();
 
             serviceReferenceMetric.setId(id);
             serviceReferenceMetric.setTimeBucket(timeBucket);
@@ -168,7 +168,7 @@ public class ServiceReferenceMetricSpanListener implements FirstSpanListener, En
                 serviceReferenceMetric.setFrontServiceId(Const.NONE_SERVICE_ID);
             }
 
-            String id = timeBucket + Const.ID_SPLIT + serviceReferenceMetric.getFrontServiceId() + Const.ID_SPLIT + serviceReferenceMetric.getBehindServiceId();
+            String id = timeBucket + Const.ID_SPLIT + serviceReferenceMetric.getFrontServiceId() + Const.ID_SPLIT + serviceReferenceMetric.getBehindServiceId() + Const.ID_SPLIT + serviceReferenceMetric.getSourceValue();
             serviceReferenceMetric.setId(id);
             serviceReferenceMetric.setTimeBucket(timeBucket);