refactor: [#1589] rename methods and remove unused code

josecelano · josecelano · commit a9acca5e73d6 · 2025-06-20T11:33:21.000+01:00
diff --git a/packages/rest-tracker-api-core/src/statistics/services.rs b/packages/rest-tracker-api-core/src/statistics/services.rs
@@ -71,30 +71,30 @@ async fn get_protocol_metrics(
 
     // UDP
 
-    let udp_requests_aborted = udp_server_stats.udp_requests_aborted();
-    let udp_requests_banned = udp_server_stats.udp_requests_banned();
+    let udp_requests_aborted = udp_server_stats.udp_requests_aborted_total();
+    let udp_requests_banned = udp_server_stats.udp_requests_banned_total();
     let udp_banned_ips_total = udp_server_stats.udp_banned_ips_total();
     let udp_avg_connect_processing_time_ns = udp_server_stats.udp_avg_connect_processing_time_ns_averaged();
     let udp_avg_announce_processing_time_ns = udp_server_stats.udp_avg_announce_processing_time_ns_averaged();
     let udp_avg_scrape_processing_time_ns = udp_server_stats.udp_avg_scrape_processing_time_ns_averaged();
 
     // UDPv4
 
-    let udp4_requests = udp_server_stats.udp4_requests();
-    let udp4_connections_handled = udp_server_stats.udp4_connections_handled();
-    let udp4_announces_handled = udp_server_stats.udp4_announces_handled();
-    let udp4_scrapes_handled = udp_server_stats.udp4_scrapes_handled();
-    let udp4_responses = udp_server_stats.udp4_responses();
-    let udp4_errors_handled = udp_server_stats.udp4_errors_handled();
+    let udp4_requests = udp_server_stats.udp4_requests_received_total();
+    let udp4_connections_handled = udp_server_stats.udp4_connect_requests_accepted_total();
+    let udp4_announces_handled = udp_server_stats.udp4_announce_requests_accepted_total();
+    let udp4_scrapes_handled = udp_server_stats.udp4_scrape_requests_accepted_total();
+    let udp4_responses = udp_server_stats.udp4_responses_sent_total();
+    let udp4_errors_handled = udp_server_stats.udp4_errors_total();
 
     // UDPv6
 
-    let udp6_requests = udp_server_stats.udp6_requests();
-    let udp6_connections_handled = udp_server_stats.udp6_connections_handled();
-    let udp6_announces_handled = udp_server_stats.udp6_announces_handled();
-    let udp6_scrapes_handled = udp_server_stats.udp6_scrapes_handled();
-    let udp6_responses = udp_server_stats.udp6_responses();
-    let udp6_errors_handled = udp_server_stats.udp6_errors_handled();
+    let udp6_requests = udp_server_stats.udp6_requests_received_total();
+    let udp6_connections_handled = udp_server_stats.udp6_connect_requests_accepted_total();
+    let udp6_announces_handled = udp_server_stats.udp6_announce_requests_accepted_total();
+    let udp6_scrapes_handled = udp_server_stats.udp6_scrape_requests_accepted_total();
+    let udp6_responses = udp_server_stats.udp6_responses_sent_total();
+    let udp6_errors_handled = udp_server_stats.udp6_errors_total();
 
     // For backward compatibility we keep the `tcp4_connections_handled` and
     // `tcp6_connections_handled` metrics. They don't make sense for the HTTP
diff --git a/packages/udp-tracker-server/src/statistics/event/handler/error.rs b/packages/udp-tracker-server/src/statistics/event/handler/error.rs
@@ -137,6 +137,6 @@ mod tests {
 
         let stats = stats_repository.get_stats().await;
 
-        assert_eq!(stats.udp4_errors_handled(), 1);
+        assert_eq!(stats.udp4_errors_total(), 1);
     }
 }
diff --git a/packages/udp-tracker-server/src/statistics/event/handler/request_aborted.rs b/packages/udp-tracker-server/src/statistics/event/handler/request_aborted.rs
@@ -54,7 +54,7 @@ mod tests {
 
         let stats = stats_repository.get_stats().await;
 
-        assert_eq!(stats.udp_requests_aborted(), 1);
+        assert_eq!(stats.udp_requests_aborted_total(), 1);
     }
 
     #[tokio::test]
@@ -77,6 +77,6 @@ mod tests {
         )
         .await;
         let stats = stats_repository.get_stats().await;
-        assert_eq!(stats.udp_requests_aborted(), 1);
+        assert_eq!(stats.udp_requests_aborted_total(), 1);
     }
 }
