tidy spans

zebrad/src/components/inbound.rs

@@ -86,7 +86,6 @@ impl Service<zn::Request> for Inbound {
     type Future =
         Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>> + Send + 'static>>;
 
-    #[instrument(skip(self, cx))]
     fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         // Check whether the network setup is finished, but don't wait for it to
         // become ready before reporting readiness. We expect to get it "soon",
@@ -139,7 +138,7 @@ impl Service<zn::Request> for Inbound {
         }
     }
 
-    #[instrument(skip(self))]
+    #[instrument(name = "inbound", skip(self, req))]
     fn call(&mut self, req: zn::Request) -> Self::Future {
         match req {
             zn::Request::Peers => match self.address_book.as_ref() {

zebrad/src/components/inbound/downloads.rs

@@ -104,7 +104,7 @@ where
     /// Queue a block for download and verification.
     ///
     /// Returns true if the block was newly queued, and false if it was already queued.
-    #[instrument(skip(self))]
+    #[instrument(skip(self, hash), fields(hash = %hash))]
     pub fn download_and_verify(&mut self, hash: block::Hash) -> bool {
         if self.cancel_handles.contains_key(&hash) {
             tracing::debug!("hash already queued for download");