Added task id on warn_on_block messages (#57)

* Added task_id to warn-on-block message

* Updated version

Author: ElFantasma

Cargo.lock

@@ -16,12 +16,12 @@ members = [
 ]
 
 [workspace.dependencies]
-spawned-rt = { path = "rt", version = "0.4.0" }
-spawned-concurrency = { path = "concurrency", version = "0.4.0" }
+spawned-rt = { path = "rt", version = "0.4.1" }
+spawned-concurrency = { path = "concurrency", version = "0.4.1" }
 tracing = { version = "0.1.41", features = ["log"] }
 tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
 
 [workspace.package]
-version = "0.4.0"
+version = "0.4.1"
 license = "MIT"
 edition = "2021"

Cargo.toml

@@ -328,12 +328,13 @@ mod warn_on_block {
             cx: &mut std::task::Context<'_>,
         ) -> std::task::Poll<Self::Output> {
             let type_id = std::any::type_name::<F>();
+            let task_id = rt::task_id();
             let this = self.project();
             let now = Instant::now();
             let res = this.inner.poll(cx);
             let elapsed = now.elapsed();
             if elapsed > Duration::from_millis(10) {
-                warn!(future = ?type_id, elapsed = ?elapsed, "Blocking operation detected");
+                warn!(task = ?task_id, future = ?type_id, elapsed = ?elapsed, "Blocking operation detected");
             }
             res
         }

concurrency/src/tasks/gen_server.rs

@@ -44,7 +44,7 @@ impl GenServer for BusyWorker {
         _: Self::CastMsg,
         handle: &GenServerHandle<Self>,
     ) -> CastResponse {
-        info!("sleeping");
+        info!(taskid = ?rt::task_id(), "sleeping");
         thread::sleep(Duration::from_millis(542));
         handle.clone().cast(()).await.unwrap();
         // This sleep is needed to yield control to the runtime.

examples/busy_genserver_warning/main.rs

@@ -18,7 +18,7 @@ pub use crate::tasks::tokio::oneshot;
 pub use crate::tasks::tokio::sleep;
 pub use crate::tasks::tokio::timeout;
 pub use crate::tasks::tokio::CancellationToken;
-pub use crate::tasks::tokio::{spawn, spawn_blocking, JoinHandle, Runtime};
+pub use crate::tasks::tokio::{spawn, spawn_blocking, task_id, JoinHandle, Runtime};
 pub use crate::tasks::tokio::{BroadcastStream, ReceiverStream};
 use std::future::Future;
 

rt/src/tasks/mod.rs

@@ -4,7 +4,7 @@ pub mod oneshot;
 
 pub use tokio::{
     runtime::Runtime,
-    task::{spawn, spawn_blocking, JoinHandle},
+    task::{id as task_id, spawn, spawn_blocking, JoinHandle},
     time::{sleep, timeout},
 };
 pub use tokio_stream::wrappers::{BroadcastStream, UnboundedReceiverStream as ReceiverStream};