wip: Report conversion

Author: omarabid

pyroscope_backends/src/pprof.rs

@@ -1,4 +1,6 @@
-use pprof::{ProfilerGuard, ProfilerGuardBuilder, Report};
+use pprof::{ProfilerGuard, ProfilerGuardBuilder};
+
+use crate::types::{Report, StackFrame, StackTrace};
 
 use super::error::{BackendError, Result};
 use super::types::{Backend, State};
@@ -122,6 +124,7 @@ impl Backend for Pprof<'_> {
             .ok_or_else(|| BackendError::new("pprof-rs: ProfilerGuard report error"))?
             .report()
             .build()?;
+
         fold(&report, true, &mut buffer)?;
 
         // Restart Profiler
@@ -133,7 +136,7 @@ impl Backend for Pprof<'_> {
 }
 
 // Copyright: https://github.com/YangKeao
-fn fold<W>(report: &Report, with_thread_name: bool, mut writer: W) -> Result<()>
+fn fold<W>(report: &pprof::Report, with_thread_name: bool, mut writer: W) -> Result<()>
 where
     W: std::io::Write,
 {
@@ -165,3 +168,40 @@ where
 
     Ok(())
 }
+
+impl From<pprof::Report> for Report {
+    fn from(report: pprof::Report) -> Self {
+        Report { data: report.data }
+    }
+}
+
+impl From<pprof::Frames> for StackTrace {
+    fn from(frames: pprof::Frames) -> Self {
+        StackTrace::new(
+            None,
+            Some(frames.thread_id),
+            Some(frames.thread_name),
+            frames.frames.iter().map(|frame| frame.into()).collect(),
+        )
+    }
+}
+
+impl From<pprof::Symbol> for StackFrame {
+    fn from(symbol: pprof::Symbol) -> Self {
+        StackFrame::new(
+            None,
+            Some(String::from_utf8(symbol.name.unwrap_or(vec![])).unwrap_or("".to_string())),
+            Some(
+                symbol
+                    .filename
+                    .unwrap_or(std::path::PathBuf::new())
+                    .to_str()
+                    .unwrap_or("")
+                    .to_string(),
+            ),
+            None,
+            None,
+            symbol.lineno,
+        )
+    }
+}

pyroscope_backends/src/pyspy.rs

@@ -1,3 +1,5 @@
+use crate::types::Report;
+
 use super::{
     error::{BackendError, Result},
     types::{Backend, StackFrame, StackTrace, State},
@@ -119,7 +121,7 @@ pub struct Pyspy {
     /// Pyspy State
     state: State,
     /// Profiling buffer
-    buffer: Arc<Mutex<HashMap<String, usize>>>,
+    buffer: Arc<Mutex<Report>>,
     /// Pyspy Configuration
     config: PyspyConfig,
     /// Sampler configuration
@@ -140,7 +142,7 @@ impl Pyspy {
     pub fn new(config: PyspyConfig) -> Self {
         Pyspy {
             state: State::Uninitialized,
-            buffer: Arc::new(Mutex::new(HashMap::new())),
+            buffer: Arc::new(Mutex::new(Report::default())),
             config,
             sampler_config: None,
             sampler_thread: None,
@@ -223,7 +225,7 @@ impl Backend for Pyspy {
 
                     let own_trace: StackTrace = trace.clone().into();
 
-                    *buffer.lock()?.entry(own_trace.to_string()).or_insert(0) += 1;
+                    buffer.lock()?.record(own_trace)?;
                 }
             }
 
@@ -262,13 +264,7 @@ impl Backend for Pyspy {
 
         let buffer = self.buffer.clone();
 
-        let col: Vec<String> = buffer
-            .lock()?
-            .iter()
-            .map(|(k, v)| format!("{} {}", k, v))
-            .collect();
-
-        let v8: Vec<u8> = col.join("\n").into_bytes();
+        let v8: Vec<u8> = buffer.lock()?.to_string().into_bytes();
 
         buffer.lock()?.clear();
 

pyroscope_backends/src/void.rs

@@ -1,4 +1,4 @@
-use crate::types::{StackFrame, StackTrace};
+use crate::types::{Report, StackFrame, StackTrace};
 
 use super::{
     error::Result,
@@ -31,6 +31,7 @@ impl VoidConfig {
 pub struct VoidBackend {
     state: State,
     config: VoidConfig,
+    buffer: Report,
 }
 
 impl VoidBackend {
@@ -56,6 +57,12 @@ impl Backend for VoidBackend {
     }
 
     fn initialize(&mut self) -> Result<()> {
+        // Generate a dummy Stack Trace
+        let stack_trace = generate_stack_trace()?;
+
+        // Add the StackTrace to the buffer
+        self.buffer.record(stack_trace);
+
         Ok(())
     }
 
@@ -68,12 +75,7 @@ impl Backend for VoidBackend {
     }
 
     fn report(&mut self) -> Result<Vec<u8>> {
-        // Generate a dummy Stack Trace
-        let stack_trace = generate_stack_trace()?;
-
-        // Format the stack trace
-        let a = format!("{} 1", stack_trace);
-        let report = a.into_bytes();
+        let report = self.buffer.to_string().into_bytes();
 
         Ok(report)
     }