plugin_sysstat: Run formatter

Signed-off-by: Matthias Beyer <matthias.beyer@ifm.com>

10 files changed, 95 insertions, 34 deletions

diff --git a/plugins/plugin_sysstat/src/builder.rs b/plugins/plugin_sysstat/src/builder.rs
index b9add9dc..2bc51311 100644
--- a/plugins/plugin_sysstat/src/builder.rs
+++ b/plugins/plugin_sysstat/src/builder.rs
@@ -4,11 +4,11 @@ use async_trait::async_trait;
 use tedge_api::error::DirectoryError;
 use tedge_api::plugin::BuiltPlugin;
 use tedge_api::plugin::HandleTypes;
+use tedge_api::plugin::PluginExt;
 use tedge_api::PluginBuilder;
 use tedge_api::PluginConfiguration;
 use tedge_api::PluginDirectory;
 use tedge_api::PluginError;
-use tedge_api::plugin::PluginExt;
 use tokio_util::sync::CancellationToken;
 
 use crate::config::HasBaseConfig;
@@ -61,12 +61,36 @@ impl<PD: PluginDirectory> PluginBuilder<PD> for SysStatPluginBuilder {
         };
 
         let addr_config = crate::plugin::AddressConfig {
-            memory: config.memory.as_ref().map(|cfg| build_addr_config(cfg.send_to())).unwrap_or_else(|| Ok(Arc::new(Vec::new())))?,
-            network: config.network.as_ref().map(|cfg| build_addr_config(cfg.send_to())).unwrap_or_else(|| Ok(Arc::new(Vec::new())))?,
-            cpu: config.cpu.as_ref().map(|cfg| build_addr_config(cfg.send_to())).unwrap_or_else(|| Ok(Arc::new(Vec::new())))?,
-            disk_usage: config.disk_usage.as_ref().map(|cfg| build_addr_config(cfg.send_to())).unwrap_or_else(|| Ok(Arc::new(Vec::new())))?,
-            load: config.load.as_ref().map(|cfg| build_addr_config(cfg.send_to())).unwrap_or_else(|| Ok(Arc::new(Vec::new())))?,
-            process: config.process.as_ref().map(|cfg| build_addr_config(cfg.send_to())).unwrap_or_else(|| Ok(Arc::new(Vec::new())))?,
+            memory: config
+                .memory
+                .as_ref()
+                .map(|cfg| build_addr_config(cfg.send_to()))
+                .unwrap_or_else(|| Ok(Arc::new(Vec::new())))?,
+            network: config
+                .network
+                .as_ref()
+                .map(|cfg| build_addr_config(cfg.send_to()))
+                .unwrap_or_else(|| Ok(Arc::new(Vec::new())))?,
+            cpu: config
+                .cpu
+                .as_ref()
+                .map(|cfg| build_addr_config(cfg.send_to()))
+                .unwrap_or_else(|| Ok(Arc::new(Vec::new())))?,
+            disk_usage: config
+                .disk_usage
+                .as_ref()
+                .map(|cfg| build_addr_config(cfg.send_to()))
+                .unwrap_or_else(|| Ok(Arc::new(Vec::new())))?,
+            load: config
+                .load
+                .as_ref()
+                .map(|cfg| build_addr_config(cfg.send_to()))
+                .unwrap_or_else(|| Ok(Arc::new(Vec::new())))?,
+            process: config
+                .process
+                .as_ref()
+                .map(|cfg| build_addr_config(cfg.send_to()))
+                .unwrap_or_else(|| Ok(Arc::new(Vec::new())))?,
         };
 
         Ok(SysStatPlugin::new(config, addr_config).finish())
diff --git a/plugins/plugin_sysstat/src/lib.rs b/plugins/plugin_sysstat/src/lib.rs
index ae278b6f..6fe7f7e2 100644
--- a/plugins/plugin_sysstat/src/lib.rs
+++ b/plugins/plugin_sysstat/src/lib.rs
@@ -5,5 +5,5 @@ mod main;
 mod plugin;
 
 pub use crate::builder::SysStatPluginBuilder;
