remove reduntant span

jormungandr/src/network/client/mod.rs

@@ -23,7 +23,7 @@ use chain_network::data::block::{BlockEvent, BlockIds, ChainPullRequest};
 
 use futures::prelude::*;
 use futures::ready;
-use tracing::{instrument, span, Level, Span};
+use tracing::{instrument, Span};
 use tracing_futures::Instrument;
 
 use std::pin::Pin;
@@ -244,9 +244,6 @@ impl Client {
 
     #[instrument(level = "debug", skip(self))]
     fn upload_blocks(&mut self, block_ids: BlockIds) -> Result<(), ()> {
-        let span = span!(Level::DEBUG, "upload_blocks", kind = "UploadBlocks");
-        let _enter = span.enter();
-
         if block_ids.is_empty() {
             tracing::info!("peer has sent an empty block solicitation");
             return Err(());
@@ -263,7 +260,7 @@ impl Client {
             block_ids[0]
         );
         let (reply_handle, future) = intercom::stream_reply(buffer_sizes::outbound::BLOCKS);
-        let future = future.instrument(span.clone());
+        let future = future.in_current_span();
         debug_assert!(self.incoming_solicitation.is_none());
         self.incoming_solicitation = Some(ClientMsg::GetBlocks(block_ids, reply_handle));
         let mut client = self.inner.clone();
@@ -291,7 +288,7 @@ impl Client {
                     }
                 }
             }
-            .instrument(span.clone()),
+            .in_current_span(),
         );
         Ok(())
     }