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

Fix meter value not correct in some MAL function (#10197)

This commit is contained in:
mrproliu 2022-12-23 17:54:49 +08:00 committed by GitHub
parent 66234d52b2
commit 449b249559
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,6 +60,7 @@
* Fix ServiceMeshServiceDispatcher overwrite ServiceDispatcher debug file when open SW_OAL_ENGINE_DEBUG.
* Use `groupBy` and `in` operators to optimize topology query for BanyanDB storage plugin.
* Support server status watcher for `MetricsPersistentWorker` to check the metrics whether required initialization.
* Fix the meter value are not correct when using `sumPerMinLabeld` or `sumHistogramPercentile` MAL function.
#### UI

12
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sum/SumHistogramPercentileFunction.java
View File

@ -233,9 +233,9 @@ public abstract class SumHistogramPercentileFunction extends Meter implements Ac
SumHistogramPercentileFunction metrics = (SumHistogramPercentileFunction) createNew();
metrics.setEntityId(getEntityId());
metrics.setTimeBucket(toTimeBucketInHour());
metrics.setSummation(getSummation());
metrics.setRanks(getRanks());
metrics.setPercentileValues(getPercentileValues());
metrics.getSummation().copyFrom(getSummation());
metrics.getRanks().copyFrom(getRanks());
metrics.getPercentileValues().copyFrom(getPercentileValues());
return metrics;
}
@ -244,9 +244,9 @@ public abstract class SumHistogramPercentileFunction extends Meter implements Ac
SumHistogramPercentileFunction metrics = (SumHistogramPercentileFunction) createNew();
metrics.setEntityId(getEntityId());
metrics.setTimeBucket(toTimeBucketInDay());
metrics.setSummation(getSummation());
metrics.setRanks(getRanks());
metrics.setPercentileValues(getPercentileValues());
metrics.getSummation().copyFrom(getSummation());
metrics.getRanks().copyFrom(getRanks());
metrics.getPercentileValues().copyFrom(getPercentileValues());
return metrics;
}

4
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sumpermin/SumPerMinLabeledFunction.java
View File

@ -108,7 +108,7 @@ public abstract class SumPerMinLabeledFunction extends Meter implements Acceptab
metrics.setEntityId(getEntityId());
metrics.setTimeBucket(toTimeBucketInHour());
metrics.setServiceId(getServiceId());
metrics.setTotal(getTotal());
metrics.getTotal().copyFrom(getTotal());
return metrics;
}
@ -118,7 +118,7 @@ public abstract class SumPerMinLabeledFunction extends Meter implements Acceptab
metrics.setEntityId(getEntityId());
metrics.setTimeBucket(toTimeBucketInDay());
metrics.setServiceId(getServiceId());
metrics.setTotal(getTotal());
metrics.getTotal().copyFrom(getTotal());
return metrics;
}