diff --git a/packages/udp-tracker-server/src/statistics/event/handler/request_accepted.rs b/packages/udp-tracker-server/src/statistics/event/handler/request_accepted.rs
@@ -61,7 +61,7 @@ mod tests {
 
         let stats = stats_repository.get_stats().await;
 
-        assert_eq!(stats.udp4_connections_handled(), 1);
+        assert_eq!(stats.udp4_connect_requests_accepted_total(), 1);
     }
 
     #[tokio::test]
@@ -89,7 +89,7 @@ mod tests {
 
         let stats = stats_repository.get_stats().await;
 
-        assert_eq!(stats.udp4_announces_handled(), 1);
+        assert_eq!(stats.udp4_announce_requests_accepted_total(), 1);
     }
 
     #[tokio::test]
@@ -115,7 +115,7 @@ mod tests {
 
         let stats = stats_repository.get_stats().await;
 
-        assert_eq!(stats.udp4_scrapes_handled(), 1);
+        assert_eq!(stats.udp4_scrape_requests_accepted_total(), 1);
     }
 
     #[tokio::test]
@@ -141,7 +141,7 @@ mod tests {
 
         let stats = stats_repository.get_stats().await;
 
-        assert_eq!(stats.udp6_connections_handled(), 1);
+        assert_eq!(stats.udp6_connect_requests_accepted_total(), 1);
     }
 
     #[tokio::test]
@@ -169,7 +169,7 @@ mod tests {
 
         let stats = stats_repository.get_stats().await;
 
-        assert_eq!(stats.udp6_announces_handled(), 1);
+        assert_eq!(stats.udp6_announce_requests_accepted_total(), 1);
     }
 
     #[tokio::test]
@@ -195,6 +195,6 @@ mod tests {
 
         let stats = stats_repository.get_stats().await;
 
-        assert_eq!(stats.udp6_scrapes_handled(), 1);
+        assert_eq!(stats.udp6_scrape_requests_accepted_total(), 1);
     }
 }
diff --git a/packages/udp-tracker-server/src/statistics/event/handler/request_banned.rs b/packages/udp-tracker-server/src/statistics/event/handler/request_banned.rs
@@ -54,7 +54,7 @@ mod tests {
 
         let stats = stats_repository.get_stats().await;
 
-        assert_eq!(stats.udp_requests_banned(), 1);
+        assert_eq!(stats.udp_requests_banned_total(), 1);
     }
 
     #[tokio::test]
@@ -77,6 +77,6 @@ mod tests {
         )
         .await;
         let stats = stats_repository.get_stats().await;
-        assert_eq!(stats.udp_requests_banned(), 1);
+        assert_eq!(stats.udp_requests_banned_total(), 1);
     }
 }
diff --git a/packages/udp-tracker-server/src/statistics/event/handler/request_received.rs b/packages/udp-tracker-server/src/statistics/event/handler/request_received.rs
@@ -54,6 +54,6 @@ mod tests {
 
         let stats = stats_repository.get_stats().await;
 
-        assert_eq!(stats.udp4_requests(), 1);
+        assert_eq!(stats.udp4_requests_received_total(), 1);
     }
 }
diff --git a/packages/udp-tracker-server/src/statistics/event/handler/response_sent.rs b/packages/udp-tracker-server/src/statistics/event/handler/response_sent.rs
@@ -105,7 +105,7 @@ mod tests {
 
         let stats = stats_repository.get_stats().await;
 
-        assert_eq!(stats.udp4_responses(), 1);
+        assert_eq!(stats.udp4_responses_sent_total(), 1);
     }
 
     #[tokio::test]
@@ -136,6 +136,6 @@ mod tests {
 
         let stats = stats_repository.get_stats().await;
 
-        assert_eq!(stats.udp6_responses(), 1);
+        assert_eq!(stats.udp6_responses_sent_total(), 1);
     }
 }
