Merge branch 'tencentmusic:master' into master

This commit is contained in:
Jun Zhang
2024-11-18 23:11:35 +08:00
committed by GitHub

View File

@@ -117,8 +117,12 @@ public class MetricRatioCalcProcessor implements ExecuteResultProcessor {
CompletableFuture.allOf(metricInfoRoll, metricInfoOver).join();
metricInfo.setName(metricInfoRoll.get().getName());
metricInfo.setValue(metricInfoRoll.get().getValue());
if (metricInfoRoll.get().getName() != null) {
metricInfo.setName(metricInfoRoll.get().getName());
}
if (metricInfoOver.get().getValue() != null) {
metricInfo.setValue(metricInfoRoll.get().getValue());
}
metricInfo.getStatistics().putAll(metricInfoRoll.get().getStatistics());
metricInfo.getStatistics().putAll(metricInfoOver.get().getStatistics());