fix panic when agent is not configured #70

Author: korniltsev

pyroscope_ffi/ffikit/src/lib.rs

@@ -1,7 +1,7 @@
 use bincode::{config, Decode, Encode};
 use interprocess::local_socket::{LocalSocketListener, LocalSocketStream};
 use lazy_static::lazy_static;
-use pyroscope::error::Result;
+use pyroscope::error::{Result, PyroscopeError};
 use std::{
     io::{BufReader, Read, Write},
     sync::{
@@ -137,40 +137,17 @@ pub fn initialize_ffi() -> Result<Receiver<Signal>> {
 }
 
 pub fn send(signal: Signal) -> Result<()> {
-    // Check if SENDER is set.
-    // Send signal through forked process.
     if get_parent_pid() != std::process::id() {
         let socket_address = format!("/tmp/PYROSCOPE-{}", get_parent_pid());
-
-        log::trace!(
-            target: LOG_TAG,
-            "Sending signal {:?} through socket {}",
-            signal,
-            &socket_address
-        );
-
-        // Connect to the socket.
         let mut conn = LocalSocketStream::connect(socket_address)?;
-
-        // encode signal
         let buffer = bincode::encode_to_vec(&signal, config::standard()).unwrap();
-
-        // Write the message.
         conn.write_all(&buffer)?;
-
-        // Flush the connection.
         conn.flush()?;
     } else {
-        // Send signal through parent process.
         if let Some(sender) = &*SENDER.lock()? {
-            log::trace!(
-                target: LOG_TAG,
-                "Sending signal {:?} through FFI channel",
-                signal
-            );
             sender.send(signal)?;
         } else {
-            log::error!(target: LOG_TAG, "FFI channel not initialized");
+            return Err(PyroscopeError::new( "FFI channel not initialized"));
         }
     }
 

pyroscope_ffi/python/lib/src/lib.rs

@@ -151,10 +151,7 @@ pub extern "C" fn initialize_agent(
 
 #[no_mangle]
 pub extern "C" fn drop_agent() -> bool {
-    // Send Kill signal to the FFI merge channel.
-    ffikit::send(ffikit::Signal::Kill).unwrap();
-
-    true
+    return ffikit::send(ffikit::Signal::Kill).is_ok();
 }
 
 #[no_mangle]
@@ -170,9 +167,7 @@ pub extern "C" fn add_thread_tag(thread_id: u64, key: *const c_char, value: *con
     hasher.write_u64(thread_id % pid as u64);
     let id = hasher.finish();
 
-    ffikit::send(ffikit::Signal::AddThreadTag(id, key, value)).unwrap();
-
-    true
+    return ffikit::send(ffikit::Signal::AddThreadTag(id, key, value)).is_ok();
 }
 
 #[no_mangle]
@@ -190,9 +185,7 @@ pub extern "C" fn remove_thread_tag(
     hasher.write_u64(thread_id % pid as u64);
     let id = hasher.finish();
 
-    ffikit::send(ffikit::Signal::RemoveThreadTag(id, key, value)).unwrap();
-
-    true
+    return ffikit::send(ffikit::Signal::RemoveThreadTag(id, key, value)).is_ok();
 }
 
 #[no_mangle]
@@ -203,9 +196,7 @@ pub extern "C" fn add_global_tag(key: *const c_char, value: *const c_char) -> bo
         .unwrap()
         .to_owned();
 
-    ffikit::send(ffikit::Signal::AddGlobalTag(key, value)).unwrap();
-
-    true
+    return ffikit::send(ffikit::Signal::AddGlobalTag(key, value)).is_ok();
 }
 
 #[no_mangle]
@@ -216,9 +207,7 @@ pub extern "C" fn remove_global_tag(key: *const c_char, value: *const c_char) ->
         .unwrap()
         .to_owned();
 
-    ffikit::send(ffikit::Signal::RemoveGlobalTag(key, value)).unwrap();
-
-    true
+    return ffikit::send(ffikit::Signal::RemoveGlobalTag(key, value)).is_ok();
 }
 
 // Convert a string of tags to a Vec<(&str, &str)>