Propagate PCLF test_case to kExperimentalTestNameMetadataKey.

Follow-up of https://webrtc-review.googlesource.com/c/src/+/287221,
instead of asking GTest for the test suite and the test name, let's
propagate the test case passed by the user of PCLF.

Bug: b/237982523, webrtc:14757
Change-Id: Ia2a6ed4781f8c53c25b0006b8c7483e08ecead26
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/287126
Auto-Submit: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#38867}
This commit is contained in:
Mirko Bonadei 2022-12-10 11:35:29 +01:00 committed by WebRTC LUCI CQ
parent 72f500227e
commit 74e6f5b10c
7 changed files with 99 additions and 109 deletions

View File

@ -136,8 +136,7 @@ void DefaultAudioQualityAnalyzer::Stop() {
{MetricMetadataKey::kAudioStreamMetadataKey, item.first},
{MetricMetadataKey::kPeerMetadataKey, stream_info.receiver_peer},
{MetricMetadataKey::kReceiverMetadataKey, stream_info.receiver_peer},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}};
{MetricMetadataKey::kExperimentalTestNameMetadataKey, test_case_name_}};
metrics_logger_->LogMetric("expand_rate", GetTestCaseName(item.first),
item.second.expand_rate, Unit::kUnitless,

View File

@ -940,8 +940,7 @@ void DefaultVideoQualityAnalyzer::ReportResults() {
metrics_logger_->LogSingleValueMetric(
"cpu_usage_%", test_label_, GetCpuUsagePercent(), Unit::kUnitless,
ImprovementDirection::kSmallerIsBetter,
{{MetricMetadataKey::kExperimentalTestNameMetadataKey,
webrtc_pc_e2e::GetCurrentTestName()}});
{{MetricMetadataKey::kExperimentalTestNameMetadataKey, test_label_}});
LogFrameCounters("Global", frame_counters_);
if (!unknown_sender_frame_counters_.empty()) {
RTC_LOG(LS_INFO) << "Received frame counters with unknown frame id:";
@ -1039,8 +1038,7 @@ void DefaultVideoQualityAnalyzer::ReportResults(
{MetricMetadataKey::kVideoStreamMetadataKey, streams_.name(key.stream)},
{MetricMetadataKey::kSenderMetadataKey, peers_->name(key.sender)},
{MetricMetadataKey::kReceiverMetadataKey, peers_->name(key.receiver)},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
webrtc_pc_e2e::GetCurrentTestName()}};
{MetricMetadataKey::kExperimentalTestNameMetadataKey, test_label_}};
double sum_squared_interframe_delays_secs = 0;
Timestamp video_start_time = Timestamp::PlusInfinity();

View File

