chore: log file_name name for short (#15487)

Author: BohuTANG

src/common/tracing/src/loggers.rs

@@ -15,6 +15,7 @@
 use std::collections::BTreeMap;
 use std::fmt;
 use std::io::BufWriter;
+use std::path::Path;
 use std::sync::Arc;
 use std::time::Duration;
 use std::time::SystemTime;
@@ -231,7 +232,10 @@ fn format_text_log(out: FormatCallback, message: &fmt::Arguments, record: &log::
                 humantime::format_rfc3339_micros(SystemTime::now()),
                 record.level(),
                 record.module_path().unwrap_or(""),
-                record.file().unwrap_or(""),
+                Path::new(record.file().unwrap_or_default())
+                    .file_name()
+                    .and_then(|name| name.to_str())
+                    .unwrap_or_default(),
                 record.line().unwrap_or(0),
                 message,
                 KvDisplay::new(record.key_values()),
@@ -244,7 +248,10 @@ fn format_text_log(out: FormatCallback, message: &fmt::Arguments, record: &log::
                 humantime::format_rfc3339_micros(SystemTime::now()),
                 record.level(),
                 record.module_path().unwrap_or(""),
-                record.file().unwrap_or(""),
+                Path::new(record.file().unwrap_or_default())
+                    .file_name()
+                    .and_then(|name| name.to_str())
+                    .unwrap_or_default(),
                 record.line().unwrap_or(0),
                 message,
                 KvDisplay::new(record.key_values()),

src/query/service/src/servers/http/v1/http_query_handlers.rs

@@ -220,7 +220,6 @@ impl QueryResponse {
 /// 1. check `next_uri` before refer to other fields of the response.
 ///
 /// the client in sql logic tests should follow this.
-
 #[poem::handler]
 async fn query_final_handler(
     ctx: &HttpQueryContext,
@@ -381,14 +380,14 @@ pub(crate) async fn query_handler(
                 Ok(QueryResponse::from_internal(query.id.to_string(), resp, false).into_response())
             }
             Err(e) => {
-                error!("{}: http query fail to start sql, error: {:?}", &ctx.query_id, e);
+                error!("http query fail to start sql, error: {:?}", e);
                 ctx.set_fail();
                 Ok(req.fail_to_start_sql(&e).into_response())
             }
         }
     }
-    .in_span(root)
-    .await
+        .in_span(root)
+        .await
 }
 
 pub fn query_route() -> Route {
@@ -420,6 +419,7 @@ fn query_id_removed(query_id: &str, remove_reason: RemoveReason) -> PoemError {
         StatusCode::BAD_REQUEST,
     )
 }
+
 fn query_id_not_found(query_id: &str, node_id: &str) -> PoemError {
     PoemError::from_string(
         format!("query id {query_id} not found on {node_id}"),
@@ -437,7 +437,6 @@ fn query_id_to_trace_id(query_id: &str) -> TraceId {
 /// log it.
 struct SlowRequestLogTracker {
     started_at: std::time::Instant,
-    query_id: String,
     method: String,
     uri: String,
 }
@@ -446,7 +445,6 @@ impl SlowRequestLogTracker {
     fn new(ctx: &HttpQueryContext) -> Self {
         Self {
             started_at: std::time::Instant::now(),
-            query_id: ctx.query_id.clone(),
             method: ctx.http_method.clone(),
             uri: ctx.uri.clone(),
         }
@@ -459,8 +457,7 @@ impl Drop for SlowRequestLogTracker {
             let elapsed = self.started_at.elapsed();
             if elapsed.as_secs_f64() > 60.0 {
                 warn!(
-                    "{}: slow http query request on {} {}, elapsed: {:.2}s",
-                    self.query_id,
+                    "slow http query request on {} {}, elapsed: {:.2}s",
                     self.method,
                     self.uri,
                     elapsed.as_secs_f64()

src/query/service/src/servers/http/v1/query/http_query.rs

@@ -379,10 +379,7 @@ impl HttpQuery {
                         .set_setting(k.to_string(), v.to_string())
                         .or_else(|e| {
                             if e.code() == ErrorCode::UNKNOWN_VARIABLE {
-                                warn!(
-                                    "{}: http query unknown session setting: {}",
-                                    &ctx.query_id, k
-                                );
+                                warn!("http query unknown session setting: {}", k);
                                 Ok(())
                             } else {
                                 Err(e)
@@ -458,7 +455,6 @@ impl HttpQuery {
         let state_clone = state.clone();
         let ctx_clone = ctx.clone();
         let sql = request.sql.clone();
-        let query_id_clone = query_id.clone();
 
         let http_query_runtime_instance = GlobalQueryRuntime::instance();
         let span = if let Some(parent) = SpanContext::current_local_parent() {
@@ -493,10 +489,7 @@ impl HttpQuery {
                         affect: ctx_clone.get_affect(),
                         warnings: ctx_clone.pop_warnings(),
                     };
-                    info!(
-                        "{}: http query change state to Stopped, fail to start {:?}",
-                        &query_id_clone, e
-                    );
+                    info!("http query change state to Stopped, fail to start {:?}", e);
                     Executor::start_to_stop(&state_clone, ExecuteState::Stopped(Box::new(state)))
                         .await;
                     block_sender_closer.close();
@@ -506,7 +499,6 @@ impl HttpQuery {
         )?;
 
         let data = Arc::new(TokioMutex::new(PageManager::new(
-            query_id.clone(),
             request.pagination.max_rows_per_page,
             block_receiver,
             format_settings,

src/query/service/src/servers/http/v1/query/page_manager.rs

@@ -48,7 +48,6 @@ pub struct ResponseData {
 }
 
 pub struct PageManager {
-    query_id: String,
     max_rows_per_page: usize,
     total_rows: usize,
     total_pages: usize,
@@ -62,13 +61,11 @@ pub struct PageManager {
 
 impl PageManager {
     pub fn new(
-        query_id: String,
         max_rows_per_page: usize,
         block_receiver: SizedChannelReceiver<DataBlock>,
         format_settings: Arc<RwLock<Option<FormatSettings>>>,
     ) -> PageManager {
         PageManager {
-            query_id,
             total_rows: 0,
             last_page: None,
             total_pages: 0,
@@ -173,19 +170,15 @@ impl PageManager {
                     let d = *t - now;
                     match tokio::time::timeout(d, self.block_receiver.recv()).await {
                         Ok(Some(block)) => {
-                            debug!(
-                                "http query {}: got new block with {} rows",
-                                &self.query_id,
-                                block.num_rows()
-                            );
+                            debug!("http query got new block with {} rows", block.num_rows());
                             self.append_block(&mut res, block, remain)?;
                         }
                         Ok(None) => {
-                            info!("{}: http query reach end of blocks", &self.query_id);
+                            info!("http query reach end of blocks");
                             break;
                         }
                         Err(_) => {
-                            debug!("{}: http query long pulling timeout", &self.query_id);
+                            debug!("http query long pulling timeout");
                             break;
                         }
                     }

src/query/service/src/sessions/query_ctx.rs

@@ -407,7 +407,7 @@ impl TableContext for QueryContext {
     fn set_status_info(&self, info: &str) {
         // set_status_info is not called frequently, so we can use info! here.
         // make it easier to match the status to the log.
-        info!("{}: {}", self.get_id(), info);
+        info!("{}", info);
         let mut status = self.shared.status.write();
         *status = info.to_string();
     }