chore(tracing): drop duplicated inline tags

Author: BohuTANG

src/query/ee/src/storages/fuse/operations/vacuum_table_v2.rs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Logs from this module will show up as "[FUSE-VACUUM2] ...".
+// Logs from this module will show up as "...".
 databend_common_tracing::register_module_tag!("[FUSE-VACUUM2]");
 
 use std::collections::HashSet;
@@ -92,7 +92,7 @@ pub async fn do_vacuum2(
     {
         if ctx.txn_mgr().lock().is_active() {
             info!(
-                "[FUSE-VACUUM2] Transaction is active, skipping vacuum, target table {}",
+                "Transaction is active, skipping vacuum, target table {}",
                 table.get_table_info().desc
             );
             return Ok(vec![]);
@@ -103,7 +103,7 @@ pub async fn do_vacuum2(
 
     let Some(latest_snapshot) = fuse_table.read_table_snapshot().await? else {
         info!(
-            "[FUSE-VACUUM2] Table {} has no snapshot, stopping vacuum",
+            "Table {} has no snapshot, stopping vacuum",
             fuse_table.get_table_info().desc
         );
         return Ok(vec![]);
@@ -119,10 +119,7 @@ pub async fn do_vacuum2(
 
     let snapshots_before_lvt = match retention_policy {
         RetentionPolicy::ByTimePeriod(delta_duration) => {
-            info!(
-                "[FUSE-VACUUM2] Using ByTimePeriod policy {:?}",
-                delta_duration
-            );
+            info!("Using ByTimePeriod policy {:?}", delta_duration);
             let retention_period = if fuse_table.is_transient() {
                 // For transient table, keep no history data
                 TimeDelta::zero()
@@ -144,7 +141,7 @@ pub async fn do_vacuum2(
             }
 
             ctx.set_status_info(&format!(
-                "[FUSE-VACUUM2] Set LVT for table {}, elapsed: {:?}, LVT: {:?}",
+                "Set LVT for table {}, elapsed: {:?}, LVT: {:?}",
                 fuse_table.get_table_info().desc,
                 start.elapsed(),
                 lvt
@@ -156,7 +153,7 @@ pub async fn do_vacuum2(
         }
         RetentionPolicy::ByNumOfSnapshotsToKeep(num_snapshots_to_keep) => {
             info!(
-                "[FUSE-VACUUM2] Using ByNumOfSnapshotsToKeep policy {:?}",
+                "Using ByNumOfSnapshotsToKeep policy {:?}",
                 num_snapshots_to_keep
             );
             // List the snapshot order by timestamp asc, till the current snapshot(inclusively).
@@ -198,7 +195,7 @@ pub async fn do_vacuum2(
 
     let elapsed = start.elapsed();
     ctx.set_status_info(&format!(
-        "[FUSE-VACUUM2] Listed snapshots for table {}, elapsed: {:?}, snapshots_dir: {:?}, snapshots: {:?}",
+        "Listed snapshots for table {}, elapsed: {:?}, snapshots_dir: {:?}, snapshots: {:?}",
         fuse_table.get_table_info().desc,
         elapsed,
         fuse_table
@@ -220,7 +217,7 @@ pub async fn do_vacuum2(
         return Ok(vec![]);
     };
     ctx.set_status_info(&format!(
-        "[FUSE-VACUUM2] Selected gc_root for table {}, elapsed: {:?}, gc_root: {:?}, snapshots_to_gc: {:?}",
+        "Selected gc_root for table {}, elapsed: {:?}, gc_root: {:?}, snapshots_to_gc: {:?}",
         fuse_table.get_table_info().desc,
         start.elapsed(),
         gc_root,
@@ -249,7 +246,7 @@ pub async fn do_vacuum2(
     .collect::<Vec<_>>();
 
     ctx.set_status_info(&format!(
-        "[FUSE-VACUUM2] Listed segments before gc_root for table {}, elapsed: {:?}, segment_dir: {:?}, gc_root_timestamp: {:?}, segments: {:?}",
+        "Listed segments before gc_root for table {}, elapsed: {:?}, segment_dir: {:?}, gc_root_timestamp: {:?}, segments: {:?}",
         fuse_table.get_table_info().desc,
         start.elapsed(),
         fuse_table.meta_location_generator().segment_location_prefix(),
@@ -267,7 +264,7 @@ pub async fn do_vacuum2(
         .map(|v| TableMetaLocationGenerator::gen_segment_stats_location_from_segment_location(v))
         .collect::<Vec<_>>();
     ctx.set_status_info(&format!(
-        "[FUSE-VACUUM2] Filtered segments_to_gc for table {}, elapsed: {:?}, segments_to_gc: {:?}, stats_to_gc: {:?}",
+        "Filtered segments_to_gc for table {}, elapsed: {:?}, segments_to_gc: {:?}, stats_to_gc: {:?}",
         fuse_table.get_table_info().desc,
         start.elapsed(),
         slice_summary(&segments_to_gc),
@@ -285,7 +282,7 @@ pub async fn do_vacuum2(
         gc_root_blocks.extend(segment?.block_metas()?.iter().map(|b| b.location.0.clone()));
     }
     ctx.set_status_info(&format!(
-        "[FUSE-VACUUM2] Read segments for table {}, elapsed: {:?}",
+        "Read segments for table {}, elapsed: {:?}",
         fuse_table.get_table_info().desc,
         start.elapsed(),
     ));
@@ -304,7 +301,7 @@ pub async fn do_vacuum2(
     .collect::<Vec<_>>();
 
     ctx.set_status_info(&format!(
-        "[FUSE-VACUUM2] Listed blocks before gc_root for table {}, elapsed: {:?}, block_dir: {:?}, gc_root_timestamp: {:?}, blocks: {:?}",
+        "Listed blocks before gc_root for table {}, elapsed: {:?}, block_dir: {:?}, gc_root_timestamp: {:?}, blocks: {:?}",
         fuse_table.get_table_info().desc,
         start.elapsed(),
         fuse_table.meta_location_generator().block_location_prefix(),
@@ -318,7 +315,7 @@ pub async fn do_vacuum2(
         .filter(|b| !gc_root_blocks.contains(b))
         .collect();
     ctx.set_status_info(&format!(
-        "[FUSE-VACUUM2] Filtered blocks_to_gc for table {}, elapsed: {:?}, blocks_to_gc: {:?}",
+        "Filtered blocks_to_gc for table {}, elapsed: {:?}, blocks_to_gc: {:?}",
         fuse_table.get_table_info().desc,
         start.elapsed(),
         slice_summary(&blocks_to_gc)
@@ -358,7 +355,7 @@ pub async fn do_vacuum2(
     }
 
     ctx.set_status_info(&format!(
-        "[FUSE-VACUUM2] Collected indexes_to_gc for table {}, elapsed: {:?}, indexes_to_gc: {:?}",
+        "Collected indexes_to_gc for table {}, elapsed: {:?}, indexes_to_gc: {:?}",
         fuse_table.get_table_info().desc,
         start.elapsed(),
         slice_summary(&indexes_to_gc)
@@ -402,7 +399,7 @@ pub async fn do_vacuum2(
         .chain(indexes_to_gc.into_iter())
         .collect();
     ctx.set_status_info(&format!(
-        "[FUSE-VACUUM2] Removed files for table {}, elapsed: {:?}, files_to_gc: {:?}",
+        "Removed files for table {}, elapsed: {:?}, files_to_gc: {:?}",
         fuse_table.get_table_info().desc,
         start.elapsed(),
         slice_summary(&files_to_gc)
@@ -453,7 +450,7 @@ async fn set_lvt(
 ) -> Result<Option<DateTime<Utc>>> {
     if !is_uuid_v7(&latest_snapshot.snapshot_id) {
         info!(
-            "[FUSE-VACUUM2] Latest snapshot is not v7, stopping vacuum: {:?}",
+            "Latest snapshot is not v7, stopping vacuum: {:?}",
             latest_snapshot.snapshot_id
         );
         return Ok(None);
@@ -485,7 +482,7 @@ async fn list_until_prefix(
     need_one_more: bool,
     gc_root_meta_ts: Option<DateTime<Utc>>,
 ) -> Result<Vec<Entry>> {
-    info!("[FUSE-VACUUM2] Listing files until prefix: {}", until);
+    info!("Listing files until prefix: {}", until);
     let dal = fuse_table.get_operator_ref();
 
     match dal.info().scheme() {

src/query/pipeline/core/src/processors/processor.rs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Logs from this module will show up as "[PIPELINE-EXECUTOR] ...".
+// Logs from this module will show up as "...".
 databend_common_tracing::register_module_tag!("[PIPELINE-EXECUTOR]");
 
 use std::any::Any;
@@ -178,7 +178,7 @@ impl ProcessorPtr {
                             ("error.message", err.display_text()),
                         ]
                     });
-                log::info!(error = err.to_string(); "[PIPELINE-EXECUTOR] Error in process");
+                log::info!(error = err.to_string(); "Error in process");
                 Err(err)
             }
         }
@@ -218,7 +218,7 @@ impl ProcessorPtr {
                             ("error.message", err.display_text()),
                         ]
                     });
-                    log::info!(error = err.to_string(); "[PIPELINE-EXECUTOR] Error in process");
+                    log::info!(error = err.to_string(); "Error in process");
                     Err(err)
                 }
             }

src/query/pipeline/transforms/src/lib.rs

@@ -21,7 +21,7 @@
 #![feature(assert_matches)]
 #![feature(debug_closure_helpers)]
 
-// Logs from this crate will show up as "[TRANSFORMS] ...".
+// Logs from this crate will show up as "...".
 databend_common_tracing::register_module_tag!("[TRANSFORMS]");
 
 pub mod processors;

src/query/service/src/auth.rs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Logs from this module will show up as "[AUTH] ...".
+// Logs from this module will show up as "...".
 databend_common_tracing::register_module_tag!("[AUTH]");
 
 use std::sync::Arc;
@@ -130,14 +130,15 @@ impl AuthMgr {
                 token: t,
                 client_ip,
             } => {
-                let jwt_auth = self
-                    .jwt_auth
-                    .as_ref()
-                    .ok_or_else(|| ErrorCode::AuthenticateFailure("[AUTH] JWT authentication failed: JWT auth is not configured on this server"))?;
+                let jwt_auth = self.jwt_auth.as_ref().ok_or_else(|| {
+                    ErrorCode::AuthenticateFailure(
+                        "JWT authentication failed: JWT auth is not configured on this server",
+                    )
+                })?;
                 let jwt = jwt_auth.parse_jwt_claims(t.as_str()).await?;
                 let user_name = jwt.subject.ok_or_else(|| {
                     ErrorCode::AuthenticateFailure(
-                        "[AUTH] JWT authentication failed: subject claim (user name) is missing in the token",
+                        "JWT authentication failed: subject claim (user name) is missing in the token",
                     )
                 })?;
 
@@ -157,7 +158,7 @@ impl AuthMgr {
                 {
                     Ok(mut user_info) => {
                         if user_info.auth_info != AuthInfo::JWT {
-                            return Err(ErrorCode::AuthenticateFailure("[AUTH] Authentication failed: user exists but is not configured for JWT authentication"));
+                            return Err(ErrorCode::AuthenticateFailure("Authentication failed: user exists but is not configured for JWT authentication"));
                         }
                         if let Some(ensure_user) = jwt.custom.ensure_user {
                             let current_roles = user_info.grants.roles();
@@ -166,7 +167,7 @@ impl AuthMgr {
                                 for role in roles.iter() {
                                     if !current_roles.contains(role) {
                                         info!(
-                                            "[AUTH] JWT grant role to user: {} -> {}",
+                                            "JWT grant role to user: {} -> {}",
                                             user_info.name, role
                                         );
                                         user_api
@@ -185,7 +186,7 @@ impl AuthMgr {
                                 // grant default role to user if not exists
                                 if !current_roles.contains(jwt_default_role) {
                                     info!(
-                                        "[AUTH] JWT grant default role to user: {} -> {}",
+                                        "JWT grant default role to user: {} -> {}",
                                         user_info.name, jwt_default_role
                                     );
                                     user_api
@@ -200,7 +201,7 @@ impl AuthMgr {
                                 // ensure default role to jwt role
                                 if user_info.option.default_role() != Some(jwt_default_role) {
                                     info!(
-                                        "[AUTH] JWT update default role for user: {} -> {}",
+                                        "JWT update default role for user: {} -> {}",
                                         user_info.name, jwt_default_role
                                     );
                                     user_api
@@ -226,15 +227,15 @@ impl AuthMgr {
                             }
                             _ => {
                                 return Err(ErrorCode::AuthenticateFailure(format!(
-                                    "[AUTH] Authentication failed: {}",
+                                    "Authentication failed: {}",
                                     e.message()
                                 )))
                             }
                         }
                         let ensure_user = jwt
                             .custom
                             .ensure_user
-                            .ok_or_else(|| ErrorCode::AuthenticateFailure(format!("[AUTH] JWT authentication failed: ensure_user claim is missing and user does not exist: {}", e.message())))?;
+                            .ok_or_else(|| ErrorCode::AuthenticateFailure(format!("JWT authentication failed: ensure_user claim is missing and user does not exist: {}", e.message())))?;
                         // create a new user if not exists
                         let mut user_info = UserInfo::new(&user_name, "%", AuthInfo::JWT);
                         if let Some(ref roles) = ensure_user.roles {
@@ -250,7 +251,7 @@ impl AuthMgr {
                                 .option
                                 .set_default_role(Some(default_role.clone()));
                         }
-                        info!("[AUTH] JWT create user: {}", user_info.name);
+                        info!("JWT create user: {}", user_info.name);
                         user_api
                             .add_user(&tenant, user_info.clone(), &CreateOption::CreateIfNotExists)
                             .await?;
@@ -309,16 +310,16 @@ impl AuthMgr {
                         hash_method: t,
                         ..
                     } => match p {
-                        None => Err(ErrorCode::AuthenticateFailure("[AUTH] Authentication failed: password is required but was not provided")),
+                        None => Err(ErrorCode::AuthenticateFailure("Authentication failed: password is required but was not provided")),
                         Some(p) => {
                             if *h == t.hash(p) {
                                 Ok(())
                             } else {
-                                Err(ErrorCode::AuthenticateFailure("[AUTH] Authentication failed: incorrect password"))
+                                Err(ErrorCode::AuthenticateFailure("Authentication failed: incorrect password"))
                             }
                         }
                     },
-                    _ => Err(ErrorCode::AuthenticateFailure("[AUTH] Authentication failed: user exists but is not configured for password authentication")),
+                    _ => Err(ErrorCode::AuthenticateFailure("Authentication failed: user exists but is not configured for password authentication")),
                 };
                 UserApiProvider::instance()
                     .update_user_login_result(tenant, identity, authed.is_ok(), &user)

src/query/service/src/history_tables/alter_table.rs

@@ -125,7 +125,7 @@ pub async fn should_reset(
     // Internal -> External
     if current_storage_params.is_none() && connection.is_some() {
         info!(
-            "[HISTORY-TABLES] Converting internal table to external table, current None vs new {:?}",
+            "Converting internal table to external table, current None vs new {:?}",
             connection
         );
         return Ok(true);
@@ -134,7 +134,7 @@ pub async fn should_reset(
     // External -> Internal
     if current_storage_params.is_some() && connection.is_none() {
         info!(
-            "[HISTORY-TABLES] Converting external table to internal table, current {:?} vs new None",
+            "Converting external table to internal table, current {:?} vs new None",
             current_storage_params
         );
         return Ok(false);
@@ -156,11 +156,11 @@ pub async fn should_reset(
         // return error to prevent cyclic conversion
         if current_storage_params != Some(&new_storage_params) {
             info!(
-                "[HISTORY-TABLES] Storage parameters have changed, current {:?} vs new {:?}",
+                "Storage parameters have changed, current {:?} vs new {:?}",
                 current_storage_params, new_storage_params
             );
             return Err(ErrorCode::InvalidConfig(
-                "[HISTORY-TABLES] Cannot change storage parameters of external history table, please drop the tables and stage first."
+                "Cannot change storage parameters of external history table, please drop the tables and stage first."
             ));
         }
     }