refactor: [#1444] http core event listener start in app start. Step 2

Author: josecelano

packages/axum-http-tracker-server/src/server.rs

@@ -270,10 +270,16 @@ mod tests {
 
         let http_tracker_config = Arc::new(http_tracker_config.clone());
 
-        // HTTP stats
-        let (http_stats_event_sender, http_stats_repository) =
-            bittorrent_http_tracker_core::statistics::setup::factory(configuration.core.tracker_usage_statistics);
-        let http_stats_event_sender = Arc::new(http_stats_event_sender);
+        // HTTP core stats
+        let keeper = bittorrent_http_tracker_core::statistics::setup::factory(configuration.core.tracker_usage_statistics);
+        let http_stats_event_sender = keeper.sender();
+        let http_stats_repository = keeper.repository();
+
+        if configuration.core.tracker_usage_statistics {
+            // todo: this should be started like the other jobs during `app::start`
+            // and keep the join handle in a list of jobs.
+            let _unused = keeper.run_event_listener();
+        }
 
         let tracker_core_container = Arc::new(TrackerCoreContainer::initialize(&core_config));
 

packages/axum-http-tracker-server/src/v1/handlers/announce.rs

@@ -160,11 +160,16 @@ mod tests {
             &db_torrent_repository,
         ));
 
-        // HTTP stats
-        let (http_stats_event_sender, http_stats_repository) =
-            bittorrent_http_tracker_core::statistics::setup::factory(config.core.tracker_usage_statistics);
-        let http_stats_event_sender = Arc::new(http_stats_event_sender);
-        let _http_stats_repository = Arc::new(http_stats_repository);
+        // HTTP core stats
+        let keeper = bittorrent_http_tracker_core::statistics::setup::factory(config.core.tracker_usage_statistics);
+        let http_stats_event_sender = keeper.sender();
+        let _http_stats_repository = keeper.repository();
+
+        if config.core.tracker_usage_statistics {
+            // todo: this should be started like the other jobs during `app::start`
+            // and keep the join handle in a list of jobs.
+            let _unused = keeper.run_event_listener();
+        }
 
         let announce_service = Arc::new(AnnounceService::new(
             core_config.clone(),

packages/axum-http-tracker-server/src/v1/handlers/scrape.rs

@@ -131,10 +131,16 @@ mod tests {
         let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
         let scrape_handler = Arc::new(ScrapeHandler::new(&whitelist_authorization, &in_memory_torrent_repository));
 
-        // HTTP stats
-        let (http_stats_event_sender, _http_stats_repository) =
-            bittorrent_http_tracker_core::statistics::setup::factory(config.core.tracker_usage_statistics);
-        let http_stats_event_sender = Arc::new(http_stats_event_sender);
+        // HTTP core stats
+        let keeper = bittorrent_http_tracker_core::statistics::setup::factory(config.core.tracker_usage_statistics);
+        let http_stats_event_sender = keeper.sender();
+        let _http_stats_repository = keeper.repository();
+
+        if config.core.tracker_usage_statistics {
+            // todo: this should be started like the other jobs during `app::start`
+            // and keep the join handle in a list of jobs.
+            let _unused = keeper.run_event_listener();
+        }
 
         (
             CoreTrackerServices {

packages/http-tracker-core/benches/helpers/util.rs

@@ -2,6 +2,8 @@ use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 use std::sync::Arc;
 
 use aquatic_udp_protocol::{AnnounceEvent, NumberOfBytes, PeerId};
+use bittorrent_http_tracker_core::event::Event;
+use bittorrent_http_tracker_core::{event, statistics};
 use bittorrent_http_tracker_protocol::v1::requests::announce::Announce;
 use bittorrent_http_tracker_protocol::v1::services::peer_ip_resolver::ClientIpSources;
 use bittorrent_primitives::info_hash::InfoHash;
@@ -13,6 +15,9 @@ use bittorrent_tracker_core::torrent::repository::in_memory::InMemoryTorrentRepo
 use bittorrent_tracker_core::torrent::repository::persisted::DatabasePersistentTorrentRepository;
 use bittorrent_tracker_core::whitelist::authorization::WhitelistAuthorization;
 use bittorrent_tracker_core::whitelist::repository::in_memory::InMemoryWhitelist;
+use futures::future::BoxFuture;
+use mockall::mock;
+use tokio::sync::broadcast::error::SendError;
 use torrust_tracker_configuration::{Configuration, Core};
 use torrust_tracker_primitives::peer::Peer;
 use torrust_tracker_primitives::{peer, DurationSinceUnixEpoch};
@@ -50,10 +55,16 @@ pub fn initialize_core_tracker_services_with_config(config: &Configuration) -> (
         &db_torrent_repository,
     ));
 
-    // HTTP stats
-    let (http_stats_event_sender, http_stats_repository) = statistics::setup::factory(config.core.tracker_usage_statistics);
-    let http_stats_event_sender = Arc::new(http_stats_event_sender);
-    let _http_stats_repository = Arc::new(http_stats_repository);
+    // HTTP core stats
+    let keeper = statistics::setup::factory(config.core.tracker_usage_statistics);
+    let http_stats_event_sender = keeper.sender();
+    let _http_stats_repository = keeper.repository();
+
+    if config.core.tracker_usage_statistics {
+        // todo: this should be started like the other jobs during `app::start`
+        // and keep the join handle in a list of jobs.
+        let _unused = keeper.run_event_listener();
+    }
 
     (
         CoreTrackerServices {
@@ -105,12 +116,6 @@ pub fn sample_info_hash() -> InfoHash {
         .expect("String should be a valid info hash")
 }
 
-use bittorrent_http_tracker_core::event::Event;
-use bittorrent_http_tracker_core::{event, statistics};
-use futures::future::BoxFuture;
-use mockall::mock;
-use tokio::sync::broadcast::error::SendError;
-
 mock! {
     HttpStatsEventSender {}
     impl event::sender::Sender for HttpStatsEventSender {

packages/http-tracker-core/src/container.rs

@@ -62,16 +62,25 @@ pub struct HttpTrackerCoreServices {
 impl HttpTrackerCoreServices {
     #[must_use]
     pub fn initialize_from(tracker_core_container: &Arc<TrackerCoreContainer>) -> Arc<Self> {
-        let (http_stats_event_sender, http_stats_repository) =
-            statistics::setup::factory(tracker_core_container.core_config.tracker_usage_statistics);
-        let http_stats_event_sender = Arc::new(http_stats_event_sender);
+        // HTTP core stats
+        let keeper = statistics::setup::factory(tracker_core_container.core_config.tracker_usage_statistics);
+        let http_stats_event_sender = keeper.sender();
+        let http_stats_repository = keeper.repository();
+
+        if tracker_core_container.core_config.tracker_usage_statistics {
+            // todo: this should be started like the other jobs during `app::start`
+            // and keep the join handle in a list of jobs.
+            let _unused = keeper.run_event_listener();
+        }
+
         let http_announce_service = Arc::new(AnnounceService::new(
             tracker_core_container.core_config.clone(),
             tracker_core_container.announce_handler.clone(),
             tracker_core_container.authentication_service.clone(),
             tracker_core_container.whitelist_authorization.clone(),
             http_stats_event_sender.clone(),
         ));
+
         let http_scrape_service = Arc::new(ScrapeService::new(
             tracker_core_container.core_config.clone(),
             tracker_core_container.scrape_handler.clone(),

packages/http-tracker-core/src/services/announce.rs

@@ -252,10 +252,16 @@ mod tests {
             &db_torrent_repository,
         ));
 
-        // HTTP stats
-        let (http_stats_event_sender, http_stats_repository) = statistics::setup::factory(config.core.tracker_usage_statistics);
-        let http_stats_event_sender = Arc::new(http_stats_event_sender);
-        let _http_stats_repository = Arc::new(http_stats_repository);
+        // HTTP core stats
+        let keeper = statistics::setup::factory(config.core.tracker_usage_statistics);
+        let http_stats_event_sender = keeper.sender();
+        let _http_stats_repository = keeper.repository();
+
+        if config.core.tracker_usage_statistics {
+            // todo: this should be started like the other jobs during `app::start`
+            // and keep the join handle in a list of jobs.
+            let _unused = keeper.run_event_listener();
+        }
 
         (
             CoreTrackerServices {

packages/http-tracker-core/src/services/scrape.rs

@@ -272,8 +272,10 @@ mod tests {
             let configuration = configuration::ephemeral_public();
             let core_config = Arc::new(configuration.core.clone());
 
-            let (http_stats_event_sender, _http_stats_repository) = statistics::setup::factory(false);
-            let http_stats_event_sender = Arc::new(http_stats_event_sender);
+            // HTTP core stats
+            let keeper = statistics::setup::factory(false);
+            let http_stats_event_sender = keeper.sender();
+            let _http_stats_repository = keeper.repository();
 
             let container = initialize_services_with_configuration(&configuration);
 
@@ -462,8 +464,10 @@ mod tests {
 
             let container = initialize_services_with_configuration(&config);
 
-            let (http_stats_event_sender, _http_stats_repository) = statistics::setup::factory(false);
-            let http_stats_event_sender = Arc::new(http_stats_event_sender);
+            // HTTP core stats
+            let keeper = statistics::setup::factory(false);
+            let http_stats_event_sender = keeper.sender();
+            let _http_stats_repository = keeper.repository();
 
             let info_hash = sample_info_hash();
             let info_hashes = vec![info_hash];

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

@@ -39,11 +39,11 @@ impl Keeper {
     }
 
     #[must_use]
-    pub fn sender(&self) -> Option<Box<dyn sender::Sender>> {
+    pub fn sender(&self) -> Arc<Option<Box<dyn sender::Sender>>> {
         if self.enable_sender {
-            Some(Box::new(self.broadcaster.clone()))
+            Arc::new(Some(Box::new(self.broadcaster.clone())))
         } else {
-            None
+            Arc::new(None)
         }
     }
 

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

@@ -88,7 +88,16 @@ mod tests {
 
         let in_memory_torrent_repository = Arc::new(InMemoryTorrentRepository::default());
 
-        let (_http_stats_event_sender, http_stats_repository) = statistics::setup::factory(config.core.tracker_usage_statistics);
+        // HTTP core stats
+        let keeper = statistics::setup::factory(config.core.tracker_usage_statistics);
+        let _http_stats_event_sender = keeper.sender();
+        let http_stats_repository = keeper.repository();
+
+        if config.core.tracker_usage_statistics {
+            // todo: this should be started like the other jobs during `app::start`
+            // and keep the join handle in a list of jobs.
+            let _unused = keeper.run_event_listener();
+        }
 
         let tracker_metrics = get_metrics(in_memory_torrent_repository.clone(), http_stats_repository).await;
 

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

@@ -5,7 +5,6 @@ use std::sync::Arc;
 
 use super::keeper::Keeper;
 use super::repository::Repository;
-use crate::event;
 use crate::event::sender::Broadcaster;
 
 /// It builds the structs needed for handling the tracker metrics.
@@ -21,16 +20,8 @@ use crate::event::sender::Broadcaster;
 /// not run the event listeners, consequently the statistics events are sent are
 /// received but not dispatched to the handler.
 #[must_use]
-pub fn factory(tracker_usage_statistics: bool) -> (Option<Box<dyn event::sender::Sender>>, Arc<Repository>) {
-    let keeper = keeper_factory(tracker_usage_statistics);
-
-    if tracker_usage_statistics {
-        // todo: this should be started like the other jobs during `app::start`
-        // and keep the join handle in a list of jobs.
-        let _unused = keeper.run_event_listener();
-    }
-
-    (keeper.sender(), keeper.repository())
+pub fn factory(tracker_usage_statistics: bool) -> Arc<Keeper> {
+    keeper_factory(tracker_usage_statistics)
 }
 
 #[must_use]
@@ -48,17 +39,29 @@ mod test {
     async fn should_not_send_any_event_when_statistics_are_disabled() {
         let tracker_usage_statistics = false;
 
-        let (stats_event_sender, _stats_repository) = factory(tracker_usage_statistics);
+        // HTTP core stats
+        let keeper = factory(tracker_usage_statistics);
+        let http_stats_event_sender = keeper.sender();
+        let _http_stats_repository = keeper.repository();
+
+        if tracker_usage_statistics {
+            // todo: this should be started like the other jobs during `app::start`
+            // and keep the join handle in a list of jobs.
+            let _unused = keeper.run_event_listener();
+        }
 
-        assert!(stats_event_sender.is_none());
+        assert!(http_stats_event_sender.is_none());
     }
 
     #[tokio::test]
     async fn should_send_events_when_statistics_are_enabled() {
         let tracker_usage_statistics = true;
 
-        let (stats_event_sender, _stats_repository) = factory(tracker_usage_statistics);
+        // HTTP core stats
+        let keeper = factory(tracker_usage_statistics);
+        let http_stats_event_sender = keeper.sender();
+        let _http_stats_repository = keeper.repository();
 
-        assert!(stats_event_sender.is_some());
+        assert!(http_stats_event_sender.is_some());
     }
 }