fix: [torrust#1543] return always in API the downloads number from tracker-core

The tracker-core always has the metric alhoutght it can be persisted or
not. When it's not persisted, it contains the number of downloads during
the session.

On the other hand, the `torrent-repository` metri uses labels, so you
have to sum all values for all labels to get the total.

```
torrent_repository_torrents_downloads_total{peer_role="seeder"} 1
tracker_core_persistent_torrents_downloads_total{} 1
```

Author: josecelano

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

@@ -10,7 +10,6 @@ use bittorrent_udp_tracker_core::services::banning::BanService;
 use serde::Deserialize;
 use tokio::sync::RwLock;
 use torrust_rest_tracker_api_core::statistics::services::{get_labeled_metrics, get_metrics};
-use torrust_tracker_configuration::Core;
 
 use super::responses::{labeled_metrics_response, labeled_stats_response, metrics_response, stats_response};
 
@@ -41,10 +40,8 @@ pub struct QueryParams {
 #[allow(clippy::type_complexity)]
 pub async fn get_stats_handler(
     State(state): State<(
-        Arc<Core>,
         Arc<InMemoryTorrentRepository>,
         Arc<RwLock<BanService>>,
-        Arc<torrust_tracker_torrent_repository::statistics::repository::Repository>,
         Arc<bittorrent_tracker_core::statistics::repository::Repository>,
         Arc<bittorrent_http_tracker_core::statistics::repository::Repository>,
         Arc<torrust_udp_tracker_server::statistics::repository::Repository>,
@@ -57,8 +54,6 @@ pub async fn get_stats_handler(
         state.2.clone(),
         state.3.clone(),
         state.4.clone(),
-        state.5.clone(),
-        state.6.clone(),
     )
     .await;
 

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

@@ -17,10 +17,8 @@ pub fn add(prefix: &str, router: Router, http_api_container: &Arc<TrackerHttpApi
         .route(
             &format!("{prefix}/stats"),
             get(get_stats_handler).with_state((
-                http_api_container.tracker_core_container.core_config.clone(),
                 http_api_container.tracker_core_container.in_memory_torrent_repository.clone(),
                 http_api_container.ban_service.clone(),
-                http_api_container.torrent_repository_container.stats_repository.clone(),
                 http_api_container.tracker_core_container.stats_repository.clone(),
                 http_api_container.http_stats_repository.clone(),
                 http_api_container.udp_server_stats_repository.clone(),

packages/rest-tracker-api-core/src/statistics/services.rs

@@ -1,15 +1,10 @@
 use std::sync::Arc;
 
-use bittorrent_tracker_core::statistics::TRACKER_CORE_PERSISTENT_TORRENTS_DOWNLOADS_TOTAL;
 use bittorrent_tracker_core::torrent::repository::in_memory::InMemoryTorrentRepository;
 use bittorrent_udp_tracker_core::services::banning::BanService;
 use bittorrent_udp_tracker_core::{self};
 use tokio::sync::RwLock;
-use torrust_tracker_configuration::Core;
-use torrust_tracker_metrics::label::LabelSet;
 use torrust_tracker_metrics::metric_collection::MetricCollection;
-use torrust_tracker_metrics::metric_name;
-use torrust_tracker_torrent_repository::statistics::TORRENT_REPOSITORY_TORRENTS_DOWNLOADS_TOTAL;
 use torrust_udp_tracker_server::statistics as udp_server_statistics;
 
 use super::metrics::TorrentsMetrics;
@@ -31,64 +26,27 @@ pub struct TrackerMetrics {
 
 /// It returns all the [`TrackerMetrics`]
 pub async fn get_metrics(
-    core_config: Arc<Core>,
     in_memory_torrent_repository: Arc<InMemoryTorrentRepository>,
     ban_service: Arc<RwLock<BanService>>,
-    torrent_repository_stats_repository: Arc<torrust_tracker_torrent_repository::statistics::repository::Repository>,
     tracker_core_stats_repository: Arc<bittorrent_tracker_core::statistics::repository::Repository>,
     http_stats_repository: Arc<bittorrent_http_tracker_core::statistics::repository::Repository>,
     udp_server_stats_repository: Arc<udp_server_statistics::repository::Repository>,
 ) -> TrackerMetrics {
     TrackerMetrics {
-        torrents_metrics: get_torrents_metrics(
-            core_config,
-            in_memory_torrent_repository,
-            torrent_repository_stats_repository,
-            tracker_core_stats_repository,
-        )
-        .await,
+        torrents_metrics: get_torrents_metrics(in_memory_torrent_repository, tracker_core_stats_repository).await,
         protocol_metrics: get_protocol_metrics(ban_service, http_stats_repository, udp_server_stats_repository).await,
     }
 }
 
 async fn get_torrents_metrics(
-    core_config: Arc<Core>,
     in_memory_torrent_repository: Arc<InMemoryTorrentRepository>,
-    torrent_repository_stats_repository: Arc<torrust_tracker_torrent_repository::statistics::repository::Repository>,
+
     tracker_core_stats_repository: Arc<bittorrent_tracker_core::statistics::repository::Repository>,
 ) -> TorrentsMetrics {
     let aggregate_active_swarm_metadata = in_memory_torrent_repository.get_aggregate_swarm_metadata().await;
 
-    let total_downloaded = if core_config.tracker_policy.persistent_torrent_completed_stat {
-        let metrics = tracker_core_stats_repository.get_metrics().await;
-
-        let downloads = metrics.metric_collection.get_counter_value(
-            &metric_name!(TRACKER_CORE_PERSISTENT_TORRENTS_DOWNLOADS_TOTAL),
-            &LabelSet::default(),
-        );
-
-        if let Some(downloads) = downloads {
-            downloads.value()
-        } else {
-            0
-        }
-    } else {
-        let metrics = torrent_repository_stats_repository.get_metrics().await;
-
-        let downloads = metrics.metric_collection.get_counter_value(
-            &metric_name!(TORRENT_REPOSITORY_TORRENTS_DOWNLOADS_TOTAL),
-            &LabelSet::default(),
-        );
-
-        if let Some(downloads) = downloads {
-            downloads.value()
-        } else {
-            0
-        }
-    };
-
     let mut torrents_metrics: TorrentsMetrics = aggregate_active_swarm_metadata.into();
-    torrents_metrics.total_downloaded = total_downloaded;
+    torrents_metrics.total_downloaded = tracker_core_stats_repository.get_torrents_downloads_total().await;
 
     torrents_metrics
 }
@@ -152,7 +110,6 @@ pub struct TrackerLabeledMetrics {
 ///
 /// Will panic if the metrics cannot be merged. This could happen if the
 /// packages are producing duplicate metric names, for example.
-#[allow(deprecated)]
 pub async fn get_labeled_metrics(
     in_memory_torrent_repository: Arc<InMemoryTorrentRepository>,
     ban_service: Arc<RwLock<BanService>>,
@@ -245,10 +202,8 @@ mod tests {
         let udp_server_stats_repository = Arc::new(torrust_udp_tracker_server::statistics::repository::Repository::new());
 
         let tracker_metrics = get_metrics(
-            core_config,
             tracker_core_container.in_memory_torrent_repository.clone(),
             ban_service.clone(),
-            torrent_repository_container.stats_repository.clone(),
             tracker_core_container.stats_repository.clone(),
             http_stats_repository.clone(),
             udp_server_stats_repository.clone(),

packages/torrent-repository/src/statistics/mod.rs

@@ -14,7 +14,7 @@ const TORRENT_REPOSITORY_TORRENTS_ADDED_TOTAL: &str = "torrent_repository_torren
 const TORRENT_REPOSITORY_TORRENTS_REMOVED_TOTAL: &str = "torrent_repository_torrents_removed_total";
 
 const TORRENT_REPOSITORY_TORRENTS_TOTAL: &str = "torrent_repository_torrents_total";
-pub const TORRENT_REPOSITORY_TORRENTS_DOWNLOADS_TOTAL: &str = "torrent_repository_torrents_downloads_total";
+const TORRENT_REPOSITORY_TORRENTS_DOWNLOADS_TOTAL: &str = "torrent_repository_torrents_downloads_total";
 const TORRENT_REPOSITORY_TORRENTS_INACTIVE_TOTAL: &str = "torrent_repository_torrents_inactive_total";
 
 // Peers metrics

packages/tracker-client/src/http/client/requests/announce.rs

@@ -102,7 +102,7 @@ impl QueryBuilder {
             peer_id: PeerId(*b"-qB00000000000000001").0,
             port: 17548,
             left: 0,
-            event: Some(Event::Completed),
+            event: Some(Event::Started),
             compact: Some(Compact::NotAccepted),
         };
         Self {

packages/tracker-core/src/statistics/mod.rs

@@ -10,7 +10,7 @@ use torrust_tracker_metrics::unit::Unit;
 
 // Torrent metrics
 
-pub const TRACKER_CORE_PERSISTENT_TORRENTS_DOWNLOADS_TOTAL: &str = "tracker_core_persistent_torrents_downloads_total";
+const TRACKER_CORE_PERSISTENT_TORRENTS_DOWNLOADS_TOTAL: &str = "tracker_core_persistent_torrents_downloads_total";
 
 #[must_use]
 pub fn describe_metrics() -> Metrics {

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

@@ -4,10 +4,11 @@ use tokio::sync::{RwLock, RwLockReadGuard};
 use torrust_tracker_metrics::label::LabelSet;
 use torrust_tracker_metrics::metric::MetricName;
 use torrust_tracker_metrics::metric_collection::Error;
+use torrust_tracker_metrics::metric_name;
 use torrust_tracker_primitives::DurationSinceUnixEpoch;
 
-use super::describe_metrics;
 use super::metrics::Metrics;
+use super::{describe_metrics, TRACKER_CORE_PERSISTENT_TORRENTS_DOWNLOADS_TOTAL};
 
 /// A repository for the torrent repository metrics.
 #[derive(Clone)]
@@ -154,4 +155,22 @@ impl Repository {
 
         result
     }
+
+    /// Get the total number of torrent downloads.
+    ///
+    /// The value is persisted in database if persistence for downloads metrics is enabled.
+    pub async fn get_torrents_downloads_total(&self) -> u64 {
+        let metrics = self.get_metrics().await;
+
+        let downloads = metrics.metric_collection.get_counter_value(
+            &metric_name!(TRACKER_CORE_PERSISTENT_TORRENTS_DOWNLOADS_TOTAL),
+            &LabelSet::default(),
+        );
+
+        if let Some(downloads) = downloads {
+            downloads.value()
+        } else {
+            0
+        }
+    }
 }