Associate a tracing subscriber with each OlmMachine

... and use it for all subsequent calls on that machine

Author: richvdh

index.d.ts

@@ -51,6 +51,13 @@ export declare function initAsync(url?: URL | string): Promise<void>;
 // The auto-generated typescript definitions are a good start, but could do with tightening up in a lot of areas.
 // The following is a manually-curated set of typescript definitions.
 declare module "./pkg/matrix_sdk_crypto_wasm.js" {
+    interface JsLogger {
+        debug(data: any): void;
+        info(data: any): void;
+        warn(data: any): void;
+        error(data: any): void;
+    }
+
     /** The types returned by {@link OlmMachine.outgoingRequests}. */
     type OutgoingRequest =
         | KeysUploadRequest

src/future.rs

@@ -1,6 +1,7 @@
 use std::future::Future;
 
 use js_sys::Promise;
+use tracing::instrument::WithSubscriber;
 use wasm_bindgen::{JsError, JsValue, UnwrapThrowExt};
 use wasm_bindgen_futures::spawn_local;
 
@@ -9,6 +10,10 @@ use wasm_bindgen_futures::spawn_local;
  * Javascript [`Promise`] which either resolves with an object of type `T`,
  * or rejects with an error of type [`Error`].
  *
+ * Also applies [`WithSubscriber::with_current_subscriber`] to the future,
+ * to ensure that the active tracing subscriber remains active while the
+ * future is polled.
+ *
  * [`Error`]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error
  */
 pub(crate) fn future_to_promise<F, T>(future: F) -> Promise
@@ -23,14 +28,18 @@ where
  * Convert a Rust [`Future`] which returns [`Result<T, E>`] into a
  * Javascript [`Promise`] which either resolves with an object of type `T`,
  * or rejects with an error of type `E`.
+ *
+ * Also applies [`WithSubscriber::with_current_subscriber`] to the future,
+ * to ensure that the active tracing subscriber remains active while the
+ * future is polled.
  */
 pub(crate) fn future_to_promise_with_custom_error<F, T, E>(future: F) -> Promise
 where
     F: Future<Output = Result<T, E>> + 'static,
     T: Into<JsValue>,
     E: Into<JsValue>,
 {
-    let mut future = Some(future);
+    let mut future = Some(future.with_current_subscriber());
 
     Promise::new(&mut |resolve, reject| {
         let future = future.take().unwrap_throw();