[incubator-skywalking] branch master updated: Endpoint register to client and server side based on detect point. (#1866)

[pengys]

This is an automated email from the ASF dual-hosted git repository.

pengys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git


The following commit(s) were added to refs/heads/master by this push:
     new 75e4c67  Endpoint register to client and server side based on detect 
point. (#1866)
75e4c67 is described below

commit 75e4c6795237ea402b07c4ad4f23c970f9ad3be3
Author: 吴晟 Wu Sheng <wu.sh...@foxmail.com>
AuthorDate: Fri Nov 2 12:07:25 2018 +0800

    Endpoint register to client and server side based on detect point. (#1866)
---
 .../server/receiver/mesh/ServiceMeshMetricDataDecorator.java   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git 
a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/ServiceMeshMetricDataDecorator.java
 
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/ServiceMeshMetricDataDecorator.java
index 887ecde..3dae80d 100644
--- 
a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/ServiceMeshMetricDataDecorator.java
+++ 
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/ServiceMeshMetricDataDecorator.java
@@ -88,8 +88,14 @@ public class ServiceMeshMetricDataDecorator {
         if (destServiceId != Const.NONE) {
             DetectPoint point = origin.getDetectPoint();
 
-            endpointId = 
CoreRegisterLinker.getEndpointInventoryRegister().getOrCreate(destServiceId, 
endpoint,
-                
org.apache.skywalking.oap.server.core.source.DetectPoint.fromMeshDetectPoint(point));
+            if (DetectPoint.client.equals(point)) {
+                endpointId = 
CoreRegisterLinker.getEndpointInventoryRegister().getOrCreate(sourceServiceId, 
endpoint,
+                    
org.apache.skywalking.oap.server.core.source.DetectPoint.fromMeshDetectPoint(point));
+            } else {
+                endpointId = 
CoreRegisterLinker.getEndpointInventoryRegister().getOrCreate(destServiceId, 
endpoint,
+                    
org.apache.skywalking.oap.server.core.source.DetectPoint.fromMeshDetectPoint(point));
+            }
+
             if (endpointId != Const.NONE) {
             } else {
                 isRegistered = false;