From 16d7782a5cf38678240ccef2c04b8b9ae75ed65a Mon Sep 17 00:00:00 2001 From: Gao Hongtao Date: Fri, 13 Dec 2019 16:11:33 +0800 Subject: [PATCH] Remove client side endpoint register of service mesh (#4054) --- .../mesh/ServiceMeshMetricDataDecorator.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 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 f3ea308bd5..e00124f6c8 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 @@ -95,24 +95,15 @@ public class ServiceMeshMetricDataDecorator { } String endpoint = origin.getEndpoint(); + // Service mesh doesn't register client side endpoint. DetectPoint point = origin.getDetectPoint(); - if (DetectPoint.client.equals(point)) { - if (sourceServiceId != Const.NONE) { - endpointId = CoreRegisterLinker.getEndpointInventoryRegister().getOrCreate(sourceServiceId, endpoint, - org.apache.skywalking.oap.server.core.source.DetectPoint.fromNetworkProtocolDetectPoint(point)); - } - } else { + if (DetectPoint.server.equals(point)) { if (destServiceId != Const.NONE) { endpointId = CoreRegisterLinker.getEndpointInventoryRegister().getOrCreate(destServiceId, endpoint, org.apache.skywalking.oap.server.core.source.DetectPoint.fromNetworkProtocolDetectPoint(point)); } } - if (endpointId != Const.NONE) { - } else { - isRegistered = false; - } - return isRegistered; } -- GitLab