From 6a49fb2d5ffde0b22cb05793d67c8e2bbe1b1be9 Mon Sep 17 00:00:00 2001 From: Artem Titov Date: Thu, 22 Sep 2022 12:29:42 +0200 Subject: [PATCH] [DVQA] Fix: cpu_usage was exported as cpu_usage_% before Bug: b/246095034 Change-Id: I082865fadf69f11ec05dec32e5ec22deaef98db7 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/276400 Reviewed-by: Mirko Bonadei Commit-Queue: Artem Titov Cr-Commit-Position: refs/heads/main@{#38169} --- .../e2e/analyzer/video/default_video_quality_analyzer.cc | 2 +- .../default_video_quality_analyzer_metric_names_test.cc | 8 ++++---- .../e2e/peer_connection_quality_test_metric_names_test.cc | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/pc/e2e/analyzer/video/default_video_quality_analyzer.cc b/test/pc/e2e/analyzer/video/default_video_quality_analyzer.cc index e206a10dc6..fb294fbbf7 100644 --- a/test/pc/e2e/analyzer/video/default_video_quality_analyzer.cc +++ b/test/pc/e2e/analyzer/video/default_video_quality_analyzer.cc @@ -904,7 +904,7 @@ void DefaultVideoQualityAnalyzer::ReportResults() { ImproveDirection::kSmallerIsBetter); } else { metrics_logger_->LogSingleValueMetric( - "cpu_usage", test_label_, GetCpuUsagePercent(), Unit::kPercent, + "cpu_usage_%", test_label_, GetCpuUsagePercent(), Unit::kUnitless, ImprovementDirection::kSmallerIsBetter); } LogFrameCounters("Global", frame_counters_); diff --git a/test/pc/e2e/analyzer/video/default_video_quality_analyzer_metric_names_test.cc b/test/pc/e2e/analyzer/video/default_video_quality_analyzer_metric_names_test.cc index 560d589d5b..a54bf2f7ad 100644 --- a/test/pc/e2e/analyzer/video/default_video_quality_analyzer_metric_names_test.cc +++ b/test/pc/e2e/analyzer/video/default_video_quality_analyzer_metric_names_test.cc @@ -315,8 +315,8 @@ TEST(DefaultVideoQualityAnalyzerMetricNamesTest, MetricNamesForP2PAreCorrect) { .unit = Unit::kCount, .improvement_direction = ImprovementDirection::kBiggerIsBetter}, MetricValidationInfo{.test_case = "test_case", - .name = "cpu_usage", - .unit = Unit::kPercent, + .name = "cpu_usage_%", + .unit = Unit::kUnitless, .improvement_direction = ImprovementDirection::kSmallerIsBetter})); } @@ -614,8 +614,8 @@ TEST(DefaultVideoQualityAnalyzerMetricNamesTest, .unit = Unit::kCount, .improvement_direction = ImprovementDirection::kBiggerIsBetter}, MetricValidationInfo{.test_case = "test_case", - .name = "cpu_usage", - .unit = Unit::kPercent, + .name = "cpu_usage_%", + .unit = Unit::kUnitless, .improvement_direction = ImprovementDirection::kSmallerIsBetter})); } diff --git a/test/pc/e2e/peer_connection_quality_test_metric_names_test.cc b/test/pc/e2e/peer_connection_quality_test_metric_names_test.cc index 304064a94a..804d089cac 100644 --- a/test/pc/e2e/peer_connection_quality_test_metric_names_test.cc +++ b/test/pc/e2e/peer_connection_quality_test_metric_names_test.cc @@ -426,8 +426,8 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest, .improvement_direction = ImprovementDirection::kNeitherIsBetter}, MetricValidationInfo{ .test_case = "test_case", - .name = "cpu_usage", - .unit = Unit::kPercent, + .name = "cpu_usage_%", + .unit = Unit::kUnitless, .improvement_direction = ImprovementDirection::kSmallerIsBetter}, // Metrics from StatsBasedNetworkQualityMetricsReporter