fix(volo-http, volo-grpc): fix wrong usage of span (#622)

* fix(volo-http, volo-grpc): fix wrong usage of span

* chore(volo-grpc): bump volo-grpc to 0.11.6

---------

Signed-off-by: Yu Li <liyu.yukiteru@bytedance.com>

Author: yukiiiteru

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "volo-grpc"
-version = "0.11.5"
+version = "0.11.6"
 edition.workspace = true
 homepage.workspace = true
 repository.workspace = true

volo-grpc/Cargo.toml

@@ -2,6 +2,7 @@ use std::{cell::RefCell, net::SocketAddr, str::FromStr, sync::Arc, task::Poll};
 
 use futures::{FutureExt, future::BoxFuture};
 use metainfo::{Backward, Forward};
+use tracing::Instrument;
 use volo::{FastStr, Service, context::Context};
 
 use crate::{
@@ -125,8 +126,7 @@ where
                     });
                     status_to_http!(status);
                     let span = span_provider.on_serve(&cx, metadata);
-                    let _enter = span.enter();
-                    let volo_resp = match inner.call(&mut cx, volo_req).await {
+                    let volo_resp = match inner.call(&mut cx, volo_req).instrument(span).await {
                         Ok(resp) => resp,
                         Err(err) => {
                             span_provider.leave_serve(&cx);

volo-grpc/src/server/meta.rs

@@ -27,6 +27,7 @@ use motore::{
 use parking_lot::RwLock;
 use scopeguard::defer;
 use tokio::sync::Notify;
+use tracing::Instrument;
 #[cfg(feature = "__tls")]
 use volo::net::{conn::ConnStream, tls::Acceptor, tls::ServerTlsConfig};
 use volo::{
@@ -533,10 +534,10 @@ where
                 let mut cx = ServerContext::new(service.peer);
                 cx.rpc_info_mut().set_config(service.config);
                 let span = service.span_provider.on_serve(&cx);
-                let _enter = span.enter();
                 let resp = service
                     .inner
                     .call(&mut cx, req.map(Body::from_incoming))
+                    .instrument(span)
                     .await
                     .into_response();
                 service.span_provider.leave_serve(&cx);