kazusa
/
skywalking
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set layer to mesh relation. (#8424)

This commit is contained in:
wankai123 2022-01-13 16:35:24 +08:00 committed by GitHub
parent 40bec82e30
commit ed35f4e845
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -27,6 +27,7 @@ Release Notes.
* Bump up grpc to 1.43.2 and protobuf to 3.19.2 to fix CVE-2021-22569. * 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. * Add source layer and dest layer to relation.
* Follow protocol grammar fix `GCPhrase -> GCPhase`. * Follow protocol grammar fix `GCPhrase -> GCPhase`.
* Set layer to mesh relation.
#### UI #### UI

4
oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java
View File

@ -161,9 +161,11 @@ public class TelemetryDataDispatcher {
ServiceRelation serviceRelation = new ServiceRelation(); ServiceRelation serviceRelation = new ServiceRelation();
serviceRelation.setTimeBucket(minuteTimeBucket); serviceRelation.setTimeBucket(minuteTimeBucket);
serviceRelation.setSourceServiceName(metrics.getSourceServiceName()); serviceRelation.setSourceServiceName(metrics.getSourceServiceName());
serviceRelation.setSourceLayer(Layer.MESH);
serviceRelation.setSourceNormal(true); serviceRelation.setSourceNormal(true);
serviceRelation.setSourceServiceInstanceName(metrics.getSourceServiceInstance()); serviceRelation.setSourceServiceInstanceName(metrics.getSourceServiceInstance());
serviceRelation.setDestServiceName(metrics.getDestServiceName()); serviceRelation.setDestServiceName(metrics.getDestServiceName());
serviceRelation.setDestLayer(Layer.MESH);
serviceRelation.setDestNormal(true); serviceRelation.setDestNormal(true);
serviceRelation.setDestServiceInstanceName(metrics.getDestServiceInstance()); serviceRelation.setDestServiceInstanceName(metrics.getDestServiceInstance());
serviceRelation.setEndpoint(metrics.getEndpoint()); serviceRelation.setEndpoint(metrics.getEndpoint());
@ -207,8 +209,10 @@ public class TelemetryDataDispatcher {
serviceRelation.setTimeBucket(minuteTimeBucket); serviceRelation.setTimeBucket(minuteTimeBucket);
serviceRelation.setSourceServiceInstanceName(metrics.getSourceServiceInstance()); serviceRelation.setSourceServiceInstanceName(metrics.getSourceServiceInstance());
serviceRelation.setSourceServiceName(metrics.getSourceServiceName()); serviceRelation.setSourceServiceName(metrics.getSourceServiceName());
serviceRelation.setSourceServiceLayer(Layer.MESH);
serviceRelation.setSourceServiceNormal(true); serviceRelation.setSourceServiceNormal(true);
serviceRelation.setDestServiceInstanceName(metrics.getDestServiceInstance()); serviceRelation.setDestServiceInstanceName(metrics.getDestServiceInstance());
serviceRelation.setDestServiceLayer(Layer.MESH);
serviceRelation.setDestServiceNormal(true); serviceRelation.setDestServiceNormal(true);
serviceRelation.setDestServiceName(metrics.getDestServiceName()); serviceRelation.setDestServiceName(metrics.getDestServiceName());
serviceRelation.setEndpoint(metrics.getEndpoint()); serviceRelation.setEndpoint(metrics.getEndpoint());