You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2022/01/13 08:35:38 UTC
[skywalking] branch master updated: Set layer to mesh relation. (#8424)
This is an automated email from the ASF dual-hosted git repository.
wusheng 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 ed35f4e Set layer to mesh relation. (#8424)
ed35f4e is described below
commit ed35f4e8453bbb9252742dcdcbff22d7aedad073
Author: wankai123 <wa...@foxmail.com>
AuthorDate: Thu Jan 13 16:35:24 2022 +0800
Set layer to mesh relation. (#8424)
---
CHANGES.md | 1 +
.../skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/CHANGES.md b/CHANGES.md
index 0ffad18..bc88ad2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -27,6 +27,7 @@ Release Notes.
* Bump up grpc to 1.43.2 and protobuf to 3.19.2 to fix CVE-2021-22569.
* Add source layer and dest layer to relation.
* Follow protocol grammar fix `GCPhrase -> GCPhase`.
+* Set layer to mesh relation.
#### UI
diff --git a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java
index 36a4cd8..8126586 100644
--- a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java
+++ b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java
@@ -161,9 +161,11 @@ public class TelemetryDataDispatcher {
ServiceRelation serviceRelation = new ServiceRelation();
serviceRelation.setTimeBucket(minuteTimeBucket);
serviceRelation.setSourceServiceName(metrics.getSourceServiceName());
+ serviceRelation.setSourceLayer(Layer.MESH);
serviceRelation.setSourceNormal(true);
serviceRelation.setSourceServiceInstanceName(metrics.getSourceServiceInstance());
serviceRelation.setDestServiceName(metrics.getDestServiceName());
+ serviceRelation.setDestLayer(Layer.MESH);
serviceRelation.setDestNormal(true);
serviceRelation.setDestServiceInstanceName(metrics.getDestServiceInstance());
serviceRelation.setEndpoint(metrics.getEndpoint());
@@ -207,8 +209,10 @@ public class TelemetryDataDispatcher {
serviceRelation.setTimeBucket(minuteTimeBucket);
serviceRelation.setSourceServiceInstanceName(metrics.getSourceServiceInstance());
serviceRelation.setSourceServiceName(metrics.getSourceServiceName());
+ serviceRelation.setSourceServiceLayer(Layer.MESH);
serviceRelation.setSourceServiceNormal(true);
serviceRelation.setDestServiceInstanceName(metrics.getDestServiceInstance());
+ serviceRelation.setDestServiceLayer(Layer.MESH);
serviceRelation.setDestServiceNormal(true);
serviceRelation.setDestServiceName(metrics.getDestServiceName());
serviceRelation.setEndpoint(metrics.getEndpoint());