Merge branch 'master' into master

libp2p · Nov 29, 2023 · 240272c · 240272c
2 parents b66787b + 0810672
commit 240272c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
@@ -24,7 +24,7 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 axum = "0.6.19"
-libp2p = { path = "../../libp2p", features = [ "ed25519", "macros", "ping", "wasm-bindgen", "tokio"] }
+libp2p = { path = "../../libp2p", features = [ "ed25519", "macros", "ping", "tokio"] }
 libp2p-webrtc = { workspace = true, features = ["tokio"] }
 rust-embed = { version = "8.0.0", features = ["include-exclude", "interpolate-folder-path"] }
 tokio = { version = "1.34", features = ["macros", "net", "rt", "signal"] }
@@ -37,9 +37,9 @@ mime_guess = "2.0.4"
 js-sys = "0.3.66"
 libp2p = { path = "../../libp2p", features = [ "ed25519", "macros", "ping", "wasm-bindgen"] }
 libp2p-webrtc-websys = { workspace = true }
+tracing-wasm = "0.2.1"
 wasm-bindgen = "0.2.89"
 wasm-bindgen-futures = "0.4.38"
-wasm-logger = { version = "0.2.0" }
 web-sys = { version = "0.3", features = ['Document', 'Element', 'HtmlElement', 'Node', 'Response', 'Window'] }
 
 [lints]

diff --git a/examples/browser-webrtc/src/lib.rs b/examples/browser-webrtc/src/lib.rs
@@ -13,7 +13,7 @@ use web_sys::{Document, HtmlElement};
 
 #[wasm_bindgen]
 pub async fn run(libp2p_endpoint: String) -> Result<(), JsError> {
-    wasm_logger::init(wasm_logger::Config::default());
+    tracing_wasm::set_as_global_default();
 
     let body = Body::from_current_window()?;
     body.append_p("Let's ping the WebRTC Server!")?;