fix(warning): fix various compiler warnings

Author: omarabid

examples/internal/rbspy-connect.rs

@@ -16,7 +16,10 @@ fn main() -> Result<()> {
 
     let pid = args[1].parse::<i32>().unwrap();
 
-    let config = RbspyConfig::new(pid, 100, true, None, true);
+    let config = RbspyConfig::new(pid)
+        .sample_rate(100)
+        .lock_process(true)
+        .with_subprocesses(true);
 
     let mut agent = PyroscopeAgent::builder("http://localhost:4040", "rbspy.basic")
         .backend(Rbspy::new(config))

pyroscope_backends/src/pprof.rs

@@ -137,40 +137,6 @@ impl Backend for Pprof<'_> {
     }
 }
 
-// Copyright: https://github.com/YangKeao
-fn fold<W>(report: &pprof::Report, with_thread_name: bool, mut writer: W) -> Result<()>
-where
-    W: std::io::Write,
-{
-    for (key, value) in report.data.iter() {
-        if with_thread_name {
-            if !key.thread_name.is_empty() {
-                write!(writer, "{};", key.thread_name)?;
-            } else {
-                write!(writer, "{:?};", key.thread_id)?;
-            }
-        }
-
-        for (index, frame) in key.frames.iter().rev().enumerate() {
-            for (index, symbol) in frame.iter().rev().enumerate() {
-                if index + 1 == frame.len() {
-                    write!(writer, "{}", symbol)?;
-                } else {
-                    write!(writer, "{};", symbol)?;
-                }
-            }
-
-            if index + 1 != key.frames.len() {
-                write!(writer, ";")?;
-            }
-        }
-
-        writeln!(writer, " {}", value)?;
-    }
-
-    Ok(())
-}
-
 impl From<pprof::Report> for Report {
     fn from(report: pprof::Report) -> Self {
         //convert report to Report

pyroscope_backends/src/pyspy.rs

@@ -169,6 +169,12 @@ impl Backend for Pyspy {
             return Err(BackendError::new("Rbspy: No Process ID Specified"));
         }
 
+        // Set duration for py-spy
+        let duration = match self.config.time_limit {
+            Some(duration) => py_spy::config::RecordDuration::Seconds(duration.as_secs()),
+            None => py_spy::config::RecordDuration::Unlimited,
+        };
+
         // Create a new py-spy configuration
         self.sampler_config = Some(Config {
             blocking: self.config.lock_process.clone(),
@@ -179,6 +185,7 @@ impl Backend for Pyspy {
             include_thread_ids: true,
             subprocesses: self.config.with_subprocesses,
             gil_only: self.config.gil_only,
+            duration,
             ..Config::default()
         });
 

pyroscope_backends/src/rbspy.rs

@@ -1,7 +1,7 @@
 use super::error::{BackendError, Result};
 use super::types::{Backend, State};
 
-use rbspy::{sampler::Sampler, ui::output::Outputter, OutputFormat, StackFrame, StackTrace};
+use rbspy::{sampler::Sampler, ui::output::Outputter, StackFrame, StackTrace};
 
 use std::collections::HashMap;
 use std::io::Write;

pyroscope_backends/src/types.rs

@@ -345,7 +345,7 @@ mod tests {
 
     #[test]
     fn test_report_record() {
-        let mut report = Report::new();
+        let mut report = Report::new(HashMap::new());
 
         let stack_trace = StackTrace::new(None, None, None, vec![]);
 
@@ -355,7 +355,7 @@ mod tests {
 
     #[test]
     fn test_report_clear() {
-        let mut report = Report::new();
+        let mut report = Report::new(HashMap::new());
 
         let stack_trace = StackTrace::new(None, None, None, vec![]);
 
@@ -388,7 +388,7 @@ mod tests {
         ));
         let stack_trace = StackTrace::new(None, None, None, frames);
 
-        let mut report = Report::new();
+        let mut report = Report::new(HashMap::new());
 
         report.record(stack_trace.clone()).unwrap();
         report.record(stack_trace).unwrap();

pyroscope_backends/src/void.rs

@@ -61,7 +61,7 @@ impl Backend for VoidBackend {
         let stack_trace = generate_stack_trace()?;
 
         // Add the StackTrace to the buffer
-        self.buffer.record(stack_trace);
+        self.buffer.record(stack_trace)?;
 
         Ok(())
     }

src/pyroscope.rs

@@ -5,7 +5,6 @@ use std::{
         Arc, Condvar, Mutex,
     },
     thread::JoinHandle,
-    time::Duration,
 };
 
 use crate::{