From 0f896c2a322305a4abf27be6cac62b4c8d891b90 Mon Sep 17 00:00:00 2001
From: Jeremy Wall <jeremy@marzhillstudios.com>
Date: Sat, 19 Nov 2022 20:23:10 -0500
Subject: [PATCH] Use tracing-web

---
 Cargo.lock     | 57 +++++++++++++-------------------------------------
 web/Cargo.toml |  4 ++--
 web/src/lib.rs | 16 ++++++++++++--
 3 files changed, 30 insertions(+), 47 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 986a9f3..606ca07 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1300,8 +1300,8 @@ dependencies = [
  "sycamore",
  "sycamore-router",
  "tracing",
- "tracing-browser-subscriber",
  "tracing-subscriber",
+ "tracing-web",
  "wasm-bindgen",
  "web-sys",
 ]
@@ -1831,12 +1831,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
 [[package]]
 name = "scopeguard"
 version = "1.1.0"
@@ -2435,18 +2429,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "tracing-browser-subscriber"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c1db17d6ec2a4c64d2678ca1457d6adf39f696ab7362e2cf30fbaa8d903b8cd"
-dependencies = [
- "tracing",
- "tracing-subscriber",
- "wasm-bindgen",
- "wasm-bindgen-test",
-]
-
 [[package]]
 name = "tracing-core"
 version = "0.1.30"
@@ -2483,6 +2465,19 @@ dependencies = [
  "tracing-log",
 ]
 
+[[package]]
+name = "tracing-web"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ff5efc53ed5a7c4b99b3dd24fd10f41e7aa1b284a4e64ae9167d97e31afe124"
+dependencies = [
+ "js-sys",
+ "tracing-core",
+ "tracing-subscriber",
+ "wasm-bindgen",
+ "web-sys",
+]
+
 [[package]]
 name = "try-lock"
 version = "0.2.3"
@@ -2718,30 +2713,6 @@ version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
 
-[[package]]
-name = "wasm-bindgen-test"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b30cf2cba841a812f035c40c50f53eb9c56181192a9dd2c71b65e6a87a05ba"
-dependencies = [
- "console_error_panic_hook",
- "js-sys",
- "scoped-tls",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wasm-bindgen-test-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-test-macro"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ad594bf33e73cafcac2ae9062fc119d4f75f9c77e25022f91c9a64bd5b6463"
-dependencies = [
- "proc-macro2",
- "quote",
-]
-
 [[package]]
 name = "web-sys"
 version = "0.3.60"
diff --git a/web/Cargo.toml b/web/Cargo.toml
index 0396a0e..4b6b73c 100644
--- a/web/Cargo.toml
+++ b/web/Cargo.toml
@@ -26,8 +26,8 @@ sycamore-router = "0.8"
 version = "0.3.16"
 features = ["fmt", "time"]
 
-[dependencies.tracing-browser-subscriber]
-version = "0.2.0"
+[dependencies.tracing-web]
+ version = "0.1.2"
 
 [dependencies.chrono]
 version = "0.4.22"
diff --git a/web/src/lib.rs b/web/src/lib.rs
index 4ffdd55..4f6fcf1 100644
--- a/web/src/lib.rs
+++ b/web/src/lib.rs
@@ -25,9 +25,21 @@ use wasm_bindgen::prelude::wasm_bindgen;
 use web::UI;
 
 fn configure_tracing() {
-    use tracing_browser_subscriber;
     console_error_panic_hook::set_once();
-    tracing_browser_subscriber::configure_as_global_default();
+    use tracing_subscriber::fmt::format::Pretty;
+    use tracing_subscriber::prelude::*;
+    use tracing_web::{performance_layer, MakeConsoleWriter};
+    let fmt_layer = tracing_subscriber::fmt::layer()
+        .with_ansi(false)
+        .without_time()
+        //.with_timer(UtcTime::rfc_3339()) // std::time is not available in browsers
+        .with_writer(MakeConsoleWriter); // write events to the console
+    let perf_layer = performance_layer().with_details_from_fields(Pretty::default());
+
+    tracing_subscriber::registry()
+        .with(fmt_layer)
+        .with(perf_layer)
+        .init();
 }
 
 #[wasm_bindgen(start)]