[r2r] update metrics related dep && refactoring

mm2src/mm2_metrics/src/lib.rs

@@ -28,6 +28,8 @@ pub enum MmMetricsError {
     PrometheusAuthorizationRequired,
     #[display(fmt = "Warning Prometheus: invalid credentials: {}", _0)]
     PrometheusInvalidCredentials(String),
+    #[display(fmt = "Prometheus Server Error: {}", _0)]
+    PrometheusServerError(String),
     #[display(fmt = "Warning Prometheus: unexpected URI {}", _0)]
     UnexpectedUri(String),
 }

mm2src/mm2_metrics/src/mm_metrics.rs

@@ -284,7 +284,7 @@ pub mod prometheus {
         });
 
         let server = Server::try_bind(&address)
-            .map_err(|e| MmMetricsError::Internal(e.to_string()))?
+            .map_err(|e| MmMetricsError::PrometheusServerError(e.to_string()))?
             .http1_half_close(false) // https://github.com/hyperium/hyper/issues/1764
             .serve(make_svc)
             .with_graceful_shutdown(shutdown_detector);
@@ -397,7 +397,7 @@ mod test {
         mm_gauge!(metrics, "rpc.connection.count", 3.0, "coin" => "KMD");
         mm_gauge!(metrics, "rpc.connection.count", 5.0, "coin" => "KMD");
 
-        let delta = Duration::from_secs(1);
+        let delta = Duration::from_secs(2);
         mm_timing!(metrics,
                    "rpc.query.spent_time",
                    // ~ 1 second
@@ -442,8 +442,8 @@ mod test {
                     "count": 2.0,
                     "key": "rpc.query.spent_time",
                     "labels": { "coin": "KMD", "method": "blockchain.transaction.get" },
-                    "max": 1.0,
-                    "min": 1.0,
+                    "max": 2.0,
+                    "min": 2.0,
                     "type": "histogram"
                 },
                 {
@@ -522,34 +522,30 @@ mod test {
         block_on(async { Timer::sleep(6.).await });
     }
 
-    //    #[test]
-    //    fn test_prometheus_format() {
-    //        let mm_metrics = MetricsArc::new();
-    //
-    //        mm_metrics.init();
-    //
-    //        mm_counter!(mm_metrics, "rpc.traffic.tx", 62, "coin" => "BTC");
-    //        mm_counter!(mm_metrics, "rpc.traffic.rx", 105, "coin" => "BTC");
-    //
-    //        mm_counter!(mm_metrics, "rpc.traffic.tx", 30, "coin" => "BTC");
-    //        mm_counter!(mm_metrics, "rpc.traffic.rx", 44, "coin" => "BTC");
-    //
-    //        mm_counter!(mm_metrics, "rpc.traffic.tx", 54, "coin" => "KMD");
-    //        mm_counter!(mm_metrics, "rpc.traffic.rx", 158, "coin" => "KMD");
-    //
-    //        mm_gauge!(mm_metrics, "rpc.connection.count", 3.0, "coin" => "KMD");
-    //        mm_gauge!(mm_metrics, "rpc.connection.count", 5.0, "coin" => "KMD");
-    //
-    //        mm_timing!(mm_metrics,
-    //                     "rpc.query.spent_time",
-    //                     4.5,
-    //                     "coin"=> "KMD",
-    //                     "method"=>"blockchain.transaction.get");
-    //
-    //        let actual = mm_metrics.0.collect_prometheus_format();
-    //        let expected = concat!("# TYPE rpc_traffic_tx counter\nrpc_traffic_tx{coin=\"BTC\"} \
-    //        92\nrpc_traffic_tx{coin=\"KMD\"} 54\n\n# TYPE rpc_traffic_rx counter\nrpc_traffic_rx{coin=\"BTC\"} 149\nrpc_traffic_rx{coin=\"KMD\"} 158\n\n# TYPE rpc_connection_count gauge\nrpc_connection_count{coin=\"KMD\"} 5\n\n# TYPE rpc_query_spent_time histogram\nrpc_query_spent_time_sum 4.5\nrpc_query_spent_time_count 1\n\n");
-    //
-    //        assert_eq!(expected, actual.to_string());
-    //    }
+    #[test]
+    fn test_prometheus_format() {
+        let mm_metrics = MetricsArc::new();
+
+        mm_metrics.init();
+
+        mm_counter!(mm_metrics, "rpc.traffic.tx", 62, "coin" => "BTC");
+        mm_counter!(mm_metrics, "rpc.traffic.rx", 105, "coin" => "BTC");
+
+        mm_counter!(mm_metrics, "rpc.traffic.tx", 30, "coin" => "BTC");
+        mm_counter!(mm_metrics, "rpc.traffic.rx", 44, "coin" => "BTC");
+
+        mm_counter!(mm_metrics, "rpc.traffic.tx", 54, "coin" => "KMD");
+        mm_counter!(mm_metrics, "rpc.traffic.rx", 158, "coin" => "KMD");
+
+        mm_gauge!(mm_metrics, "rpc.connection.count", 3.0, "coin" => "KMD");
+        mm_gauge!(mm_metrics, "rpc.connection.count", 5.0, "coin" => "KMD");
+
+        mm_timing!(mm_metrics,
+                         "rpc.query.spent_time",
+                         4.5,
+                         "coin"=> "KMD",
+                         "method"=>"blockchain.transaction.get");
+
+        println!("{}", mm_metrics.0.collect_prometheus_format());
+    }
 }