fix: [torrust#1543] the downloads counter values returned in the API

It now returns the persisted value when available (stats persistence
enabled).

Author: josecelano

Cargo.lock

@@ -10,6 +10,7 @@ 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};
 
@@ -40,14 +41,26 @@ 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>,
     )>,
     params: Query<QueryParams>,
 ) -> Response {
-    let metrics = get_metrics(state.0.clone(), state.1.clone(), state.2.clone(), state.3.clone()).await;
+    let metrics = get_metrics(
+        state.0.clone(),
+        state.1.clone(),
+        state.2.clone(),
+        state.3.clone(),
+        state.4.clone(),
+        state.5.clone(),
+        state.6.clone(),
+    )
+    .await;
 
     match params.0.format {
         Some(format) => match format {

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

@@ -17,8 +17,11 @@ 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/axum-rest-tracker-api-server/src/v1/context/stats/routes.rs

@@ -25,4 +25,5 @@ torrust-tracker-torrent-repository = { version = "3.0.0-develop", path = "../tor
 torrust-udp-tracker-server = { version = "3.0.0-develop", path = "../udp-tracker-server" }
 
 [dev-dependencies]
+torrust-tracker-events = { version = "3.0.0-develop", path = "../events" }
 torrust-tracker-test-helpers = { version = "3.0.0-develop", path = "../test-helpers" }

packages/rest-tracker-api-core/Cargo.toml

@@ -1,11 +1,16 @@
 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_primitives::swarm_metadata::AggregateActiveSwarmMetadata;
+use torrust_tracker_torrent_repository::statistics::TORRENT_REPOSITORY_TORRENTS_DOWNLOADS_TOTAL;
 use torrust_udp_tracker_server::statistics as udp_server_statistics;
 
 use crate::statistics::metrics::Metrics;
@@ -27,16 +32,50 @@ pub struct TrackerMetrics {
 /// It returns all the [`TrackerMetrics`]
 #[allow(deprecated)]
 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 {
-    let torrents_metrics = in_memory_torrent_repository.get_aggregate_swarm_metadata().await;
+    let aggregate_active_swarm_metadata = in_memory_torrent_repository.get_aggregate_swarm_metadata().await;
     let udp_banned_ips_total = ban_service.read().await.get_banned_ips_total();
     let http_stats = http_stats_repository.get_stats().await;
     let udp_server_stats = udp_server_stats_repository.get_stats().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 = aggregate_active_swarm_metadata;
+    torrents_metrics.total_downloaded = total_downloaded;
+
     // For backward compatibility we keep the `tcp4_connections_handled` and
     // `tcp6_connections_handled` metrics. They don't make sense for the HTTP
     // tracker, but we keep them for now. In new major versions we should remove
@@ -138,14 +177,16 @@ mod tests {
     use bittorrent_http_tracker_core::event::sender::Broadcaster;
     use bittorrent_http_tracker_core::statistics::event::listener::run_event_listener;
     use bittorrent_http_tracker_core::statistics::repository::Repository;
-    use bittorrent_tracker_core::torrent::repository::in_memory::InMemoryTorrentRepository;
+    use bittorrent_tracker_core::container::TrackerCoreContainer;
     use bittorrent_tracker_core::{self};
     use bittorrent_udp_tracker_core::services::banning::BanService;
     use bittorrent_udp_tracker_core::MAX_CONNECTION_ID_ERRORS_PER_IP;
     use tokio::sync::RwLock;
     use torrust_tracker_configuration::Configuration;
+    use torrust_tracker_events::bus::SenderStatus;
     use torrust_tracker_primitives::swarm_metadata::AggregateActiveSwarmMetadata;
     use torrust_tracker_test_helpers::configuration;
+    use torrust_tracker_torrent_repository::container::TorrentRepositoryContainer;
 
     use crate::statistics::metrics::Metrics;
     use crate::statistics::services::{get_metrics, TrackerMetrics};
@@ -157,8 +198,12 @@ mod tests {
     #[tokio::test]
     async fn the_statistics_service_should_return_the_tracker_metrics() {
         let config = tracker_configuration();
+        let core_config = Arc::new(config.core.clone());
+
+        let torrent_repository_container = Arc::new(TorrentRepositoryContainer::initialize(SenderStatus::Enabled));
+
+        let tracker_core_container = TrackerCoreContainer::initialize_from(&core_config, &torrent_repository_container.clone());
 
-        let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
         let ban_service = Arc::new(RwLock::new(BanService::new(MAX_CONNECTION_ID_ERRORS_PER_IP)));
 
         // HTTP core stats
@@ -177,8 +222,11 @@ mod tests {
         let udp_server_stats_repository = Arc::new(torrust_udp_tracker_server::statistics::repository::Repository::new());
 
         let tracker_metrics = get_metrics(
-            in_memory_torrent_repository.clone(),
+            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/rest-tracker-api-core/src/statistics/services.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";
-const TORRENT_REPOSITORY_TORRENTS_DOWNLOADS_TOTAL: &str = "torrent_repository_torrents_downloads_total";
+pub 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/torrent-repository/src/statistics/mod.rs

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