From eb99568f366208e008aee1f702f918e0220c9b2e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 May 2025 13:45:36 +0000
Subject: [PATCH 1/2] build(deps): bump tokio from 1.44.2 to 1.45.0

Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.44.2 to 1.45.0.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.44.2...tokio-1.45.0)

---
updated-dependencies:
- dependency-name: tokio
  dependency-version: 1.45.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock | 4 ++--
 Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e855178f2..e767e492f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6379,9 +6379,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.44.2"
+version = "1.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48"
+checksum = "2513ca694ef9ede0fb23fe71a4ee4107cb102b9dc1930f6d0fd77aae068ae165"
 dependencies = [
  "backtrace",
  "bytes",
diff --git a/Cargo.toml b/Cargo.toml
index 36dda3477..dc41beca9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -371,7 +371,7 @@ version = "0.2.1"
 
 # Async runtime
 [workspace.dependencies.tokio]
-version = "1.44.2"
+version = "1.45.0"
 features = ["full"]
 
 [workspace.dependencies.tokio-stream]

From cfb001ad43534346fad22786333e56ceb5496934 Mon Sep 17 00:00:00 2001
From: Quentin Gliech <quenting@element.io>
Date: Wed, 7 May 2025 19:25:17 +0200
Subject: [PATCH 2/2] Adjust tokio metrics for tokio 1.45

---
 crates/cli/src/telemetry/tokio.rs | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/crates/cli/src/telemetry/tokio.rs b/crates/cli/src/telemetry/tokio.rs
index 3954d1c50..49c7ac0ef 100644
--- a/crates/cli/src/telemetry/tokio.rs
+++ b/crates/cli/src/telemetry/tokio.rs
@@ -126,7 +126,6 @@ pub fn observe(metrics: RuntimeMetrics) {
             .build();
     }
 
-    #[cfg(tokio_unstable)]
     {
         let metrics = metrics.clone();
         METER
@@ -144,6 +143,19 @@ pub fn observe(metrics: RuntimeMetrics) {
             .build();
     }
 
+    #[cfg(tokio_unstable)]
+    {
+        let metrics = metrics.clone();
+        METER
+            .u64_observable_counter("tokio_runtime.spawned_tasks_count")
+            .with_description("The number of tasks spawned in this runtime since it was created.")
+            .with_unit("{task}")
+            .with_callback(move |instrument| {
+                instrument.observe(metrics.spawned_tasks_count(), &[]);
+            })
+            .build();
+    }
+
     #[cfg(tokio_unstable)]
     {
         let metrics = metrics.clone();
@@ -163,7 +175,6 @@ pub fn observe(metrics: RuntimeMetrics) {
             .build();
     }
 
-    #[cfg(tokio_unstable)]
     {
         let metrics = metrics.clone();
         METER
@@ -247,7 +258,6 @@ pub fn observe(metrics: RuntimeMetrics) {
             .build();
     }
 
-    #[cfg(tokio_unstable)]
     {
         let metrics = metrics.clone();
         METER
@@ -416,7 +426,6 @@ pub fn observe(metrics: RuntimeMetrics) {
 }
 
 /// Helper to construct a [`KeyValue`] with the worker index.
-#[allow(dead_code)]
 fn worker_idx(i: usize) -> KeyValue {
     KeyValue::new("worker_idx", i.try_into().unwrap_or(i64::MAX))
 }