Return an Arc in the Metrics structs start method

Author: maximopalopoli

aggregation_mode/gateway/src/http.rs

@@ -1,5 +1,6 @@
 use std::{
     str::FromStr,
+    sync::Arc,
     time::{Instant, SystemTime, UNIX_EPOCH},
 };
 
@@ -34,7 +35,7 @@ pub struct GatewayServer {
     db: Db,
     config: Config,
     network: Network,
-    metrics: GatewayMetrics,
+    metrics: Arc<GatewayMetrics>,
 }
 
 impl GatewayServer {

aggregation_mode/gateway/src/metrics.rs

@@ -9,7 +9,7 @@ pub struct GatewayMetrics {
 }
 
 impl GatewayMetrics {
-    pub fn start(metrics_port: u16) -> Result<Self, prometheus::Error> {
+    pub fn start(metrics_port: u16) -> Result<Arc<Self>, prometheus::Error> {
         let registry = Registry::new();
 
         let time_elapsed_db_post = Histogram::with_opts(histogram_opts!(
@@ -40,7 +40,7 @@ impl GatewayMetrics {
             .await;
         });
 
-        Ok(Arc::try_unwrap(metrics).unwrap_or_else(|arc| (*arc).clone()))
+        Ok(metrics)
     }
 
     async fn metrics_handler(metrics: web::Data<Arc<GatewayMetrics>>) -> impl Responder {

aggregation_mode/payments_poller/src/metrics.rs

@@ -9,7 +9,7 @@ pub struct PaymentsPollerMetrics {
 }
 
 impl PaymentsPollerMetrics {
-    pub fn start(metrics_port: u16) -> Result<Self, prometheus::Error> {
+    pub fn start(metrics_port: u16) -> Result<Arc<Self>, prometheus::Error> {
         let registry = Registry::new();
 
         let last_processed_block = Gauge::with_opts(opts!(
@@ -43,7 +43,7 @@ impl PaymentsPollerMetrics {
             .await;
         });
 
-        Ok(Arc::try_unwrap(metrics).unwrap_or_else(|arc| (*arc).clone()))
+        Ok(metrics)
     }
 
     async fn metrics_handler(metrics: web::Data<Arc<PaymentsPollerMetrics>>) -> impl Responder {

aggregation_mode/payments_poller/src/payments.rs

@@ -1,4 +1,4 @@
-use std::str::FromStr;
+use std::{str::FromStr, sync::Arc};
 
 use crate::{
     config::Config,
@@ -22,7 +22,7 @@ pub struct PaymentsPoller {
     proof_aggregation_service: AggregationModePaymentServiceContract,
     rpc_provider: RpcProvider,
     config: Config,
-    metrics: PaymentsPollerMetrics,
+    metrics: Arc<PaymentsPollerMetrics>,
 }
 
 impl PaymentsPoller {