more logical rewrite with just replacing the macro on feature flag

Author: N3M0dropserver

sentry-core/Cargo.toml

@@ -20,7 +20,7 @@ name = "scope_benchmark"
 harness = false
 
 [features]
-default = ["debug_logs"]
+default = []
 client = ["rand"]
 test = ["client", "release-health"]
 debug_logs = []

sentry-core/src/client.rs

@@ -282,7 +282,6 @@ impl Client {
             event = match integration.process_event(event, &self.options) {
                 Some(event) => event,
                 None => {
-                    #[cfg(feature = "debug_logs")]
                     sentry_debug!("integration dropped event {:?}", id);
                     return None;
                 }
@@ -303,13 +302,11 @@ impl Client {
         }
 
         if let Some(ref func) = self.options.before_send {
-            #[cfg(feature = "debug_logs")]
             sentry_debug!("invoking before_send callback");
             let id = event.event_id;
             if let Some(processed_event) = func(event) {
                 event = processed_event;
             } else {
-                #[cfg(feature = "debug_logs")]
                 sentry_debug!("before_send dropped event {:?}", id);
                 return None;
             }
@@ -444,11 +441,9 @@ impl Client {
         drop(self.logs_batcher.write().unwrap().take());
         let transport_opt = self.transport.write().unwrap().take();
         if let Some(transport) = transport_opt {
-            #[cfg(feature = "debug_logs")]
             sentry_debug!("client close; request transport to shut down");
             transport.shutdown(timeout.unwrap_or(self.options.shutdown_timeout))
         } else {
-            #[cfg(feature = "debug_logs")]
             sentry_debug!("client close; no transport to shut down");
             true
         }
@@ -470,7 +465,6 @@ impl Client {
     #[cfg(feature = "logs")]
     pub fn capture_log(&self, log: Log, scope: &Scope) {
         if !self.options.enable_logs {
-            #[cfg(feature = "debug_logs")]
             sentry_debug!("[Client] called capture_log, but options.enable_logs is set to false");
             return;
         }

sentry-core/src/logs.rs

@@ -104,7 +104,6 @@ impl LogsBatcher {
             return;
         }
 
-        #[cfg(feature = "debug_logs")]
         sentry_debug!("[LogsBatcher] Flushing {} logs", logs.len());
         if let Some(ref transport) = *transport.read().unwrap() {
             let mut envelope = Envelope::new();

sentry-core/src/macros.rs

@@ -53,6 +53,7 @@ macro_rules! with_client_impl {
 // TODO: temporarily exported for use in `sentry` crate
 #[macro_export]
 #[doc(hidden)]
+#[cfg(feature = "debug_logs")]
 macro_rules! sentry_debug {
     ($($arg:tt)*) => {
         $crate::Hub::with(|hub| {
@@ -64,6 +65,16 @@ macro_rules! sentry_debug {
     }
 }
 
+/// Replace the exported macro with a no-op macro when debug_logs is disabled.
+#[macro_export]
+#[doc(hidden)]
+#[cfg(not(feature = "debug_logs"))]
+macro_rules! sentry_debug {
+    ($($arg:tt)*) => {
+        ();
+    };
+}
+
 #[allow(unused_macros)]
 macro_rules! minimal_unreachable {
     () => {

sentry-core/src/scope/real.rs

@@ -318,7 +318,6 @@ impl Scope {
             event = match processor(event) {
                 Some(event) => event,
                 None => {
-                    #[cfg(feature = "debug_logs")]
                     sentry_debug!("event processor dropped event {}", id);
                     return None;
                 }

sentry-core/src/session.rs

@@ -294,7 +294,6 @@ mod session_impl {
                     bucket.abnormal += 1;
                 }
                 SessionStatus::Ok => {
-                    #[cfg(feature = "debug_logs")]
                     sentry_debug!("unreachable: only closed sessions will be enqueued");
                 }
             }

sentry/Cargo.toml

@@ -49,6 +49,7 @@ opentelemetry = ["sentry-opentelemetry"]
 test = ["sentry-core/test"]
 release-health = ["sentry-core/release-health", "sentry-actix?/release-health"]
 logs = ["sentry-core/logs", "sentry-tracing?/logs", "sentry-log?/logs"]
+debug_logs = ["sentry-core/debug_logs"]
 # transports
 transport = ["reqwest", "native-tls"]
 reqwest = ["dep:reqwest", "httpdate", "tokio"]

sentry/src/init.rs

@@ -31,10 +31,8 @@ impl ClientInitGuard {
 impl Drop for ClientInitGuard {
     fn drop(&mut self) {
         if self.is_enabled() {
-            #[cfg(feature = "debug_logs")]
             sentry_debug!("dropping client guard -> disposing client");
         } else {
-            #[cfg(feature = "debug_logs")]
             sentry_debug!("dropping client guard (no client to dispose)");
         }
         // end any session that might be open before closing the client
@@ -108,10 +106,8 @@ where
 
     Hub::with(|hub| hub.bind_client(Some(client.clone())));
     if let Some(dsn) = client.dsn() {
-        #[cfg(feature = "debug_logs")]
         sentry_debug!("enabled sentry client for DSN {}", dsn);
     } else {
-        #[cfg(feature = "debug_logs")]
         sentry_debug!("initialized disabled sentry client due to disabled or invalid DSN");
     }
     #[cfg(feature = "release-health")]

sentry/src/transports/curl.rs

@@ -51,13 +51,11 @@ impl CurlHttpTransport {
             match (scheme, &http_proxy, &https_proxy) {
                 (Scheme::Https, _, Some(proxy)) => {
                     if let Err(err) = handle.proxy(proxy) {
-                        #[cfg(feature = "debug_logs")]
                         sentry_debug!("invalid proxy: {:?}", err);
                     }
                 }
                 (_, Some(proxy), _) => {
                     if let Err(err) = handle.proxy(proxy) {
-                        #[cfg(feature = "debug_logs")]
                         sentry_debug!("invalid proxy: {:?}", err);
                     }
                 }
@@ -88,7 +86,6 @@ impl CurlHttpTransport {
                         curl::easy::InfoType::DataOut => "",
                         _ => return,
                     };
-                    #[cfg(feature = "debug_logs")]
                     sentry_debug!("curl: {}{}", prefix, String::from_utf8_lossy(data).trim());
                 })
                 .unwrap();
@@ -127,7 +124,6 @@ impl CurlHttpTransport {
                     }
                 }
                 Err(err) => {
-                    #[cfg(feature = "debug_logs")]
                     sentry_debug!("Failed to send envelope: {}", err);
                 }
             }

sentry/src/transports/embedded_svc_http.rs

@@ -58,7 +58,6 @@ impl EmbeddedSVCHttpTransport {
 impl Transport for EmbeddedSVCHttpTransport {
     fn send_envelope(&self, envelope: sentry_core::Envelope) {
         if let Err(err) = self.send_envelope(envelope) {
-            #[cfg(feature = "debug_logs")]
             sentry_debug!("Failed to send envelope: {}", err);
         }
     }