From b80127b6fdc9024d5ebfdc4efc16422e8f1f13fc Mon Sep 17 00:00:00 2001 From: Mehul Kar Date: Mon, 29 Jul 2024 11:53:23 -0500 Subject: [PATCH 1/5] chore: reduce logging when there are no hashable env vars --- crates/turborepo-lib/src/task_hash.rs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/crates/turborepo-lib/src/task_hash.rs b/crates/turborepo-lib/src/task_hash.rs index 7a291de98abe8..731915f95c5a8 100644 --- a/crates/turborepo-lib/src/task_hash.rs +++ b/crates/turborepo-lib/src/task_hash.rs @@ -366,12 +366,14 @@ impl<'a> TaskHasher<'a> { let external_deps_hash = is_monorepo.then(|| get_external_deps_hash(&workspace.transitive_dependencies)); - debug!( - "task hash env vars for {}:{}\n vars: {:?}", - task_id.package(), - task_id.task(), - hashable_env_pairs - ); + if (hashable_env_pairs.len() > 0) { + debug!( + "task hash env vars for {}:{}\n vars: {:?}", + task_id.package(), + task_id.task(), + hashable_env_pairs + ); + } let package_dir = workspace.package_path().to_unix(); let is_root_package = package_dir.is_empty(); From 6b88a0902c0122eca64c29b65ac197a2f3eb6553 Mon Sep 17 00:00:00 2001 From: Mehul Kar Date: Mon, 29 Jul 2024 11:53:52 -0500 Subject: [PATCH 2/5] chore: use trace instead of debug for telemetry queue flush logs --- crates/turborepo-telemetry/src/lib.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/crates/turborepo-telemetry/src/lib.rs b/crates/turborepo-telemetry/src/lib.rs index 64633ea7f8d47..73d23ff2e5c14 100644 --- a/crates/turborepo-telemetry/src/lib.rs +++ b/crates/turborepo-telemetry/src/lib.rs @@ -21,7 +21,7 @@ use tokio::{ sync::{mpsc, oneshot}, task::{JoinError, JoinHandle}, }; -use tracing::{debug, error}; +use tracing::{debug, error, trace}; use turborepo_api_client::telemetry; use turborepo_ui::{color, BOLD, GREY, UI}; use uuid::Uuid; @@ -203,15 +203,15 @@ impl Worker { pub fn flush_events(&mut self) { if !self.buffer.is_empty() { let events = std::mem::take(&mut self.buffer); - debug!( - "Starting telemetry event queue flush (num_events={:?})", - events.len() - ); + let num_events = events.len(); let handle = self.send_events(events); if let Some(handle) = handle { self.senders.push(handle); } - debug!("Done telemetry event queue flush"); + trace!( + "Flushed telemetry event queue (num_events={:?})", + num_events + ); } } From 88bf220809e71b2f201d899e59449622a21d8b51 Mon Sep 17 00:00:00 2001 From: Mehul Kar Date: Mon, 29 Jul 2024 11:54:24 -0500 Subject: [PATCH 3/5] chore(logging): use trace instead of debug when stopping execution --- crates/turborepo-lib/src/engine/execute.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crates/turborepo-lib/src/engine/execute.rs b/crates/turborepo-lib/src/engine/execute.rs index 067c263e71130..e0fca435c1b42 100644 --- a/crates/turborepo-lib/src/engine/execute.rs +++ b/crates/turborepo-lib/src/engine/execute.rs @@ -116,7 +116,9 @@ impl Engine { if let Err(StopExecution) = result.await.unwrap_or_else(|_| { // If the visitor doesn't send a callback, then we assume the task finished - debug!("Engine visitor dropped callback sender without sending result"); + tracing::trace!( + "Engine visitor dropped callback sender without sending result" + ); Ok(()) }) { if walker From 47aa33edf1853421ecc6bf56bb0eef961f749b70 Mon Sep 17 00:00:00 2001 From: Mehul Kar Date: Mon, 29 Jul 2024 13:36:42 -0500 Subject: [PATCH 4/5] clippy --- crates/turborepo-lib/src/cli/mod.rs | 6 +----- crates/turborepo-lib/src/task_hash.rs | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/crates/turborepo-lib/src/cli/mod.rs b/crates/turborepo-lib/src/cli/mod.rs index 0db5d24d995d8..330e9e6d6bf19 100644 --- a/crates/turborepo-lib/src/cli/mod.rs +++ b/crates/turborepo-lib/src/cli/mod.rs @@ -14,11 +14,7 @@ use turbopath::AbsoluteSystemPathBuf; use turborepo_api_client::AnonAPIClient; use turborepo_repository::inference::{RepoMode, RepoState}; use turborepo_telemetry::{ - events::{ - command::{CodePath, CommandEventBuilder}, - generic::GenericEventBuilder, - EventBuilder, EventType, - }, + events::{command::CommandEventBuilder, generic::GenericEventBuilder, EventBuilder, EventType}, init_telemetry, track_usage, TelemetryHandle, }; use turborepo_ui::{GREY, UI}; diff --git a/crates/turborepo-lib/src/task_hash.rs b/crates/turborepo-lib/src/task_hash.rs index 731915f95c5a8..f86c75586ae84 100644 --- a/crates/turborepo-lib/src/task_hash.rs +++ b/crates/turborepo-lib/src/task_hash.rs @@ -366,7 +366,7 @@ impl<'a> TaskHasher<'a> { let external_deps_hash = is_monorepo.then(|| get_external_deps_hash(&workspace.transitive_dependencies)); - if (hashable_env_pairs.len() > 0) { + if hashable_env_pairs.len() > 0 { debug!( "task hash env vars for {}:{}\n vars: {:?}", task_id.package(), From 722bb7624ce0cf04c619084a85a26f4d830aac01 Mon Sep 17 00:00:00 2001 From: Mehul Kar Date: Mon, 29 Jul 2024 20:24:39 -0500 Subject: [PATCH 5/5] use is empty --- crates/turborepo-lib/src/task_hash.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/turborepo-lib/src/task_hash.rs b/crates/turborepo-lib/src/task_hash.rs index f86c75586ae84..a6e1e9a4099a3 100644 --- a/crates/turborepo-lib/src/task_hash.rs +++ b/crates/turborepo-lib/src/task_hash.rs @@ -366,7 +366,7 @@ impl<'a> TaskHasher<'a> { let external_deps_hash = is_monorepo.then(|| get_external_deps_hash(&workspace.transitive_dependencies)); - if hashable_env_pairs.len() > 0 { + if !hashable_env_pairs.is_empty() { debug!( "task hash env vars for {}:{}\n vars: {:?}", task_id.package(),