app,sched: set avg prach delay metric in slots

Signed-off-by: Carlo Galiotto <[email protected]>

Author: carlo-gal

apps/helpers/metrics/json_generators/du_high/scheduler.cpp

@@ -111,7 +111,7 @@ void to_json(nlohmann::json& json, const scheduler_cell_metrics& metrics)
   cell_json["latency_histogram"]       = metrics.latency_histogram;
   cell_json["msg3_nof_ok"]             = metrics.nof_msg3_ok;
   cell_json["msg3_nof_nok"]            = metrics.nof_msg3_nok;
-  cell_json["avg_prach_delay"]         = metrics.avg_prach_delay_ms;
+  cell_json["avg_prach_delay"]         = metrics.avg_prach_delay_slots;
   cell_json["late_dl_harqs"]           = metrics.nof_failed_pdsch_allocs_late_harqs;
   cell_json["late_ul_harqs"]           = metrics.nof_failed_pusch_allocs_late_harqs;
   cell_json["pucch_tot_rb_usage_avg"]  = metrics.pucch_tot_rb_usage_avg;

apps/units/flexible_o_du/o_du_high/du_high/metrics/consumers/scheduler_metrics_consumers.cpp

@@ -237,7 +237,7 @@ void scheduler_cell_metrics_consumer_log::handle_metric(const std::optional<sche
       fmt::format_to(std::back_inserter(buffer), " max_pusch_harq_delay={}ms", max_pusch_delay);
     }
     fmt::format_to(
-        std::back_inserter(buffer), " avg_prach_delay={:.3}", format_unit_or(cell.avg_prach_delay_ms, "ms", "n/a"));
+        std::back_inserter(buffer), " avg_prach_delay_slots={:.3}", format_value_or(cell.avg_prach_delay_slots, "n/a"));
     if (not cell.events.empty()) {
       fmt::format_to(std::back_inserter(buffer), " events=[");
       bool first = true;

include/srsran/scheduler/scheduler_metrics.h

@@ -144,8 +144,8 @@ struct scheduler_cell_metrics {
   unsigned nof_msg3_ok = 0;
   /// Number of MSG3 KOs.
   unsigned nof_msg3_nok = 0;
-  /// Average PRACH delay in ms.
-  std::optional<float> avg_prach_delay_ms;
+  /// Average PRACH delay in slots.
+  std::optional<float> avg_prach_delay_slots;
   /// Number of failed PDSCH allocations due to late HARQs.
   unsigned nof_failed_pdsch_allocs_late_harqs = 0;
   /// Number of failed PUSCH allocations due to late HARQs.

lib/scheduler/logging/scheduler_metrics_handler.cpp

@@ -406,7 +406,7 @@ void cell_metrics_handler::report_metrics()
   next_report->nof_failed_uci_allocs     = data.nof_failed_uci_allocs;
   next_report->nof_msg3_ok               = data.nof_msg3_ok;
   next_report->nof_msg3_nok              = data.nof_msg3_nok;
-  next_report->avg_prach_delay_ms =
+  next_report->avg_prach_delay_slots =
       data.nof_prach_preambles
           ? std::optional{static_cast<float>(data.sum_prach_delay_slots) / static_cast<float>(data.nof_prach_preambles)}
           : std::nullopt;