diff --git a/CHANGES.md b/CHANGES.md index 0ffad18f2e8e603096a49736fe39ba255d15b7c8..bc88ad2b39ffba5ebfb516f9118792996465d2c6 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 36a4cd821a634a837c2a4eb7e3003ce93f2b1950..8126586e149e4fe415af9b00956ae7aaedd1f875 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());