wip - metrics cleanup

cli/src/cli.rs

@@ -1,7 +1,7 @@
 use crate::error::Error;
 use crate::helpers::*;
 use crate::imports::*;
-pub use crate::metrics;
+// pub use crate::metrics;
 use crate::modules::miner::Miner;
 use crate::modules::node::Node;
 use crate::notifier::{Notification, Notifier};
@@ -192,6 +192,7 @@ impl KaspaCli {
     }
 
     pub fn register_metrics(self: &Arc<Self>) -> Result<()> {
+        use crate::modules::metrics;
         register_handlers!(self, self.handlers(), [metrics]);
         Ok(())
     }

cli/src/lib.rs

@@ -5,8 +5,8 @@ pub mod error;
 mod helpers;
 mod imports;
 mod matchers;
-pub mod metrics;
-mod modules;
+//pub mod metrics;
+pub mod modules;
 mod notifier;
 pub mod result;
 pub mod utils;

cli/src/metrics/mod.rs → cli/src/metricsx/mod.rs

@@ -1,4 +1,3 @@
-//pub mod data;
 #[allow(clippy::module_inception)]
 pub mod metrics;
 

cli/src/metrics/metrics.rs → cli/src/modules/metrics.rs

@@ -1,5 +1,5 @@
 use crate::imports::*;
-use kaspa_metrics::{Metrics, MetricsSinkFn};
+use kaspa_metrics::{Metrics as MetricsProcessor, MetricsSinkFn};
 use workflow_core::runtime::is_nw;
 
 #[derive(Describe, Debug, Clone, Serialize, Deserialize, Hash, Eq, PartialEq, Ord, PartialOrd)]
@@ -16,24 +16,24 @@ impl DefaultSettings for MetricsSettings {
     }
 }
 
-pub struct MetricsHandler {
+pub struct Metrics {
     settings: SettingsStore<MetricsSettings>,
     mute: Arc<AtomicBool>,
-    metrics: Arc<Metrics>,
+    metrics: Arc<MetricsProcessor>,
 }
 
-impl Default for MetricsHandler {
+impl Default for Metrics {
     fn default() -> Self {
-        MetricsHandler {
+        Metrics {
             settings: SettingsStore::try_new("metrics").expect("Failed to create miner settings store"),
             mute: Arc::new(AtomicBool::new(true)),
-            metrics: Arc::new(Metrics::default()),
+            metrics: Arc::new(MetricsProcessor::default()),
         }
     }
 }
 
 #[async_trait]
-impl Handler for MetricsHandler {
+impl Handler for Metrics {
     fn verb(&self, _ctx: &Arc<dyn Context>) -> Option<&'static str> {
         Some("metrics")
     }
@@ -66,7 +66,7 @@ impl Handler for MetricsHandler {
     }
 }
 
-impl MetricsHandler {
+impl Metrics {
     pub fn register_sink(&self, target: MetricsSinkFn) {
         self.metrics.register_sink(target);
     }

cli/src/modules/mod.rs

@@ -18,6 +18,7 @@ pub mod help;
 pub mod history;
 pub mod import;
 pub mod list;
+pub mod metrics;
 pub mod miner;
 pub mod monitor;
 pub mod mute;

kos/src/metrics/ipc.rs

@@ -1,5 +1,5 @@
 use crate::imports::*;
-use kaspa_cli_lib::metrics::MetricsSnapshot;
+use kaspa_metrics::MetricsSnapshot;
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, BorshDeserialize, BorshSerialize, Serialize, Deserialize)]
 pub enum MetricsOps {

kos/src/metrics/metrics.rs

@@ -1,6 +1,6 @@
 use super::toolbar::*;
 use crate::imports::*;
-use kaspa_cli_lib::metrics::{Metric, MetricsSnapshot};
+use kaspa_metrics::{Metric, MetricsSnapshot};
 use std::collections::HashMap;
 use workflow_core::time::{HOURS, MINUTES};
 use workflow_d3::container::*;
@@ -26,7 +26,7 @@ impl Metrics {
     pub async fn try_new() -> Result<Arc<Self>> {
         workflow_d3::load().await?;
 
-        let core_ipc_target = get_ipc_target(Modules::Core).await?.expect("Unable to aquire background window");
+        let core_ipc_target = get_ipc_target(Modules::Core).await?.expect("Unable to acquire background window");
         let core = Arc::new(CoreIpc::new(core_ipc_target));
 
         let settings = Arc::new(SettingsStore::<MetricsSettings>::try_new("metrics")?);
@@ -165,7 +165,7 @@ impl Metrics {
         self.init_graphs().await?;
 
         // this call reflects from core to terminal
-        // initiating metrica data relay
+        // initiating metrics data relay
         self.core.metrics_ready().await?;
 
         Ok(())

kos/src/metrics/toolbar.rs

@@ -4,7 +4,7 @@ use crate::imports::*;
 use crate::result::Result;
 use std::{collections::HashMap, sync::MutexGuard};
 
-use kaspa_cli_lib::metrics::Metric;
+use kaspa_metrics::Metric;
 use web_sys::{Document, Element, MouseEvent};
 use workflow_d3::graph::GraphDuration;
 #[allow(unused_imports)]