@ -139,8 +139,7 @@ void VideoQualityMetricsReporter::ReportVideoBweResults(
// TODO(bugs.webrtc.org/14757): Remove kExperimentalTestNameMetadataKey.
std::map<std::string, std::string> metric_metadata{
{MetricMetadataKey::kPeerMetadataKey, peer_name},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}};
{MetricMetadataKey::kExperimentalTestNameMetadataKey, test_case_name_}};
metrics_logger_->LogMetric(
"available_send_bandwidth", test_case_name,

View File

@ -123,8 +123,7 @@ void CrossMediaMetricsReporter::StopAndReportResults() {
pair.second.audio_stream_info.receiver_peer},
{MetricMetadataKey::kReceiverMetadataKey,
pair.second.audio_stream_info.receiver_peer},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}};
{MetricMetadataKey::kExperimentalTestNameMetadataKey, test_case_name_}};
metrics_logger_->LogMetric(
"audio_ahead_ms",
GetTestCaseName(pair.second.audio_stream_info.stream_label, sync_group),
@ -141,8 +140,7 @@ void CrossMediaMetricsReporter::StopAndReportResults() {
pair.second.video_stream_info.receiver_peer},
{MetricMetadataKey::kReceiverMetadataKey,
pair.second.video_stream_info.receiver_peer},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}};
{MetricMetadataKey::kExperimentalTestNameMetadataKey, test_case_name_}};
metrics_logger_->LogMetric(
"video_ahead_ms",
GetTestCaseName(pair.second.video_stream_info.stream_label, sync_group),

View File

@ -746,15 +746,13 @@ void PeerConnectionE2EQualityTest::ReportGeneralTestResults() {
*alice_->params().name + "_connected", test_case_name_, alice_connected_,
Unit::kUnitless, ImprovementDirection::kBiggerIsBetter,
{{MetricMetadataKey::kPeerMetadataKey, *alice_->params().name},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}});
{MetricMetadataKey::kExperimentalTestNameMetadataKey, test_case_name_}});
// TODO(bugs.webrtc.org/14757): Remove kExperimentalTestNameMetadataKey.
metrics_logger_->LogSingleValueMetric(
*bob_->params().name + "_connected", test_case_name_, bob_connected_,
Unit::kUnitless, ImprovementDirection::kBiggerIsBetter,
{{MetricMetadataKey::kPeerMetadataKey, *bob_->params().name},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}});
{MetricMetadataKey::kExperimentalTestNameMetadataKey, test_case_name_}});
}
Timestamp PeerConnectionE2EQualityTest::Now() const {

View File

@ -159,7 +159,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
.improvement_direction = ImprovementDirection::kBiggerIsBetter,
.metadata = {{MetricMetadataKey::kPeerMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case",
.name = "bob_connected",
@ -167,7 +167,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
.improvement_direction = ImprovementDirection::kBiggerIsBetter,
.metadata = {{MetricMetadataKey::kPeerMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
// Metrics from DefaultAudioQualityAnalyzer
MetricValidationInfo{
@ -180,7 +180,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kPeerMetadataKey, "bob"},
{MetricMetadataKey::kReceiverMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice_audio",
.name = "accelerate_rate",
@ -191,7 +191,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kPeerMetadataKey, "bob"},
{MetricMetadataKey::kReceiverMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice_audio",
.name = "preemptive_rate",
@ -202,7 +202,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kPeerMetadataKey, "bob"},
{MetricMetadataKey::kReceiverMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice_audio",
.name = "speech_expand_rate",
@ -213,7 +213,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kPeerMetadataKey, "bob"},
{MetricMetadataKey::kReceiverMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice_audio",
.name = "average_jitter_buffer_delay_ms",
@ -224,7 +224,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kPeerMetadataKey, "bob"},
{MetricMetadataKey::kReceiverMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice_audio",
.name = "preferred_buffer_size_ms",
@ -235,7 +235,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kPeerMetadataKey, "bob"},
{MetricMetadataKey::kReceiverMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob_audio",
.name = "expand_rate",
@ -246,7 +246,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kPeerMetadataKey, "alice"},
{MetricMetadataKey::kReceiverMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob_audio",
.name = "accelerate_rate",
@ -257,7 +257,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kPeerMetadataKey, "alice"},
{MetricMetadataKey::kReceiverMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob_audio",
.name = "preemptive_rate",
@ -268,7 +268,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kPeerMetadataKey, "alice"},
{MetricMetadataKey::kReceiverMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob_audio",
.name = "speech_expand_rate",
@ -279,7 +279,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kPeerMetadataKey, "alice"},
{MetricMetadataKey::kReceiverMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob_audio",
.name = "average_jitter_buffer_delay_ms",
@ -290,7 +290,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kPeerMetadataKey, "alice"},
{MetricMetadataKey::kReceiverMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob_audio",
.name = "preferred_buffer_size_ms",
@ -301,7 +301,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kPeerMetadataKey, "alice"},
{MetricMetadataKey::kReceiverMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
// Metrics from DefaultVideoQualityAnalyzer
MetricValidationInfo{
@ -315,7 +315,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "alice"},
{MetricMetadataKey::kReceiverMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice_video",
.name = "ssim",
@ -327,7 +327,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "alice"},
{MetricMetadataKey::kReceiverMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice_video",
.name = "transport_time",
@ -339,7 +339,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "alice"},
{MetricMetadataKey::kReceiverMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice_video",
.name = "total_delay_incl_transport",
@ -351,7 +351,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "alice"},
{MetricMetadataKey::kReceiverMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice_video",
.name = "time_between_rendered_frames",
@ -363,7 +363,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "alice"},
{MetricMetadataKey::kReceiverMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice_video",
.name = "harmonic_framerate",
@ -375,7 +375,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "alice"},
{MetricMetadataKey::kReceiverMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice_video",
.name = "encode_frame_rate",
@ -387,7 +387,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "alice"},
{MetricMetadataKey::kReceiverMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice_video",
.name = "encode_time",
@ -399,7 +399,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "alice"},
{MetricMetadataKey::kReceiverMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice_video",
.name = "time_between_freezes",
@ -411,7 +411,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "alice"},
{MetricMetadataKey::kReceiverMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice_video",
.name = "freeze_time_ms",
@ -423,7 +423,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "alice"},
{MetricMetadataKey::kReceiverMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice_video",
.name = "pixels_per_frame",
@ -435,7 +435,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "alice"},
{MetricMetadataKey::kReceiverMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice_video",
.name = "min_psnr_dB",
@ -447,7 +447,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "alice"},
{MetricMetadataKey::kReceiverMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice_video",
.name = "decode_time",
@ -459,7 +459,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "alice"},
{MetricMetadataKey::kReceiverMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice_video",
.name = "receive_to_render_time",
@ -471,7 +471,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "alice"},
{MetricMetadataKey::kReceiverMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice_video",
.name = "dropped_frames",
@ -483,7 +483,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "alice"},
{MetricMetadataKey::kReceiverMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice_video",
.name = "frames_in_flight",
@ -495,7 +495,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "alice"},
{MetricMetadataKey::kReceiverMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice_video",
.name = "rendered_frames",
@ -507,7 +507,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "alice"},
{MetricMetadataKey::kReceiverMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice_video",
.name = "max_skipped",
@ -519,7 +519,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "alice"},
{MetricMetadataKey::kReceiverMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice_video",
.name = "target_encode_bitrate",
@ -531,7 +531,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "alice"},
{MetricMetadataKey::kReceiverMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice_video",
.name = "qp",
@ -543,7 +543,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "alice"},
{MetricMetadataKey::kReceiverMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice_video",
.name = "actual_encode_bitrate",
@ -555,7 +555,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "alice"},
{MetricMetadataKey::kReceiverMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob_video",
.name = "psnr_dB",
@ -567,7 +567,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "bob"},
{MetricMetadataKey::kReceiverMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob_video",
.name = "ssim",
@ -579,7 +579,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "bob"},
{MetricMetadataKey::kReceiverMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob_video",
.name = "transport_time",
@ -591,7 +591,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "bob"},
{MetricMetadataKey::kReceiverMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob_video",
.name = "total_delay_incl_transport",
@ -603,7 +603,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "bob"},
{MetricMetadataKey::kReceiverMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob_video",
.name = "time_between_rendered_frames",
@ -615,7 +615,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "bob"},
{MetricMetadataKey::kReceiverMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob_video",
.name = "harmonic_framerate",
@ -627,7 +627,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "bob"},
{MetricMetadataKey::kReceiverMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob_video",
.name = "encode_frame_rate",
@ -639,7 +639,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "bob"},
{MetricMetadataKey::kReceiverMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob_video",
.name = "encode_time",
@ -651,7 +651,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "bob"},
{MetricMetadataKey::kReceiverMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob_video",
.name = "time_between_freezes",
@ -663,7 +663,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "bob"},
{MetricMetadataKey::kReceiverMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob_video",
.name = "freeze_time_ms",
@ -675,7 +675,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "bob"},
{MetricMetadataKey::kReceiverMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob_video",
.name = "pixels_per_frame",
@ -687,7 +687,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "bob"},
{MetricMetadataKey::kReceiverMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob_video",
.name = "min_psnr_dB",
@ -699,7 +699,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "bob"},
{MetricMetadataKey::kReceiverMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob_video",
.name = "decode_time",
@ -711,7 +711,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "bob"},
{MetricMetadataKey::kReceiverMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob_video",
.name = "receive_to_render_time",
@ -723,7 +723,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "bob"},
{MetricMetadataKey::kReceiverMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob_video",
.name = "dropped_frames",
@ -735,7 +735,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "bob"},
{MetricMetadataKey::kReceiverMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob_video",
.name = "frames_in_flight",
@ -747,7 +747,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "bob"},
{MetricMetadataKey::kReceiverMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob_video",
.name = "rendered_frames",
@ -759,7 +759,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "bob"},
{MetricMetadataKey::kReceiverMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob_video",
.name = "max_skipped",
@ -771,7 +771,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "bob"},
{MetricMetadataKey::kReceiverMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob_video",
.name = "target_encode_bitrate",
@ -783,7 +783,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "bob"},
{MetricMetadataKey::kReceiverMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob_video",
.name = "actual_encode_bitrate",
@ -795,7 +795,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "bob"},
{MetricMetadataKey::kReceiverMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob_video",
.name = "qp",
@ -807,14 +807,14 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kSenderMetadataKey, "bob"},
{MetricMetadataKey::kReceiverMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case",
.name = "cpu_usage_%",
.unit = Unit::kUnitless,
.improvement_direction = ImprovementDirection::kSmallerIsBetter,
.metadata = {{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
// Metrics from StatsBasedNetworkQualityMetricsReporter
MetricValidationInfo{
@ -824,7 +824,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
.improvement_direction = ImprovementDirection::kNeitherIsBetter,
.metadata = {{MetricMetadataKey::kPeerMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice",
.name = "packets_discarded_no_receiver",
@ -832,7 +832,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
.improvement_direction = ImprovementDirection::kNeitherIsBetter,
.metadata = {{MetricMetadataKey::kPeerMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice",
.name = "payload_bytes_received",
@ -840,7 +840,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
.improvement_direction = ImprovementDirection::kNeitherIsBetter,
.metadata = {{MetricMetadataKey::kPeerMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice",
.name = "payload_bytes_sent",
@ -848,7 +848,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
.improvement_direction = ImprovementDirection::kNeitherIsBetter,
.metadata = {{MetricMetadataKey::kPeerMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice",
.name = "bytes_sent",
@ -856,7 +856,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
.improvement_direction = ImprovementDirection::kNeitherIsBetter,
.metadata = {{MetricMetadataKey::kPeerMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice",
.name = "packets_sent",
@ -864,7 +864,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
.improvement_direction = ImprovementDirection::kNeitherIsBetter,
.metadata = {{MetricMetadataKey::kPeerMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice",
.name = "average_send_rate",
@ -872,7 +872,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
.improvement_direction = ImprovementDirection::kNeitherIsBetter,
.metadata = {{MetricMetadataKey::kPeerMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice",
.name = "bytes_received",
@ -880,7 +880,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
.improvement_direction = ImprovementDirection::kNeitherIsBetter,
.metadata = {{MetricMetadataKey::kPeerMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice",
.name = "packets_received",
@ -888,7 +888,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
.improvement_direction = ImprovementDirection::kNeitherIsBetter,
.metadata = {{MetricMetadataKey::kPeerMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice",
.name = "average_receive_rate",
@ -896,7 +896,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
.improvement_direction = ImprovementDirection::kNeitherIsBetter,
.metadata = {{MetricMetadataKey::kPeerMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice",
.name = "sent_packets_loss",
@ -904,7 +904,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
.improvement_direction = ImprovementDirection::kNeitherIsBetter,
.metadata = {{MetricMetadataKey::kPeerMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob",
.name = "bytes_discarded_no_receiver",
@ -912,7 +912,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
.improvement_direction = ImprovementDirection::kNeitherIsBetter,
.metadata = {{MetricMetadataKey::kPeerMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob",
.name = "packets_discarded_no_receiver",
@ -920,7 +920,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
.improvement_direction = ImprovementDirection::kNeitherIsBetter,
.metadata = {{MetricMetadataKey::kPeerMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob",
.name = "payload_bytes_received",
@ -928,7 +928,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
.improvement_direction = ImprovementDirection::kNeitherIsBetter,
.metadata = {{MetricMetadataKey::kPeerMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob",
.name = "payload_bytes_sent",
@ -936,7 +936,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
.improvement_direction = ImprovementDirection::kNeitherIsBetter,
.metadata = {{MetricMetadataKey::kPeerMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob",
.name = "bytes_sent",
@ -944,7 +944,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
.improvement_direction = ImprovementDirection::kNeitherIsBetter,
.metadata = {{MetricMetadataKey::kPeerMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob",
.name = "packets_sent",
@ -952,7 +952,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
.improvement_direction = ImprovementDirection::kNeitherIsBetter,
.metadata = {{MetricMetadataKey::kPeerMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob",
.name = "average_send_rate",
@ -960,7 +960,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
.improvement_direction = ImprovementDirection::kNeitherIsBetter,
.metadata = {{MetricMetadataKey::kPeerMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob",
.name = "bytes_received",
@ -968,7 +968,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
.improvement_direction = ImprovementDirection::kNeitherIsBetter,
.metadata = {{MetricMetadataKey::kPeerMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob",
.name = "packets_received",
@ -976,7 +976,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
.improvement_direction = ImprovementDirection::kNeitherIsBetter,
.metadata = {{MetricMetadataKey::kPeerMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob",
.name = "average_receive_rate",
@ -984,7 +984,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
.improvement_direction = ImprovementDirection::kNeitherIsBetter,
.metadata = {{MetricMetadataKey::kPeerMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob",
.name = "sent_packets_loss",
@ -992,7 +992,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
.improvement_direction = ImprovementDirection::kNeitherIsBetter,
.metadata = {{MetricMetadataKey::kPeerMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
// Metrics from VideoQualityMetricsReporter
MetricValidationInfo{
@ -1002,7 +1002,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
.improvement_direction = ImprovementDirection::kNeitherIsBetter,
.metadata = {{MetricMetadataKey::kPeerMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice",
.name = "transmission_bitrate",
@ -1010,7 +1010,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
.improvement_direction = ImprovementDirection::kNeitherIsBetter,
.metadata = {{MetricMetadataKey::kPeerMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice",
.name = "retransmission_bitrate",
@ -1018,7 +1018,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
.improvement_direction = ImprovementDirection::kNeitherIsBetter,
.metadata = {{MetricMetadataKey::kPeerMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob",
.name = "available_send_bandwidth",
@ -1026,7 +1026,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
.improvement_direction = ImprovementDirection::kNeitherIsBetter,
.metadata = {{MetricMetadataKey::kPeerMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob",
.name = "transmission_bitrate",
@ -1034,7 +1034,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
.improvement_direction = ImprovementDirection::kNeitherIsBetter,
.metadata = {{MetricMetadataKey::kPeerMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob",
.name = "retransmission_bitrate",
@ -1042,7 +1042,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
.improvement_direction = ImprovementDirection::kNeitherIsBetter,
.metadata = {{MetricMetadataKey::kPeerMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
// Metrics from CrossMediaMetricsReporter
MetricValidationInfo{
@ -1056,7 +1056,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kPeerSyncGroupMetadataKey, "alice"},
{MetricMetadataKey::kReceiverMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/alice_alice_video",
.name = "video_ahead_ms",
@ -1068,7 +1068,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kPeerSyncGroupMetadataKey, "alice"},
{MetricMetadataKey::kReceiverMetadataKey, "bob"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob_bob_audio",
.name = "audio_ahead_ms",
@ -1080,7 +1080,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kPeerSyncGroupMetadataKey, "bob"},
{MetricMetadataKey::kReceiverMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}},
"test_case"}}},
MetricValidationInfo{
.test_case = "test_case/bob_bob_video",
.name = "video_ahead_ms",
@ -1092,7 +1092,7 @@ TEST(PeerConnectionE2EQualityTestMetricNamesTest,
{MetricMetadataKey::kPeerSyncGroupMetadataKey, "bob"},
{MetricMetadataKey::kReceiverMetadataKey, "alice"},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}}}));
"test_case"}}}));
}
} // namespace

View File

@ -373,8 +373,7 @@ void StatsBasedNetworkQualityMetricsReporter::ReportStats(
// TODO(bugs.webrtc.org/14757): Remove kExperimentalTestNameMetadataKey.
std::map<std::string, std::string> metric_metadata{
{MetricMetadataKey::kPeerMetadataKey, pc_label},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}};
{MetricMetadataKey::kExperimentalTestNameMetadataKey, test_case_name_}};
metrics_logger_->LogSingleValueMetric(
"bytes_discarded_no_receiver", GetTestCaseName(pc_label),
network_layer_stats.endpoints_stats.overall_incoming_stats
@ -444,8 +443,7 @@ void StatsBasedNetworkQualityMetricsReporter::LogNetworkLayerStats(
// TODO(bugs.webrtc.org/14757): Remove kExperimentalTestNameMetadataKey.
std::map<std::string, std::string> metric_metadata{
{MetricMetadataKey::kPeerMetadataKey, peer_name},
{MetricMetadataKey::kExperimentalTestNameMetadataKey,
GetCurrentTestName()}};
{MetricMetadataKey::kExperimentalTestNameMetadataKey, test_case_name_}};
rtc::StringBuilder log;
log << "Raw network layer statistic for [" << peer_name << "]:\n"
<< "Local IPs:\n";