-pub use crate::plugin::SysStatPlugin;
 pub use crate::plugin::MeasurementReceiver;
+pub use crate::plugin::SysStatPlugin;
diff --git a/plugins/plugin_sysstat/src/main/cpu.rs b/plugins/plugin_sysstat/src/main/cpu.rs
index dd69b88e..ee2721b4 100644
--- a/plugins/plugin_sysstat/src/main/cpu.rs
+++ b/plugins/plugin_sysstat/src/main/cpu.rs
@@ -160,7 +160,9 @@ pub async fn main_cpu(state: Arc<Mutex<CPUState>>) -> Result<(), PluginError> {
         .send_all()
         .collect::<futures::stream::FuturesUnordered<_>>()
         .collect::<Vec<Result<_, _>>>()
-        .instrument(tracing::debug_span!("plugin.sysstat.main-cpu.sending_measurements"))
+        .instrument(tracing::debug_span!(
+            "plugin.sysstat.main-cpu.sending_measurements"
+        ))
         .await
         .into_iter()
         .collect::<Result<Vec<_>, _>>()
diff --git a/plugins/plugin_sysstat/src/main/disk_usage.rs b/plugins/plugin_sysstat/src/main/disk_usage.rs
index d7e553bb..c6104b26 100644
--- a/plugins/plugin_sysstat/src/main/disk_usage.rs
+++ b/plugins/plugin_sysstat/src/main/disk_usage.rs
@@ -9,9 +9,9 @@ use sysinfo::SystemExt;
 use tokio::sync::Mutex;
 use tracing::Instrument;
 
+use tedge_api::plugin::Message;
 use tedge_api::Address;
 use tedge_api::PluginError;
-use tedge_api::plugin::Message;
 use tedge_lib::iter::IntoSendAll;
 use tedge_lib::measurement::Measurement;
 use tedge_lib::measurement::MeasurementValue;
@@ -76,7 +76,9 @@ pub async fn main_disk_usage(state: Arc<Mutex<DiskUsageState>>) -> Result<(), Pl
         })
         .collect::<futures::stream::FuturesUnordered<_>>()
         .collect::<Vec<Result<Vec<()>, PluginError>>>()
-        .instrument(tracing::debug_span!("plugin.sysstat.main-diskusage.sending_measurements"))
+        .instrument(tracing::debug_span!(
+            "plugin.sysstat.main-diskusage.sending_measurements"
+        ))
         .await
         .into_iter()
         .collect::<Result<Vec<_>, PluginError>>()
@@ -87,15 +89,16 @@ fn measure_to_messages<'a>(
     state: &'a DiskUsageState,
     targets: &'a [Address<MeasurementReceiver>],
     disk: &sysinfo::Disk,
