diff --git a/Cargo.toml b/Cargo.toml index 01a19a8..ce7885a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,5 +17,5 @@ notify = ["dep:libc", "dep:rustix"] [dependencies] libc = { version = "0.2.150", optional = true } +log = "0.4.20" rustix = { version = "0.38.26", optional = true, features = ["net"] } -tracing = { version = "0.1.40", default-features = false, features = ["std", "log"] } diff --git a/src/listen/mod.rs b/src/listen/mod.rs index 5bd7763..f91b637 100644 --- a/src/listen/mod.rs +++ b/src/listen/mod.rs @@ -108,9 +108,7 @@ impl FileDescriptor { pub fn receive( unset_env: bool, ) -> Result>, ReceiveError> { - let span = tracing::info_span!("receive", f_unset_env = ?unset_env); - let _enter = span.enter(); - + log::trace!("Receiving file descriptors."); let fds = Self::inner_receive(unset_env)?; match Self::from_fds(fds) { @@ -135,9 +133,7 @@ impl FileDescriptor { /// (In short it needs to follow the safety constraints of [`OwnedFd::from_raw_fd`](std::os::fd::FromRawFd)). /// The simplest way to insure that it is so is to only use functions from this crate to get these file descriptors. pub unsafe fn receive_no_dup() -> Result, ReceiveError> { - let span = tracing::info_span!("receive_no_dup"); - let _enter = span.enter(); - + log::trace!("Receiving file descriptors without duplication."); let fds = Self::inner_receive(true)?; Self::from_fds_no_dup(fds).map_err(ReceiveError::GetFds) @@ -146,7 +142,7 @@ impl FileDescriptor { fn inner_receive(unset_env: bool) -> Result { let pid = env::var_os(PID_VAR).ok_or(ReceiveError::NoListenPID)?; let fds = env::var_os(FD_NUMBER_VAR).ok_or(ReceiveError::NoListenFD)?; - tracing::trace!("{PID_VAR} = {pid:?}; {FD_NUMBER_VAR} = {fds:?}"); + log::trace!("{PID_VAR} = {pid:?}; {FD_NUMBER_VAR} = {fds:?}"); if unset_env { env::remove_var(PID_VAR); @@ -189,8 +185,6 @@ impl FileDescriptor { unset_env: bool, ) -> Result)>, ReceiveNameError> { - let span = tracing::info_span!("receive_with_names", f_unset_env = ?unset_env); - let _enter = span.enter(); let ret = Self::get_names()? .into_iter() .zip(Self::receive(unset_env)?); @@ -214,15 +208,13 @@ impl FileDescriptor { /// The simplest way to insure that it is so is to only use functions from this crate to get these file descriptors. pub unsafe fn receive_with_names_no_dup( ) -> Result, ReceiveNameError> { - let span = tracing::info_span!("receive_with_names_no_dups"); - let _enter = span.enter(); let ret = Self::get_names()?.into_iter().zip(Self::receive_no_dup()?); Ok(ret) } fn get_names() -> Result, ReceiveNameError> { let fd_names = env::var_os(FD_NAMES_VAR).ok_or(ReceiveNameError::NoListenFDName)?; - tracing::trace!("{FD_NAMES_VAR} = {fd_names:?}"); + log::trace!("{FD_NAMES_VAR} = {fd_names:?}"); Ok(fd_names .as_encoded_bytes() .split(|b| *b == b':') diff --git a/src/notify/mod.rs b/src/notify/mod.rs index 7538dbc..6b634a5 100644 --- a/src/notify/mod.rs +++ b/src/notify/mod.rs @@ -45,18 +45,15 @@ impl Notifier { /// /// This function error out if the socket couldn't be opened. pub fn new(unset_env: bool) -> Result, NewNotifierError> { - let span = tracing::info_span!("new", f_unset_env = ?unset_env); - let _enter = span.enter(); - - tracing::info!("Opening NOTIFY_SOCKET if available."); + log::info!("Opening NOTIFY_SOCKET if available."); let env_sock = match env::var_os("NOTIFY_SOCKET") { None => return Ok(None), Some(v) => v, }; - tracing::debug!("NOTIFY_SOCKET = {env_sock:?}"); + log::debug!("NOTIFY_SOCKET = {env_sock:?}"); if unset_env { - tracing::trace!("Removing NOTIFY_SOCKET from environment."); + log::trace!("Removing NOTIFY_SOCKET from environment."); env::remove_var("NOTIFY_SOCKET"); } @@ -70,12 +67,12 @@ impl Notifier { unsafe { OsString::from_encoded_bytes_unchecked(v.to_vec()) } }) { Some(stripped_addr) => { - tracing::trace!("Opening abstract socket {stripped_addr:?}."); + log::trace!("Opening abstract socket {stripped_addr:?}."); rustix::net::SocketAddrUnix::new_abstract_name(stripped_addr.as_encoded_bytes()) .map_err(NewNotifierError::InvalidAbstractSocket)? } None => { - tracing::trace!("Opening named socket {env_sock:?}."); + log::trace!("Opening named socket {env_sock:?}."); rustix::net::SocketAddrUnix::new(env_sock) .map_err(NewNotifierError::InvalidSocketPath)? } @@ -101,10 +98,6 @@ impl Notifier { state: &[NotifyState<'_>], fds: &[BorrowedFd], ) -> Result<(), NotifyError> { - let span = - tracing::info_span!("notify_with_fds", f_self = ?self, f_state = ?state, f_fds = ?fds); - let _enter = span.enter(); - let msg = state .iter() .fold(String::new(), |acc, state| format!("{acc}{state}\n")) @@ -113,10 +106,10 @@ impl Notifier { let msg_iov = IoSlice::new(&msg); let mut ancillary = if fds.is_empty() { - tracing::trace!("No file descriptors provided, not sending ancillary messages."); + log::trace!("No file descriptors provided, not sending ancillary messages."); rustix::net::SendAncillaryBuffer::default() } else { - tracing::trace!( + log::trace!( "{} file descriptors provided, sending through ancillary messages", fds.len() ); @@ -128,8 +121,7 @@ impl Notifier { ancillary }; - span.record("expected_length", msg_len); - tracing::debug!("Sending notification messages."); + log::debug!("Sending notification messages."); let sent_len = rustix::net::sendmsg_unix( self.socket.as_fd(), &self.sock_addr, @@ -138,11 +130,10 @@ impl Notifier { rustix::net::SendFlags::empty(), ) .map_err(NotifyError::SendMsg)?; - span.record("sent_length", sent_len); - tracing::debug!("Notification message sent. {sent_len} bytes sent."); + log::debug!("Notification message sent. {sent_len} bytes sent."); if sent_len != msg_len { - tracing::error!("The notification message couldn't be completely sent!"); + log::error!("The notification message couldn't be completely sent!"); return Err(NotifyError::PartialSend); }