Skip to content

fix(ext/event_worker): don't use tracing as the log backend if cli/tracing feature flag is not enabled #469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 3, 2025
Merged

fix(ext/event_worker): don't use tracing as the log backend if cli/tracing feature flag is not enabled #469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ebaf86
fix(ext/event_worker): add a feature flag
nyannyacha Jan 3, 2025
6922435
chore(cli): update `Cargo.toml`
nyannyacha Jan 3, 2025
b91efa0
chore: update `Cargo.lock`
nyannyacha Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -26,4 +28,4 @@ tracing-subscriber = { workspace = true, optional = true }
env_logger = "0.10.0"

[features]
tracing = ["dep:tracing-subscriber"]
tracing = ["dep:tracing-subscriber", "dep:sb_event_worker"]
5 changes: 4 additions & 1 deletion ext/event_worker/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,7 @@ anyhow.workspace = true
tokio.workspace = true
log.workspace = true
tracing.workspace = true
enum-as-inner.workspace = true
enum-as-inner.workspace = true

[features]
tracing = []
20 changes: 14 additions & 6 deletions ext/event_worker/js_interceptors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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());
}
}

Expand Down
Loading