From 4ebaf86d0b48b198470133d55649480c75119152 Mon Sep 17 00:00:00 2001 From: Nyannyacha Date: Fri, 3 Jan 2025 05:01:23 +0000 Subject: [PATCH 1/3] fix(ext/event_worker): add a feature flag --- ext/event_worker/Cargo.toml | 5 ++++- ext/event_worker/js_interceptors.rs | 20 ++++++++++++++------ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/ext/event_worker/Cargo.toml b/ext/event_worker/Cargo.toml index 5db092a29..f78a6c139 100644 --- a/ext/event_worker/Cargo.toml +++ b/ext/event_worker/Cargo.toml @@ -19,4 +19,7 @@ anyhow.workspace = true tokio.workspace = true log.workspace = true tracing.workspace = true -enum-as-inner.workspace = true \ No newline at end of file +enum-as-inner.workspace = true + +[features] +tracing = [] \ No newline at end of file diff --git a/ext/event_worker/js_interceptors.rs b/ext/event_worker/js_interceptors.rs index 18e4543e1..4e77a967f 100644 --- a/ext/event_worker/js_interceptors.rs +++ b/ext/event_worker/js_interceptors.rs @@ -4,7 +4,7 @@ use deno_core::error::AnyError; use deno_core::op2; use deno_core::OpState; use tokio::sync::mpsc; -use tracing::{event, trace}; +use tracing::trace; #[op2(fast)] fn op_user_worker_log( @@ -35,11 +35,19 @@ fn op_user_worker_log( trace!(?metadata); tx.send(metadata)?; } else { - match level { - LogLevel::Debug => event!(tracing::Level::DEBUG, "{msg}"), - LogLevel::Info => event!(tracing::Level::INFO, "{msg}"), - LogLevel::Warning => event!(tracing::Level::WARN, "{msg}"), - LogLevel::Error => event!(tracing::Level::ERROR, "{msg}"), + #[cfg(feature = "tracing")] + { + match level { + LogLevel::Debug => tracing::event!(tracing::Level::DEBUG, "{msg}"), + LogLevel::Info => tracing::event!(tracing::Level::INFO, "{msg}"), + LogLevel::Warning => tracing::event!(tracing::Level::WARN, "{msg}"), + LogLevel::Error => tracing::event!(tracing::Level::ERROR, "{msg}"), + } + } + + #[cfg(not(feature = "tracing"))] + { + log::error!("[{:?}] {}", level, msg.to_string()); } } From 6922435fa473465c4e673fddf7863d59d8b643ed Mon Sep 17 00:00:00 2001 From: Nyannyacha Date: Fri, 3 Jan 2025 05:01:38 +0000 Subject: [PATCH 2/3] chore(cli): update `Cargo.toml` --- cli/Cargo.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cli/Cargo.toml b/cli/Cargo.toml index ff1693ba5..a0dca805b 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -15,6 +15,8 @@ base.workspace = true deno_manifest.workspace = true graph.workspace = true +sb_event_worker = { workspace = true, optional = true, features = ["tracing"] } + anyhow.workspace = true log.workspace = true tokio.workspace = true @@ -26,4 +28,4 @@ tracing-subscriber = { workspace = true, optional = true } env_logger = "0.10.0" [features] -tracing = ["dep:tracing-subscriber"] \ No newline at end of file +tracing = ["dep:tracing-subscriber", "dep:sb_event_worker"] \ No newline at end of file From b91efa064796368576962774512b5ec2cd454ffa Mon Sep 17 00:00:00 2001 From: Nyannyacha Date: Fri, 3 Jan 2025 05:01:48 +0000 Subject: [PATCH 3/3] chore: update `Cargo.lock` --- Cargo.lock | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.lock b/Cargo.lock index 1a57bf3a0..2ae1becd1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1371,6 +1371,7 @@ dependencies = [ "graph", "log", "once_cell", + "sb_event_worker", "tokio", "tracing-subscriber", ]