fixup! feat(sdk): Add a root span to our client

Author: poljar

crates/matrix-sdk/src/client/builder.rs

@@ -341,7 +341,7 @@ impl ClientBuilder {
     ///   server discovery request is made which can fail; if you didn't set
     ///   [`server_versions(false)`][Self::server_versions], that amounts to
     ///   another request that can fail
-    #[instrument(skip_all, parent = &self.root_span,  target = "matrix_sdk::client", fields(homeserver))]
+    #[instrument(skip_all, parent = &self.root_span, target = "matrix_sdk::client", fields(homeserver))]
     pub async fn build(self) -> Result<Client, ClientBuildError> {
         debug!("Starting to build the Client");
 

crates/matrix-sdk/src/client/login_builder.rs

@@ -279,7 +279,13 @@ where
     ///
     /// Instead of calling this function and `.await`ing its return value, you
     /// can also `.await` the `SsoLoginBuilder` directly.
-    #[instrument(target = "matrix_sdk::client", name = "login", skip_all, fields(method = "sso"))]
+    #[instrument(
+        parent = &self.client.root_span,
+        target = "matrix_sdk::client",
+        name = "login",
+        skip_all,
+        fields(method = "sso"),
+    )]
     pub async fn send(self) -> Result<login::v3::Response> {
         use std::{
             convert::Infallible,

crates/matrix-sdk/src/client/mod.rs

@@ -69,7 +69,7 @@ use serde::de::DeserializeOwned;
 use tokio::sync::OnceCell;
 #[cfg(feature = "e2e-encryption")]
 use tracing::error;
-use tracing::{debug, field::display, info, instrument, Instrument, Span};
+use tracing::{debug, field::display, info, instrument, trace, Instrument, Span};
 use url::Url;
 
 #[cfg(feature = "e2e-encryption")]
@@ -2281,15 +2281,15 @@ impl Client {
         }
 
         loop {
-            debug!("Syncing");
+            trace!("Syncing");
             let result = self.sync_loop_helper(&mut sync_settings).await;
 
-            debug!("Running callback");
+            trace!("Running callback");
             if callback(result).await? == LoopCtrl::Break {
-                debug!("Callback told us to stop");
+                trace!("Callback told us to stop");
                 break;
             }
-            debug!("Done running callback");
+            trace!("Done running callback");
 
             Client::delay_sync(&mut last_sync_time).await
         }