metrics: make sure brate is in kbps

Author: alvasMan

apps/services/metrics_log_helper.cpp

@@ -207,7 +207,7 @@ void metrics_log_helper::report_metrics(const rlc_metrics& metrics)
   fmt::format_to(buffer, " du_index={}", metrics.du_index);
   fmt::format_to(buffer, " ue_index={}", metrics.ue_index);
   fmt::format_to(buffer, " rb_id={}", metrics.rb_id);
-  fmt::format_to(buffer, " TX=[{}]", metrics.tx);
+  fmt::format_to(buffer, " TX=[{}]", format_rlc_tx_metrics(metrics.metrics_period, metrics.tx));
   fmt::format_to(buffer, " RX=[{}]  ", metrics.rx);
   logger.debug("{}", to_c_str(buffer));
 }

include/srsran/rlc/rlc_metrics.h

@@ -25,6 +25,7 @@ struct rlc_metrics {
   rlc_tx_metrics tx;
   rlc_rx_metrics rx;
   unsigned       counter;
+  timer_duration metrics_period;
 };
 
 /// \brief Notifier interface used to report RLC metrics.

include/srsran/rlc/rlc_tx_metrics.h

@@ -11,6 +11,7 @@
 #pragma once
 
 #include "srsran/rlc/rlc_config.h"
+#include "srsran/support/format_utils.h"
 #include "fmt/format.h"
 
 namespace srsran {
@@ -75,6 +76,30 @@ class rlc_tx_metrics_interface
   virtual rlc_tx_metrics get_and_reset_metrics() = 0;
   virtual void           reset_metrics()         = 0;
 };
+
+inline std::string format_rlc_tx_metrics(timer_duration metrics_period, const rlc_tx_metrics& m)
+{
+  fmt::memory_buffer buffer;
+  fmt::format_to(
+      buffer,
+      "period={}ms num_sdus={} sdu_rate={}kbps, dropped_sdus={} discarded_sdus={} "
+      "num_pdus_no_segm={} pdu_rate_no_segm={}kbps num_pdus_with_segm={} pdu_rate_with_segm={}kbps num_retx={} "
+      "retx_rate={}kbps ctrl_pdus={} ctrl_rate={}kbps avg_pdu_latency={}",
+      metrics_period.count(),
+      m.num_sdus,
+      (double)m.num_sdu_bytes * 8 / (double)metrics_period.count(),
+      m.num_dropped_sdus,
+      m.num_discarded_sdus,
+      m.num_pdus_no_segmentation,
+      (double)m.num_pdu_bytes_no_segmentation * 8 / (double)metrics_period.count(),
+      m.mode_specific.am.num_pdus_with_segmentation,
+      (double)m.mode_specific.am.num_pdu_bytes_with_segmentation * 8 / (double)metrics_period.count(),
+      m.mode_specific.am.num_retx_pdus,
+      (double)m.mode_specific.am.num_retx_pdu_bytes * 8 / (double)metrics_period.count(),
+      m.mode_specific.am.num_ctrl_pdus,
+      (double)m.mode_specific.am.num_ctrl_pdu_bytes * 8 / (double)metrics_period.count());
+  return to_c_str(buffer);
+}
 } // namespace srsran
 
 namespace fmt {

lib/rlc/rlc_base_entity.h

@@ -101,7 +101,8 @@ class rlc_base_entity : public rlc_entity
 
   void push_metrics()
   {
-    rlc_metrics m = get_metrics();
+    rlc_metrics m    = get_metrics();
+    m.metrics_period = metrics_period;
     if (rlc_metrics_notif) {
       rlc_metrics_notif->report_metrics(m);
     }