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

Polish mesh data dispatcher: don't generate Instance/Endpoint metrics if they are empty. (#12762)

This commit is contained in:
Wan Kai 2024-11-12 15:11:00 +08:00 committed by GitHub
parent 9e36eaccb4
commit 5c5274b93a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en/changes/changes.md
View File

@ -18,6 +18,7 @@
* The index type `BanyanDB.IndexRule.IndexType#TREE` is removed. All indices are using `IndexType#INVERTED` now.
* Add max query size settings to BanyanDB.
* Fix "BanyanDBTraceQueryDAO.queryBasicTraces" doesn't support querying by "trace_id".
* Polish mesh data dispatcher: don't generate Instance/Endpoint metrics if they are empty.
#### UI

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

@ -167,15 +167,21 @@ public class TelemetryDataDispatcher {
if (org.apache.skywalking.apm.network.common.v3.DetectPoint.server.equals(metrics.getDetectPoint())) {
toTCPService(metrics, minuteTimeBucket);
toTCPServiceInstance(metrics, minuteTimeBucket);
toTCPServiceInstanceTraffic(metrics, minuteTimeBucket);
// Don't generate instance metrics, if no dest instance.
if (StringUtil.isNotEmpty(metrics.getDestServiceInstance())) {
toTCPServiceInstance(metrics, minuteTimeBucket);
toTCPServiceInstanceTraffic(metrics, minuteTimeBucket);
}
}
String sourceService = metrics.getSourceServiceName();
// Don't generate relation, if no source.
if (StringUtil.isNotEmpty(sourceService)) {
toTCPServiceRelation(metrics, minuteTimeBucket);
toTCPServiceInstanceRelation(metrics, minuteTimeBucket);
// Don't generate instance relation, if no source instance.
if (StringUtil.isNotEmpty(metrics.getSourceServiceInstance())) {
toTCPServiceInstanceRelation(metrics, minuteTimeBucket);
}
}
}
@ -184,16 +190,25 @@ public class TelemetryDataDispatcher {
if (org.apache.skywalking.apm.network.common.v3.DetectPoint.server.equals(metrics.getDetectPoint())) {
toService(metrics, minuteTimeBucket);
toServiceInstance(metrics, minuteTimeBucket);
toServiceInstanceTraffic(metrics, minuteTimeBucket);
toEndpoint(metrics, minuteTimeBucket);
// Don't generate instance metrics, if no dest instance.
if (StringUtil.isNotEmpty(metrics.getDestServiceInstance())) {
toServiceInstance(metrics, minuteTimeBucket);
toServiceInstanceTraffic(metrics, minuteTimeBucket);
}
// Don't generate endpoint metrics, if no endpoint.
if (StringUtil.isNotEmpty(metrics.getEndpoint())) {
toEndpoint(metrics, minuteTimeBucket);
}
}
String sourceService = metrics.getSourceServiceName();
// Don't generate relation, if no source.
if (StringUtil.isNotEmpty(sourceService)) {
toServiceRelation(metrics, minuteTimeBucket);
toServiceInstanceRelation(metrics, minuteTimeBucket);
// Don't generate instance relation, if no source instance.
if (StringUtil.isNotEmpty(metrics.getSourceServiceInstance())) {
toServiceInstanceRelation(metrics, minuteTimeBucket);
}
}
}