You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2019/12/13 08:11:43 UTC
[skywalking] branch master updated: Remove client side endpoint
register of service mesh (#4054)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 16d7782 Remove client side endpoint register of service mesh (#4054)
16d7782 is described below
commit 16d7782a5cf38678240ccef2c04b8b9ae75ed65a
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Fri Dec 13 16:11:33 2019 +0800
Remove client side endpoint register of service mesh (#4054)
---
.../receiver/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 f3ea308..e00124f 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;
}