Skip to content

Commit 6246a6f

Browse files
authored
fix(ext/event_worker): don't use tracing as the log backend if cli/tracing feature flag is not enabled (#469)
* fix(ext/event_worker): add a feature flag * chore(cli): update `Cargo.toml` * chore: update `Cargo.lock`
1 parent 5558d8e commit 6246a6f

File tree

4 files changed

+22
-8
lines changed

4 files changed

+22
-8
lines changed

Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cli/Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ base.workspace = true
1515
deno_manifest.workspace = true
1616
graph.workspace = true
1717

18+
sb_event_worker = { workspace = true, optional = true, features = ["tracing"] }
19+
1820
anyhow.workspace = true
1921
log.workspace = true
2022
tokio.workspace = true
@@ -26,4 +28,4 @@ tracing-subscriber = { workspace = true, optional = true }
2628
env_logger = "0.10.0"
2729

2830
[features]
29-
tracing = ["dep:tracing-subscriber"]
31+
tracing = ["dep:tracing-subscriber", "dep:sb_event_worker"]

ext/event_worker/Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,7 @@ anyhow.workspace = true
1919
tokio.workspace = true
2020
log.workspace = true
2121
tracing.workspace = true
22-
enum-as-inner.workspace = true
22+
enum-as-inner.workspace = true
23+
24+
[features]
25+
tracing = []

ext/event_worker/js_interceptors.rs

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use deno_core::error::AnyError;
44
use deno_core::op2;
55
use deno_core::OpState;
66
use tokio::sync::mpsc;
7-
use tracing::{event, trace};
7+
use tracing::trace;
88

99
#[op2(fast)]
1010
fn op_user_worker_log(
@@ -35,11 +35,19 @@ fn op_user_worker_log(
3535
trace!(?metadata);
3636
tx.send(metadata)?;
3737
} else {
38-
match level {
39-
LogLevel::Debug => event!(tracing::Level::DEBUG, "{msg}"),
40-
LogLevel::Info => event!(tracing::Level::INFO, "{msg}"),
41-
LogLevel::Warning => event!(tracing::Level::WARN, "{msg}"),
42-
LogLevel::Error => event!(tracing::Level::ERROR, "{msg}"),
38+
#[cfg(feature = "tracing")]
39+
{
40+
match level {
41+
LogLevel::Debug => tracing::event!(tracing::Level::DEBUG, "{msg}"),
42+
LogLevel::Info => tracing::event!(tracing::Level::INFO, "{msg}"),
43+
LogLevel::Warning => tracing::event!(tracing::Level::WARN, "{msg}"),
44+
LogLevel::Error => tracing::event!(tracing::Level::ERROR, "{msg}"),
45+
}
46+
}
47+
48+
#[cfg(not(feature = "tracing"))]
49+
{
50+
log::error!("[{:?}] {}", level, msg.to_string());
4351
}
4452
}
4553

0 commit comments

Comments
 (0)