Skip to content

Replace log with tracing in WASM crate #550

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
Nov 21, 2025
Merged

Replace log with tracing in WASM crate #550

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0430b51
.
neuronull Nov 7, 2025
ac2b3a3
cargo sort
neuronull Nov 7, 2025
726db7c
remove time
neuronull Nov 13, 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
73 changes: 58 additions & 15 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.

7 changes: 7 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,13 @@ serde-wasm-bindgen = ">=0.6.0, <0.7"
syn = ">=2.0.87, <3"
thiserror = ">=1.0.40, <3"
tokio = { version = "1.36.0", features = ["macros"] }
tracing = { version = "0.1.41" }
tracing-subscriber = { version = "0.3.20", features = [
"fmt",
"env-filter",
"tracing-log",
"time",
] }
tsify = { version = ">=0.5.5, <0.6", features = [
"js",
], default-features = false }
Expand Down
5 changes: 3 additions & 2 deletions crates/bitwarden-wasm-internal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,10 @@ bitwarden-state = { workspace = true, features = ["wasm"] }
bitwarden-threading = { workspace = true }
bitwarden-vault = { workspace = true, features = ["wasm"] }
console_error_panic_hook = "0.1.7"
console_log = { version = "1.0.0", features = ["color"] }
log = "0.4.20"
serde = { workspace = true }
tracing = { workspace = true }
tracing-subscriber = { workspace = true }
tracing-web = { version = "0.1.3" }
tsify = { workspace = true }
# When upgrading wasm-bindgen, make sure to update the version in the workflows!
wasm-bindgen = { version = "=0.2.105", features = ["serde-serialize"] }
Expand Down
46 changes: 31 additions & 15 deletions crates/bitwarden-wasm-internal/src/init.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
use log::{Level, set_max_level};
use tracing::Level;
use tracing_subscriber::{
EnvFilter,
fmt::{format::Pretty, time::UtcTime},
layer::SubscriberExt as _,
util::SubscriberInitExt as _,
};
use tracing_web::{MakeWebConsoleWriter, performance_layer};
use wasm_bindgen::prelude::*;

#[wasm_bindgen]
Expand All @@ -12,26 +19,35 @@ pub enum LogLevel {

fn convert_level(level: LogLevel) -> Level {
match level {
LogLevel::Trace => Level::Trace,
LogLevel::Debug => Level::Debug,
LogLevel::Info => Level::Info,
LogLevel::Warn => Level::Warn,
LogLevel::Error => Level::Error,
LogLevel::Trace => Level::TRACE,
LogLevel::Debug => Level::DEBUG,
LogLevel::Info => Level::INFO,
LogLevel::Warn => Level::WARN,
LogLevel::Error => Level::ERROR,
}
}

#[wasm_bindgen]
pub fn set_log_level(level: LogLevel) {
let log_level = convert_level(level);
set_max_level(log_level.to_level_filter());
}
Comment on lines -23 to -27
Copy link
Contributor Author

@neuronull neuronull Nov 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this wasn't being used anywhere. There is a way to dynamically reload the tracing subscriber but I didn't want to add that if it isn't being utilized.


#[allow(missing_docs)]
#[wasm_bindgen]
pub fn init_sdk(log_level: Option<LogLevel>) {
console_error_panic_hook::set_once();

let log_level = convert_level(log_level.unwrap_or(LogLevel::Info));
if let Err(_e) = console_log::init_with_level(log_level) {
set_max_level(log_level.to_level_filter())
}

let filter = EnvFilter::builder()
.with_default_directive(log_level.into())
.from_env_lossy();

let fmt = tracing_subscriber::fmt::layer()
.with_ansi(false) // Only partially supported across browsers
.with_timer(UtcTime::rfc_3339())
.with_writer(MakeWebConsoleWriter::new()); // write events to the console

let perf_layer = performance_layer().with_details_from_fields(Pretty::default());

tracing_subscriber::registry()
.with(perf_layer)
.with(filter)
.with(fmt)
.init();
}
Loading