diff --git a/packages/axum-rest-tracker-api-server/src/v1/context/stats/handlers.rs b/packages/axum-rest-tracker-api-server/src/v1/context/stats/handlers.rs index 5273df332..484c12ff9 100644 --- a/packages/axum-rest-tracker-api-server/src/v1/context/stats/handlers.rs +++ b/packages/axum-rest-tracker-api-server/src/v1/context/stats/handlers.rs @@ -43,19 +43,11 @@ pub async fn get_stats_handler( Arc, Arc>, Arc, - Arc, Arc, )>, params: Query, ) -> Response { - let metrics = get_metrics( - state.0.clone(), - state.1.clone(), - state.2.clone(), - state.3.clone(), - state.4.clone(), - ) - .await; + let metrics = get_metrics(state.0.clone(), state.1.clone(), state.2.clone(), state.3.clone()).await; match params.0.format { Some(format) => match format { diff --git a/packages/axum-rest-tracker-api-server/src/v1/context/stats/routes.rs b/packages/axum-rest-tracker-api-server/src/v1/context/stats/routes.rs index 1334c0d70..49ba9e829 100644 --- a/packages/axum-rest-tracker-api-server/src/v1/context/stats/routes.rs +++ b/packages/axum-rest-tracker-api-server/src/v1/context/stats/routes.rs @@ -19,7 +19,6 @@ pub fn add(prefix: &str, router: Router, http_api_container: &Arc, ban_service: Arc>, http_stats_repository: Arc, - udp_core_stats_repository: Arc, udp_server_stats_repository: Arc, ) -> TrackerMetrics { let torrents_metrics = in_memory_torrent_repository.get_torrents_metrics(); let udp_banned_ips_total = ban_service.read().await.get_banned_ips_total(); let http_stats = http_stats_repository.get_stats().await; - let udp_core_stats = udp_core_stats_repository.get_stats().await; let udp_server_stats = udp_server_stats_repository.get_stats().await; // For backward compatibility we keep the `tcp4_connections_handled` and @@ -63,16 +61,16 @@ pub async fn get_metrics( udp_avg_scrape_processing_time_ns: udp_server_stats.udp_avg_scrape_processing_time_ns, // UDPv4 udp4_requests: udp_server_stats.udp4_requests, - udp4_connections_handled: udp_core_stats.udp4_connections_handled, - udp4_announces_handled: udp_core_stats.udp4_announces_handled, - udp4_scrapes_handled: udp_core_stats.udp4_scrapes_handled, + udp4_connections_handled: udp_server_stats.udp4_connections_handled, + udp4_announces_handled: udp_server_stats.udp4_announces_handled, + udp4_scrapes_handled: udp_server_stats.udp4_scrapes_handled, udp4_responses: udp_server_stats.udp4_responses, udp4_errors_handled: udp_server_stats.udp4_errors_handled, // UDPv6 udp6_requests: udp_server_stats.udp6_requests, - udp6_connections_handled: udp_core_stats.udp6_connections_handled, - udp6_announces_handled: udp_core_stats.udp6_announces_handled, - udp6_scrapes_handled: udp_core_stats.udp6_scrapes_handled, + udp6_connections_handled: udp_server_stats.udp6_connections_handled, + udp6_announces_handled: udp_server_stats.udp6_announces_handled, + udp6_scrapes_handled: udp_server_stats.udp6_scrapes_handled, udp6_responses: udp_server_stats.udp6_responses, udp6_errors_handled: udp_server_stats.udp6_errors_handled, }, @@ -112,9 +110,8 @@ mod tests { let http_stats_repository = Arc::new(http_stats_repository); // UDP core stats - let (_udp_stats_event_sender, udp_stats_repository) = + let (_udp_stats_event_sender, _udp_stats_repository) = bittorrent_udp_tracker_core::statistics::setup::factory(config.core.tracker_usage_statistics); - let udp_stats_repository = Arc::new(udp_stats_repository); // UDP server stats let (_udp_server_stats_event_sender, udp_server_stats_repository) = @@ -125,7 +122,6 @@ mod tests { in_memory_torrent_repository.clone(), ban_service.clone(), http_stats_repository.clone(), - udp_stats_repository.clone(), udp_server_stats_repository.clone(), ) .await;