refactor: [torrust#1403] extract types and rename. WIP

Author: josecelano

packages/axum-rest-tracker-api-server/src/v1/context/stats/resources.rs

@@ -2,7 +2,7 @@
 //! API context.
 use serde::{Deserialize, Serialize};
 use torrust_rest_tracker_api_core::statistics::services::{TrackerLabeledMetrics, TrackerMetrics};
-use torrust_tracker_primitives::metrics::LabeledMetrics;
+use torrust_tracker_primitives::metrics::LabeledMetricCollection;
 
 /// It contains all the statistics generated by the tracker.
 #[derive(Serialize, Deserialize, Debug, PartialEq, Eq)]
@@ -121,7 +121,7 @@ impl From<TrackerMetrics> for Stats {
 #[derive(Serialize, Debug, PartialEq)]
 pub struct LabeledStats {
     // Extendable metrics
-    labeled_metrics: LabeledMetrics,
+    labeled_metrics: LabeledMetricCollection,
 }
 
 impl From<TrackerLabeledMetrics> for LabeledStats {

packages/http-tracker-core/src/statistics/event/handler.rs

@@ -1,6 +1,8 @@
 use std::collections::BTreeMap;
 use std::net::IpAddr;
 
+use torrust_tracker_primitives::metrics::{LabelName, LabelSet, LabelValue, MetricName};
+
 use crate::event::Event;
 use crate::statistics::repository::Repository;
 
@@ -31,12 +33,16 @@ pub async fn handle_event(event: Event, stats_repository: &Repository) {
 
             stats_repository
                 .increase_counter(
-                    "announce_requests_received_total",
-                    &BTreeMap::from([
-                        ("ip_version".to_string(), ip_version),
-                        ("protocol".to_string(), "http".to_string()),
-                        ("url".to_string(), format!("http://{}", connection.server_socket_addr())), // todo: use the actual scheme
-                    ]),
+                    &MetricName::new("announce_requests_received_total"),
+                    &LabelSet::new(BTreeMap::from([
+                        (LabelName::new("ip_version"), LabelValue::new(&ip_version)),
+                        (LabelName::new("protocol"), LabelValue::new("http")),
+                        (
+                            LabelName::new("url"),
+                            // todo: use the actual scheme
+                            LabelValue::new(&format!("http://{}", connection.server_socket_addr())), // // DevSkim: ignore DS137138
+                        ),
+                    ])),
                 )
                 .await;
         }
@@ -61,12 +67,16 @@ pub async fn handle_event(event: Event, stats_repository: &Repository) {
 
             stats_repository
                 .increase_counter(
-                    "scrape_requests_received_total",
-                    &BTreeMap::from([
-                        ("ip_version".to_string(), ip_version),
-                        ("protocol".to_string(), "http".to_string()),
-                        ("url".to_string(), format!("http://{}", connection.server_socket_addr())), // todo: use the actual scheme
-                    ]),
+                    &MetricName::new("scrape_requests_received_total"),
+                    &LabelSet::new(BTreeMap::from([
+                        (LabelName::new("ip_version"), LabelValue::new(&ip_version)),
+                        (LabelName::new("protocol"), LabelValue::new("http")),
+                        (
+                            LabelName::new("url"),
+                            // todo: use the actual scheme
+                            LabelValue::new(&format!("http://{}", connection.server_socket_addr())), // DevSkim: ignore DS137138
+                        ),
+                    ])),
                 )
                 .await;
         }

packages/http-tracker-core/src/statistics/metrics.rs

@@ -1,7 +1,5 @@
-use std::collections::BTreeMap;
-
 use serde::Serialize;
-use torrust_tracker_primitives::metrics::LabeledMetrics;
+use torrust_tracker_primitives::metrics::{LabelSet, LabeledMetricCollection, MetricName};
 
 /// Metrics collected by the tracker.
 #[derive(Debug, Clone, PartialEq, Default, Serialize)]
@@ -18,11 +16,11 @@ pub struct Metrics {
     /// Total number of TCP (HTTP tracker) `scrape` requests from IPv6 peers.
     pub tcp6_scrapes_handled: u64,
 
-    pub labeled_metrics: LabeledMetrics,
+    pub labeled_metrics: LabeledMetricCollection,
 }
 
 impl Metrics {
-    pub fn increase_counter(&mut self, metric_name: &str, metric_labels: &BTreeMap<String, String>) {
-        self.labeled_metrics.increase_counter(metric_name, metric_labels);
+    pub fn increase_counter(&mut self, metric_name: &MetricName, labels: &LabelSet) {
+        self.labeled_metrics.increase_counter(metric_name, labels);
     }
 }

packages/http-tracker-core/src/statistics/repository.rs

@@ -1,7 +1,7 @@
-use std::collections::BTreeMap;
 use std::sync::Arc;
 
 use tokio::sync::{RwLock, RwLockReadGuard};
+use torrust_tracker_primitives::metrics::{LabelSet, MetricName};
 
 use super::metrics::Metrics;
 
@@ -53,9 +53,9 @@ impl Repository {
         drop(stats_lock);
     }
 
-    pub async fn increase_counter(&self, metric_name: &str, metric_labels: &BTreeMap<String, String>) {
+    pub async fn increase_counter(&self, metric_name: &MetricName, labels: &LabelSet) {
         let mut stats_lock = self.stats.write().await;
-        stats_lock.increase_counter(metric_name, metric_labels);
+        stats_lock.increase_counter(metric_name, labels);
         drop(stats_lock);
     }
 }