diff --git a/src/config/src/config.rs b/src/config/src/config.rs
index 54e01c0a39..87003359c0 100644
--- a/src/config/src/config.rs
+++ b/src/config/src/config.rs
@@ -1174,7 +1174,7 @@ pub struct Common {
     pub print_key_config: bool,
     #[env_config(name = "ZO_PRINT_KEY_EVENT", default = false)]
     pub print_key_event: bool,
-    #[env_config(name = "ZO_PRINT_KEY_SQL", default = false)]
+    #[env_config(name = "ZO_PRINT_KEY_SQL", default = true)]
     pub print_key_sql: bool,
     // usage reporting
     #[env_config(name = "ZO_USAGE_REPORTING_ENABLED", default = false)]
diff --git a/src/flight/src/common.rs b/src/flight/src/common.rs
index 5d6345d030..6dd64a7cef 100644
--- a/src/flight/src/common.rs
+++ b/src/flight/src/common.rs
@@ -162,7 +162,7 @@ fn collect_metrics(metrics_info: &MetricsInfo) -> Vec<Metrics> {
     let func = &metrics_info.func;
     let plan_with_metrics = DisplayableExecutionPlan::with_metrics(plan.as_ref())
         .set_show_statistics(false)
-        .indent(true)
+        .indent(false)
         .to_string();
     let stage = if func() {
         if is_super_cluster { 1 } else { 2 }
diff --git a/src/service/ingestion_tokens.rs b/src/service/ingestion_tokens.rs
index 210e7c89bc..39896a965b 100644
--- a/src/service/ingestion_tokens.rs
+++ b/src/service/ingestion_tokens.rs
@@ -157,8 +157,6 @@ pub async fn validate_token(
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-
     #[test]
     fn test_validate_name_rejects_empty() {
         let name = "";