feat: support threaded connectivity

Signed-off-by: Alexandre Rulleau <[email protected]>

Author: Leiyks

datadog-sidecar-ffi/src/lib.rs

@@ -32,6 +32,12 @@ use datadog_sidecar::service::{
 };
 use datadog_sidecar::service::{get_telemetry_action_sender, InternalTelemetryActions};
 use datadog_sidecar::shm_remote_config::{path_for_remote_config, RemoteConfigReader};
+#[cfg(unix)]
+use datadog_sidecar::{connect_worker_unix, start_master_listener_unix};
+#[cfg(windows)]
+use datadog_sidecar::{
+    connect_worker_windows, start_master_listener_windows, transport_from_owned_handle,
+};
 use datadog_trace_utils::msgpack_encoder;
 use ddcommon::tag::Tag;
 use ddcommon::Endpoint;
@@ -305,8 +311,6 @@ pub extern "C" fn ddog_remote_config_reader_drop(_: Box<RemoteConfigReader>) {}
 #[no_mangle]
 pub extern "C" fn ddog_sidecar_transport_drop(_: Box<SidecarTransport>) {}
 
-/// # Safety
-/// Caller must ensure the process is safe to fork, at the time when this method is called
 #[no_mangle]
 pub extern "C" fn ddog_sidecar_connect(connection: &mut *mut SidecarTransport) -> MaybeError {
     let cfg = datadog_sidecar::config::FromEnv::config();
@@ -317,6 +321,38 @@ pub extern "C" fn ddog_sidecar_connect(connection: &mut *mut SidecarTransport) -
     MaybeError::None
 }
 
+#[no_mangle]
+pub extern "C" fn ddog_sidecar_connect_master(master_pid: i32) -> MaybeError {
+    #[cfg(unix)]
+    {
+        try_c!(start_master_listener_unix(master_pid));
+    }
+    #[cfg(windows)]
+    {
+        try_c!(start_master_listener_windows(master_pid));
+    }
+    MaybeError::None
+}
+
+#[no_mangle]
+pub extern "C" fn ddog_sidecar_connect_worker(
+    master_pid: i32,
+    connection: &mut *mut SidecarTransport,
+) -> MaybeError {
+    #[cfg(unix)]
+    {
+        let transport = Box::new(try_c!(connect_worker_unix(master_pid)));
+        *connection = Box::into_raw(transport);
+    }
+    #[cfg(windows)]
+    {
+        let handle = try_c!(connect_worker_windows(master_pid));
+        let transport = Box::new(try_c!(transport_from_owned_handle(handle)));
+        *connection = Box::into_raw(transport);
+    }
+    MaybeError::None
+}
+
 #[no_mangle]
 pub extern "C" fn ddog_sidecar_ping(transport: &mut Box<SidecarTransport>) -> MaybeError {
     try_c!(blocking::ping(transport));

datadog-sidecar/src/config.rs

@@ -36,6 +36,8 @@ const ENV_SIDECAR_APPSEC_LOCK_FILE_PATH: &str = "_DD_SIDECAR_APPSEC_LOCK_FILE_PA
 const ENV_SIDECAR_APPSEC_LOG_FILE_PATH: &str = "_DD_SIDECAR_APPSEC_LOG_FILE_PATH";
 const ENV_SIDECAR_APPSEC_LOG_LEVEL: &str = "_DD_SIDECAR_APPSEC_LOG_LEVEL";
 
+const ENV_SIDECAR_CONNECT_TO_MASTER_PID: &str = "_DD_SIDECAR_CONNECT_TO_MASTER_PID";
+
 #[derive(Debug, Copy, Clone, Default)]
 pub enum IpcMode {
     #[default]
@@ -84,6 +86,7 @@ pub struct Config {
     pub crashtracker_endpoint: Option<Endpoint>,
     pub appsec_config: Option<AppSecConfig>,
     pub max_memory: usize,
+    pub connect_to_master_pid: i32,
 }
 
 #[derive(Debug, Clone)]
@@ -128,6 +131,12 @@ impl Config {
                 format!("{}", self.max_memory).into(),
             );
         }
+        if self.connect_to_master_pid != 0 {
+            res.insert(
+                ENV_SIDECAR_CONNECT_TO_MASTER_PID,
+                format!("{}", self.connect_to_master_pid).into(),
+            );
+        }
         res
     }
 }
@@ -241,9 +250,17 @@ impl FromEnv {
             crashtracker_endpoint: Self::crashtracker_endpoint(),
             appsec_config: Self::appsec_config(),
             max_memory: Self::max_memory(),
+            connect_to_master_pid: Self::connect_to_master_pid(),
         }
     }
 
