From a3640eb8d4794c3c7061202ad83ef37545487219 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Thu, 28 Apr 2022 09:09:54 -0600
Subject: [PATCH] Correctly trace async message handling

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
---
 crates/collab/src/rpc.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index 8b77eba26001ae415620172283f32e9c008a852b..60df2b84474fee4286c0f5078ac5a897585c93c8 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -47,7 +47,7 @@ use tokio::{
     time::Sleep,
 };
 use tower::ServiceBuilder;
-use tracing::info_span;
+use tracing::{info_span, Instrument};
 use util::ResultExt;
 
 type MessageHandler = Box<
@@ -161,7 +161,7 @@ impl Server {
                     "handle message",
                     payload_type = envelope.payload_type_name()
                 );
-                span.in_scope(|| (handler)(server, *envelope).boxed())
+                (handler)(server, *envelope).instrument(span).boxed()
             }),
         );
         if prev_handler.is_some() {