-) -> Result<impl Iterator<Item = (Measurement, &'a Address<MeasurementReceiver>)> + 'a, PluginError> {
+) -> Result<impl Iterator<Item = (Measurement, &'a Address<MeasurementReceiver>)> + 'a, PluginError>
+{
     let disk_name = disk
         .name()
         .to_os_string()
         .into_string()
         .map_err(|_| crate::error::Error::CannotReadDiskName)?;
 
-    let disk_fs = std::str::from_utf8(disk.file_system())
-        .map_err(crate::error::Error::Utf8Error)?;
+    let disk_fs =
+        std::str::from_utf8(disk.file_system()).map_err(crate::error::Error::Utf8Error)?;
 
     let disk_type = match disk.type_() {
         sysinfo::DiskType::HDD => "HDD",
@@ -108,18 +111,36 @@ fn measure_to_messages<'a>(
     let disk_removable = disk.is_removable();
 
     let mut hm = HashMap::new();
-    hm.insert("fs".to_string(), MeasurementValue::Text(disk_fs.to_string()));
-    hm.insert("type".to_string(), MeasurementValue::Text(disk_type.to_string()));
-    hm.insert("mountpoint".to_string(), MeasurementValue::Text(disk_mountpoint.to_string()));
-    hm.insert("total".to_string(), MeasurementValue::Float(disk_totalspace as f64));
-    hm.insert("avail".to_string(), MeasurementValue::Float(disk_availspace as f64));
-    hm.insert("removable".to_string(), MeasurementValue::Bool(disk_removable));
+    hm.insert(
+        "fs".to_string(),
+        MeasurementValue::Text(disk_fs.to_string()),
+    );
+    hm.insert(
+        "type".to_string(),
+        MeasurementValue::Text(disk_type.to_string()),
+    );
+    hm.insert(
+        "mountpoint".to_string(),
+        MeasurementValue::Text(disk_mountpoint.to_string()),
+    );
+    hm.insert(
+        "total".to_string(),
+        MeasurementValue::Float(disk_totalspace as f64),
+    );
+    hm.insert(
+        "avail".to_string(),
+        MeasurementValue::Float(disk_availspace as f64),
+    );
+    hm.insert(
+        "removable".to_string(),
+        MeasurementValue::Bool(disk_removable),
+    );
     let value = MeasurementValue::Map(hm);
     let measurement = Measurement::new(disk_name.to_string(), value);
 
-    let iter = targets.into_iter().map(move |addr| {
-        (measurement.clone(), addr)
-    });
+    let iter = targets
+        .into_iter()
+        .map(move |addr| (measurement.clone(), addr));
 
     Ok(iter)
 }
diff --git a/plugins/plugin_sysstat/src/main/load.rs b/plugins/plugin_sysstat/src/main/load.rs
index 6e7f4253..e12815ea 100644
--- a/plugins/plugin_sysstat/src/main/load.rs
+++ b/plugins/plugin_sysstat/src/main/load.rs
@@ -56,7 +56,10 @@ pub async fn main_load(state: Arc<Mutex<LoadState>>) -> Result<(), PluginError>
     let mut hm = HashMap::new();
     hm.insert(String::from("one"), MeasurementValue::Float(load.one));
     hm.insert(String::from("five"), MeasurementValue::Float(load.five));
-    hm.insert(String::from("fifteen"), MeasurementValue::Float(load.fifteen));
+    hm.insert(
+        String::from("fifteen"),
+        MeasurementValue::Float(load.fifteen),
+    );
     let value = MeasurementValue::Map(hm);
     let message = Measurement::new("load".to_string(), value.clone());
 
@@ -65,7 +68,9 @@ pub async fn main_load(state: Arc<Mutex<LoadState>>) -> Result<(), PluginError>
         .send_all()
         .collect::<futures::stream::FuturesUnordered<_>>()
         .collect::<Vec<Result<_, _>>>()
-        .instrument(tracing::debug_span!("plugin.sysstat.main-load.sending_measurements"))
+        .instrument(tracing::debug_span!(
+            "plugin.sysstat.main-load.sending_measurements"
+        ))
         .await
         .into_iter()
         .map(|res| {
diff --git a/plugins/plugin_sysstat/src/main/memory.rs b/plugins/plugin_sysstat/src/main/memory.rs
index 30902cb6..7dc48572 100644
--- a/plugins/plugin_sysstat/src/main/memory.rs
+++ b/plugins/plugin_sysstat/src/main/memory.rs
@@ -138,7 +138,9 @@ pub async fn main_memory(state: Arc<Mutex<MemoryState>>) -> Result<(), PluginErr
         .send_all()
         .collect::<futures::stream::FuturesUnordered<_>>()
         .collect::<Vec<Result<_, _>>>()
-        .instrument(tracing::debug_span!("plugin.sysstat.main-memory.sending_measurements"))
+        .instrument(tracing::debug_span!(
+            "plugin.sysstat.main-memory.sending_measurements"
+        ))
         .await
         .into_iter()
         .map(|res| {
diff --git a/plugins/plugin_sysstat/src/main/mod.rs b/plugins/plugin_sysstat/src/main/mod.rs
index d7f2c341..bd55c853 100644
--- a/plugins/plugin_sysstat/src/main/mod.rs
+++ b/plugins/plugin_sysstat/src/main/mod.rs
@@ -14,7 +14,10 @@ use tedge_api::Address;
 use crate::{config::SysStatConfig, plugin::MeasurementReceiver};
 
 pub trait StateFromConfig: Sized {
-    fn new_from_config(config: &SysStatConfig, addrs: Arc<Vec<Address<MeasurementReceiver>>>) -> Option<Self>;
+    fn new_from_config(
+        config: &SysStatConfig,
+        addrs: Arc<Vec<Address<MeasurementReceiver>>>,
+    ) -> Option<Self>;
 }
 
 pub trait State {
diff --git a/plugins/plugin_sysstat/src/main/network.rs b/plugins/plugin_sysstat/src/main/network.rs
index c5704a51..7e26c6b7 100644
--- a/plugins/plugin_sysstat/src/main/network.rs
+++ b/plugins/plugin_sysstat/src/main/network.rs
@@ -84,11 +84,14 @@ pub async fn main_network(state: Arc<Mutex<NetworkState>>) -> Result<(), PluginE
         .flatten()
         .collect::<Vec<_>>();
 
-    messages.into_iter()
+    messages
+        .into_iter()
         .send_all()
         .collect::<futures::stream::FuturesUnordered<_>>()
         .collect::<Vec<Result<_, _>>>()
-        .instrument(tracing::debug_span!("plugin.sysstat.main-networks.sending_measurements"))
+        .instrument(tracing::debug_span!(
+            "plugin.sysstat.main-networks.sending_measurements"
+        ))
         .await
         .into_iter()
         .collect::<Result<Vec<_>, _>>()
diff --git a/plugins/plugin_sysstat/src/main/process.rs b/plugins/plugin_sysstat/src/main/process.rs
index 8e8d5d7b..d582f0b7 100644
--- a/plugins/plugin_sysstat/src/main/process.rs
+++ b/plugins/plugin_sysstat/src/main/process.rs
@@ -102,7 +102,9 @@ pub async fn main_process(state: Arc<Mutex<ProcessState>>) -> Result<(), PluginE
         .send_all()
         .collect::<futures::stream::FuturesUnordered<_>>()
         .collect::<Vec<Result<_, _>>>()
-        .instrument(tracing::debug_span!("plugin.sysstat.main-process.sending_measurements"))
+        .instrument(tracing::debug_span!(
+            "plugin.sysstat.main-process.sending_measurements"
+        ))
         .await
         .into_iter()
         .collect::<Result<Vec<_>, _>>()
@@ -234,7 +236,6 @@ fn get_measurement(state: &ProcessState, process: &sysinfo::Process) -> Measurem
         state.all_processes.config.start_time,
         |cfg| cfg.start_time,
         { MeasurementValue::Float(process.start_time() as f64) },
-
         "start_time"
     );
 
diff --git a/plugins/plugin_sysstat/src/plugin.rs b/plugins/plugin_sysstat/src/plugin.rs
index a3eaf65b..ae166774 100644
--- a/plugins/plugin_sysstat/src/plugin.rs
+++ b/plugins/plugin_sysstat/src/plugin.rs
@@ -2,13 +2,13 @@ use std::sync::Arc;
 
 use async_trait::async_trait;
 use tedge_api::Address;
-use tedge_lib::measurement::Measurement;
-use tokio::sync::Mutex;
 use tedge_api::Plugin;
 use tedge_api::PluginError;
-use tracing::Instrument;
+use tedge_lib::measurement::Measurement;
+use tokio::sync::Mutex;
 use tracing::debug;
 use tracing::trace;
+use tracing::Instrument;
 
 use crate::config::SysStatConfig;
 use crate::main::State;