+    fn connect_to_master_pid() -> i32 {
+        std::env::var(ENV_SIDECAR_CONNECT_TO_MASTER_PID)
+            .ok()
+            .and_then(|s| s.parse().ok())
+            .unwrap_or(0)
+    }
+
     fn appsec_config() -> Option<AppSecConfig> {
         let shared_lib_path = std::env::var_os(ENV_SIDECAR_APPSEC_SHARED_LIB_PATH)?;
         let socket_file_path = std::env::var_os(ENV_SIDECAR_APPSEC_SOCKET_FILE_PATH)?;

datadog-sidecar/src/entry.rs

@@ -219,8 +219,8 @@ pub fn daemonize(listener: IpcServer, mut cfg: Config) -> anyhow::Result<()> {
 
 pub fn start_or_connect_to_sidecar(cfg: Config) -> anyhow::Result<SidecarTransport> {
     let liaison = match cfg.ipc_mode {
-        config::IpcMode::Shared => setup::DefaultLiason::ipc_shared(),
-        config::IpcMode::InstancePerProcess => setup::DefaultLiason::ipc_per_process(),
+        config::IpcMode::Shared => setup::DefaultLiaison::ipc_shared(),
+        config::IpcMode::InstancePerProcess => setup::DefaultLiaison::ipc_per_process(),
     };
 
     let err = match liaison.attempt_listen() {

datadog-sidecar/src/setup/mod.rs

@@ -23,4 +23,5 @@ pub trait Liaison: Sized {
     fn attempt_listen(&self) -> io::Result<Option<IpcServer>>;
     fn ipc_shared() -> Self;
     fn ipc_per_process() -> Self;
+    fn for_master_pid(master_pid: u32) -> Self;
 }

datadog-sidecar/src/setup/unix.rs

@@ -89,6 +89,10 @@ impl Liaison for SharedDirLiaison {
         let liason_path = env::temp_dir().join(format!("libdatadog.{}.{pid}", *PROCESS_RANDOM_ID));
         Self::new(liason_path)
     }
+
+    fn for_master_pid(master_pid: u32) -> Self {
+        Self::new(env::temp_dir().join(format!("libdatadog.{}", master_pid)))
+    }
 }
 
 impl SharedDirLiaison {
@@ -141,7 +145,7 @@ mod linux {
     pub struct AbstractUnixSocketLiaison {
         path: PathBuf,
     }
-    pub type DefaultLiason = AbstractUnixSocketLiaison;
+    pub type DefaultLiaison = AbstractUnixSocketLiaison;
 
     impl Liaison for AbstractUnixSocketLiaison {
         fn connect_to_server(&self) -> io::Result<Channel> {
@@ -173,6 +177,14 @@ mod linux {
             ));
             Self { path }
         }
+
+        fn for_master_pid(master_pid: u32) -> Self {
+            let path = PathBuf::from(format!(
+                concat!("libdatadog/", crate::sidecar_version!(), ".{}.sock"),
+                master_pid
+            ));
+            Self { path }
+        }
     }
 
     impl Default for AbstractUnixSocketLiaison {
@@ -193,7 +205,7 @@ mod linux {
 pub use linux::*;
 
 #[cfg(target_os = "macos")]
-pub type DefaultLiason = SharedDirLiaison;
+pub type DefaultLiaison = SharedDirLiaison;
 
 #[cfg(test)]
 mod tests {

datadog-sidecar/src/setup/windows.rs

@@ -166,6 +166,11 @@ impl Liaison for NamedPipeLiaison {
     fn ipc_per_process() -> Self {
         Self::new(format!("libdatadog_{}_", unsafe { getpid() }))
     }
+
+    fn for_master_pid(master_pid: u32) -> Self {
+        let path = env::temp_dir().join(format!("libdatadog.{}", master_pid));
+        Self::new(path.to_string_lossy().as_ref())
+    }
 }
 
 impl NamedPipeLiaison {
@@ -197,7 +202,7 @@ impl Default for NamedPipeLiaison {
     }
 }
 
-pub type DefaultLiason = NamedPipeLiaison;
+pub type DefaultLiaison = NamedPipeLiaison;
 
 #[cfg(test)]
 mod tests {

datadog-sidecar/src/unix.rs

@@ -3,7 +3,9 @@
 
 use spawn_worker::{getpid, SpawnWorker, Stdio, TrampolineData};
 
-use std::ffi::CString;
+use crate::service::blocking::SidecarTransport;
+use crate::setup::{DefaultLiaison, Liaison};
+use std::ffi::{CStr, CString};
 use std::os::unix::net::UnixListener as StdUnixListener;
 
 use crate::config::Config;
@@ -13,6 +15,7 @@ use nix::sys::socket::{shutdown, Shutdown};
 use std::io;
 use std::os::fd::RawFd;
 use std::os::unix::prelude::{AsRawFd, FromRawFd, IntoRawFd, OwnedFd};
+use std::thread;
 use std::time::Instant;
 use tokio::net::{UnixListener, UnixStream};
 use tokio::select;
@@ -28,10 +31,43 @@ use datadog_crashtracker::{
 #[cfg(target_os = "linux")]
 use spawn_worker::{entrypoint, get_dl_path_raw};
 #[cfg(target_os = "linux")]
-use std::ffi::CStr;
-#[cfg(target_os = "linux")]
 use tracing::warn;
 
+pub fn start_master_listener_unix(master_pid: i32) -> io::Result<()> {
+    let liaison = DefaultLiaison::for_master_pid(master_pid as u32);
+
+    // Try to acquire the listening endpoint via the liaison
+    let std_listener = match liaison.attempt_listen()? {
+        Some(l) => l,
+        None => return Ok(()),
+    };
+
+    let _ = thread::Builder::new()
+        .name("dd-sidecar".into())
+        .spawn(move || {
+            let acquire_listener = move || -> io::Result<_> {
+                std_listener.set_nonblocking(true)?;
+                let listener = UnixListener::from_std(std_listener.try_clone()?)?;
+                let cancel = {
+                    let fd = listener.as_raw_fd();
+                    move || stop_listening(fd)
+                };
+                Ok((move |handler| accept_socket_loop(listener, handler), cancel))
+            };
+
+            let _ = enter_listener_loop(acquire_listener);
+        })
+        .map_err(io::Error::other)?;
+
+    Ok(())
+}
+
+pub fn connect_worker_unix(master_pid: i32) -> io::Result<SidecarTransport> {
+    let liaison = DefaultLiaison::for_master_pid(master_pid as u32);
+    let channel = liaison.connect_to_server()?;
+    Ok(channel.into())
+}
+
 #[no_mangle]
 #[allow(unused)]
 pub extern "C" fn ddog_daemon_entry_point(trampoline_data: &TrampolineData) {