Merge pull request #27 from aliasaria/add-soc-info-to-pipe-output-json

adds soc info to pipe json

Author: vladkens

src/main.rs

@@ -17,6 +17,10 @@ enum Commands {
     /// Number of samples to run for. Set to 0 to run indefinitely
     #[arg(short, long, default_value_t = 0)]
     samples: u32,
+
+    /// Include SoC information in the output
+    #[arg(long, default_value_t = false)]
+    soc_info: bool,
   },
 
   /// Print debug information
@@ -40,14 +44,23 @@ fn main() -> Result<(), Box<dyn Error>> {
   let args = Cli::parse();
 
   match &args.command {
-    Some(Commands::Pipe { samples }) => {
+    Some(Commands::Pipe { samples, soc_info }) => {
       let mut sampler = Sampler::new()?;
       let mut counter = 0u32;
 
+      let soc_info_val = if *soc_info {
+        Some(sampler.get_soc_info().clone())
+      } else {
+        None
+      };
+
       loop {
         let doc = sampler.get_metrics(args.interval.max(100))?;
 
         let mut doc = serde_json::to_value(&doc)?;
+        if let Some(ref soc) = soc_info_val {
+          doc["soc"] = serde_json::to_value(soc)?;
+        }
         doc["timestamp"] = serde_json::to_value(chrono::Utc::now().to_rfc3339())?;
         let doc = serde_json::to_string(&doc)?;
 

src/metrics.rs

@@ -296,4 +296,9 @@ impl Sampler {
 
     Ok(rs)
   }
+
+  /// Getter for the `soc` field
+  pub fn get_soc_info(&self) -> &SocInfo {
+    &self.soc
+  }
 }

src/sources.rs

@@ -21,6 +21,7 @@ use core_foundation::{
   number::{CFNumberCreate, CFNumberRef, kCFNumberSInt32Type},
   string::{CFStringCreateWithBytesNoCopy, CFStringGetCString, CFStringRef, kCFStringEncodingUTF8},
 };
+use serde::Serialize;
 
 pub type WithError<T> = Result<T, Box<dyn std::error::Error>>;
 pub type CVoidRef = *const std::ffi::c_void;
@@ -368,7 +369,7 @@ pub fn libc_swap() -> WithError<(u64, u64)> {
 
 // MARK: SockInfo
 
-#[derive(Debug, Default, Clone)]
+#[derive(Debug, Default, Clone, Serialize)]
 pub struct SocInfo {
   pub mac_model: String,
   pub chip_name: String,