clean up debug printing

Author: oxkitsune

booster_sdk/src/dds/rpc.rs

@@ -123,18 +123,6 @@ fn normalize_service_topic(service_topic: &str) -> String {
     trimmed.to_owned()
 }
 
-fn rpc_debug_enabled() -> bool {
-    std::env::var("BOOSTER_RPC_DEBUG")
-        .map(|value| {
-            let value = value.trim();
-            value == "1"
-                || value.eq_ignore_ascii_case("true")
-                || value.eq_ignore_ascii_case("yes")
-                || value.eq_ignore_ascii_case("on")
-        })
-        .unwrap_or(false)
-}
-
 fn preview_for_log(value: &str, max_chars: usize) -> String {
     let mut preview = String::new();
     let mut chars = value.chars();
@@ -255,19 +243,15 @@ impl RpcClient {
     where
         R: DeserializeOwned + Send + 'static,
     {
-        let debug_enabled = rpc_debug_enabled();
-
         if self.startup_wait > Duration::from_millis(0)
             && !self.startup_wait_done.swap(true, Ordering::SeqCst)
         {
-            if debug_enabled {
-                tracing::debug!(
-                    target: "booster_sdk::rpc",
-                    service_topic = %self.service_topic,
-                    startup_wait_ms = self.startup_wait.as_millis(),
-                    "initial startup wait before first rpc call"
-                );
-            }
+            tracing::debug!(
+                target: "booster_sdk::rpc",
+                service_topic = %self.service_topic,
+                startup_wait_ms = self.startup_wait.as_millis(),
+                "initial startup wait before first rpc call"
+            );
             tokio::time::sleep(self.startup_wait).await;
         }
 
@@ -279,17 +263,15 @@ impl RpcClient {
         let header = serde_json::json!({ "api_id": api_id }).to_string();
         let service_topic = self.service_topic.clone();
 
-        if debug_enabled {
-            tracing::debug!(
-                target: "booster_sdk::rpc",
-                service_topic = %service_topic,
-                api_id,
-                request_uuid = %request_id,
-                header = %preview_for_log(&header, 200),
-                body = %preview_for_log(&body, 300),
-                "send rpc request"
-            );
-        }
+        tracing::debug!(
+            target: "booster_sdk::rpc",
+            service_topic = %service_topic,
+            api_id,
+            request_uuid = %request_id,
+            header = %preview_for_log(&header, 200),
+            body = %preview_for_log(&body, 300),
+            "send rpc request"
+        );
 
         let request = RpcReqMsg {
             uuid: request_id.clone(),
@@ -309,16 +291,14 @@ impl RpcClient {
             let response = match tokio::time::timeout(remaining, response_stream.next()).await {
                 Ok(Some(Ok(sample))) => sample.into_value(),
                 Ok(Some(Err(err))) => {
-                    if debug_enabled {
-                        tracing::warn!(
-                            target: "booster_sdk::rpc",
-                            service_topic = %service_topic,
-                            api_id,
-                            request_uuid = %request_id,
-                            error = %err,
-                            "rpc receive error"
-                        );
-                    }
+                    tracing::warn!(
+                        target: "booster_sdk::rpc",
+                        service_topic = %service_topic,
+                        api_id,
+                        request_uuid = %request_id,
+                        error = %err,
+                        "rpc receive error"
+                    );
                     return Err(DdsError::ReceiveFailed(err.to_string()).into());
                 }
                 Ok(None) => {
@@ -327,59 +307,51 @@ impl RpcClient {
                     );
                 }
                 Err(_) => {
-                    if debug_enabled {
-                        tracing::warn!(
-                            target: "booster_sdk::rpc",
-                            service_topic = %service_topic,
-                            api_id,
-                            request_uuid = %request_id,
-                            timeout_ms = timeout.as_millis(),
-                            "rpc timeout"
-                        );
-                    }
-                    return Err(RpcError::Timeout { timeout }.into());
-                }
-            };
-
-            if response.uuid != request_id {
-                if debug_enabled {
-                    tracing::debug!(
+                    tracing::warn!(
                         target: "booster_sdk::rpc",
                         service_topic = %service_topic,
                         api_id,
                         request_uuid = %request_id,
-                        response_uuid = %response.uuid,
-                        "ignoring response for a different request uuid"
+                        timeout_ms = timeout.as_millis(),
+                        "rpc timeout"
                     );
+                    return Err(RpcError::Timeout { timeout }.into());
                 }
-                continue;
-            }
+            };
 
-            let status_code = parse_status_from_header(&response.header).unwrap_or(0);
-            if debug_enabled {
+            if response.uuid != request_id {
                 tracing::debug!(
                     target: "booster_sdk::rpc",
                     service_topic = %service_topic,
                     api_id,
                     request_uuid = %request_id,
                     response_uuid = %response.uuid,
-                    status_code,
-                    header = %preview_for_log(&response.header, 200),
-                    body = %preview_for_log(&response.body, 300),
-                    "recv rpc response"
+                    "ignoring response for a different request uuid"
                 );
+                continue;
             }
 
+            let status_code = parse_status_from_header(&response.header).unwrap_or(0);
+            tracing::debug!(
+                target: "booster_sdk::rpc",
+                service_topic = %service_topic,
+                api_id,
+                request_uuid = %request_id,
+                response_uuid = %response.uuid,
+                status_code,
+                header = %preview_for_log(&response.header, 200),
+                body = %preview_for_log(&response.body, 300),
+                "recv rpc response"
+            );
+
             if status_code == -1 {
-                if debug_enabled {
-                    tracing::debug!(
-                        target: "booster_sdk::rpc",
-                        service_topic = %service_topic,
-                        api_id,
-                        request_uuid = %request_id,
-                        "ignoring intermediate status=-1"
-                    );
-                }
+                tracing::debug!(
+                    target: "booster_sdk::rpc",
+                    service_topic = %service_topic,
+                    api_id,
+                    request_uuid = %request_id,
+                    "ignoring intermediate status=-1"
+                );
                 continue;
             }