diff --git a/packages/udp-tracker-server/src/statistics/metrics.rs b/packages/udp-tracker-server/src/statistics/metrics.rs
diff --git a/packages/udp-tracker-server/src/statistics/repository.rs b/packages/udp-tracker-server/src/statistics/repository.rs
diff --git a/packages/udp-tracker-server/tests/server/contract.rs b/packages/udp-tracker-server/tests/server/contract.rs

Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,6 @@ mod tests {`
`137`	`137`
`138`	`138`	`let stats = stats_repository.get_stats().await;`
`139`	`139`
`140`		`- assert_eq!(stats.udp4_errors_handled(), 1);`
	`140`	`+ assert_eq!(stats.udp4_errors_total(), 1);`
`141`	`141`	`}`
`142`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ mod tests {`
`54`	`54`
`55`	`55`	`let stats = stats_repository.get_stats().await;`
`56`	`56`
`57`		`- assert_eq!(stats.udp_requests_aborted(), 1);`
	`57`	`+ assert_eq!(stats.udp_requests_aborted_total(), 1);`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`#[tokio::test]`
`@@ -77,6 +77,6 @@ mod tests {`
`77`	`77`	`)`
`78`	`78`	`.await;`
`79`	`79`	`let stats = stats_repository.get_stats().await;`
`80`		`- assert_eq!(stats.udp_requests_aborted(), 1);`
	`80`	`+ assert_eq!(stats.udp_requests_aborted_total(), 1);`
`81`	`81`	`}`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ mod tests {`
`61`	`61`
`62`	`62`	`let stats = stats_repository.get_stats().await;`
`63`	`63`
`64`		`- assert_eq!(stats.udp4_connections_handled(), 1);`
	`64`	`+ assert_eq!(stats.udp4_connect_requests_accepted_total(), 1);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`#[tokio::test]`
`@@ -89,7 +89,7 @@ mod tests {`
`89`	`89`
`90`	`90`	`let stats = stats_repository.get_stats().await;`
`91`	`91`
`92`		`- assert_eq!(stats.udp4_announces_handled(), 1);`
	`92`	`+ assert_eq!(stats.udp4_announce_requests_accepted_total(), 1);`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`#[tokio::test]`
`@@ -115,7 +115,7 @@ mod tests {`
`115`	`115`
`116`	`116`	`let stats = stats_repository.get_stats().await;`
`117`	`117`
`118`		`- assert_eq!(stats.udp4_scrapes_handled(), 1);`
	`118`	`+ assert_eq!(stats.udp4_scrape_requests_accepted_total(), 1);`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`#[tokio::test]`
`@@ -141,7 +141,7 @@ mod tests {`
`141`	`141`
`142`	`142`	`let stats = stats_repository.get_stats().await;`
`143`	`143`
`144`		`- assert_eq!(stats.udp6_connections_handled(), 1);`
	`144`	`+ assert_eq!(stats.udp6_connect_requests_accepted_total(), 1);`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`#[tokio::test]`
`@@ -169,7 +169,7 @@ mod tests {`
`169`	`169`
`170`	`170`	`let stats = stats_repository.get_stats().await;`
`171`	`171`
`172`		`- assert_eq!(stats.udp6_announces_handled(), 1);`
	`172`	`+ assert_eq!(stats.udp6_announce_requests_accepted_total(), 1);`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`#[tokio::test]`
`@@ -195,6 +195,6 @@ mod tests {`
`195`	`195`
`196`	`196`	`let stats = stats_repository.get_stats().await;`
`197`	`197`
`198`		`- assert_eq!(stats.udp6_scrapes_handled(), 1);`
	`198`	`+ assert_eq!(stats.udp6_scrape_requests_accepted_total(), 1);`
`199`	`199`	`}`
`200`	`200`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,6 @@ mod tests {`
`54`	`54`
`55`	`55`	`let stats = stats_repository.get_stats().await;`
`56`	`56`
`57`		`- assert_eq!(stats.udp4_requests(), 1);`
	`57`	`+ assert_eq!(stats.udp4_requests_received_total(), 1);`
`58`	`58`	`}`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ mod tests {`
`105`	`105`
`106`	`106`	`let stats = stats_repository.get_stats().await;`
`107`	`107`
`108`		`- assert_eq!(stats.udp4_responses(), 1);`
	`108`	`+ assert_eq!(stats.udp4_responses_sent_total(), 1);`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`#[tokio::test]`
`@@ -136,6 +136,6 @@ mod tests {`
`136`	`136`
`137`	`137`	`let stats = stats_repository.get_stats().await;`
`138`	`138`
`139`		`- assert_eq!(stats.udp6_responses(), 1);`
	`139`	`+ assert_eq!(stats.udp6_responses_sent_total(), 1);`
`140`	`140`	`}`
`141`	`141`	`}`