feat(tracing): IPC and custom protocol spans should not have a parent (…

…#1248)
tauri-apps · May 9, 2024 · df69525 · df69525
1 parent 80c83db
commit df69525
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/.changes/force-ipc-parent-none.md b/.changes/force-ipc-parent-none.md
@@ -0,0 +1,5 @@
+---
+"wry": patch
+---
+
+Force the IPC and custom protocol tracing span to have no parent.
diff --git a/src/webview/webkitgtk/mod.rs b/src/webview/webkitgtk/mod.rs
@@ -90,7 +90,7 @@ impl InnerWebView {
     // Connect before registering as recommended by the docs
     manager.connect_script_message_received(None, move |_m, msg| {
       #[cfg(feature = "tracing")]
-      let _span = tracing::info_span!("wry::ipc::handle").entered();
+      let _span = tracing::info_span!(parent: None, "wry::ipc::handle").entered();
 
       if let Some(js) = msg.js_value() {
         if let Some(ipc_handler) = &ipc_handler {

diff --git a/src/webview/webkitgtk/web_context.rs b/src/webview/webkitgtk/web_context.rs
@@ -289,7 +289,7 @@ where
   context.register_uri_scheme(name, move |request| {
     #[cfg(feature = "tracing")]
     let span =
-      tracing::info_span!("wry::custom_protocol::handle", uri = tracing::field::Empty).entered();
+      tracing::info_span!(parent: None, "wry::custom_protocol::handle", uri = tracing::field::Empty).entered();
 
     if let Some(uri) = request.uri() {
       let uri = uri.as_str();

diff --git a/src/webview/webview2/mod.rs b/src/webview/webview2/mod.rs
@@ -359,7 +359,7 @@ window.addEventListener('mousemove', (e) => window.chrome.webview.postMessage('_
 
             if let Some(ipc_handler) = &ipc_handler {
               #[cfg(feature = "tracing")]
-              let _span = tracing::info_span!("wry::ipc::handle").entered();
+              let _span = tracing::info_span!(parent: None, "wry::ipc::handle").entered();
               ipc_handler(&window, js);
             }
           }
@@ -518,7 +518,7 @@ window.addEventListener('mousemove', (e) => window.chrome.webview.postMessage('_
             &WebResourceRequestedEventHandler::create(Box::new(move |_, args| {
               #[cfg(feature = "tracing")]
               let span =
-                tracing::info_span!("wry::custom_protocol::handle", uri = tracing::field::Empty)
+                tracing::info_span!(parent: None, "wry::custom_protocol::handle", uri = tracing::field::Empty)
                   .entered();
               if let Some(args) = args {
                 let webview_request = args.Request()?;

diff --git a/src/webview/wkwebview/mod.rs b/src/webview/wkwebview/mod.rs
@@ -94,7 +94,7 @@ impl InnerWebView {
       // Safety: objc runtime calls are unsafe
       unsafe {
         #[cfg(feature = "tracing")]
-        let _span = tracing::info_span!("wry::ipc::handle").entered();
+        let _span = tracing::info_span!(parent: None, "wry::ipc::handle").entered();
 
         let function = this.get_ivar::<*mut c_void>("function");
         if !function.is_null() {
@@ -122,7 +122,7 @@ impl InnerWebView {
     extern "C" fn start_task(this: &Object, _: Sel, _webview: id, task: id) {
       unsafe {
         #[cfg(feature = "tracing")]
-        let span = tracing::info_span!("wry::custom_protocol::handle", uri = tracing::field::Empty)
+        let span = tracing::info_span!(parent: None, "wry::custom_protocol::handle", uri = tracing::field::Empty)
           .entered();
         let function = this.get_ivar::<*mut c_void>("function");
         if !function.is_null() {