octo
/
Zebra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert unused instrument macros 

Reverts most of "Instrument some functions to try to locate the panic"
This commit is contained in:
teor 2021-01-06 18:22:47 +10:00 committed by Jane Lusby
parent 6d3aa0002c
commit b7d0a40ee1
3 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zebra-network/src/peer/client.rs
View File

@ -134,7 +134,6 @@ impl<T: std::fmt::Debug> MustUseOneshotSender<T> {
/// Forwards `t` to `tx.send()`, and marks this sender as used. /// Forwards `t` to `tx.send()`, and marks this sender as used.
/// ///
/// Panics if `tx.send()` is used more than once. /// Panics if `tx.send()` is used more than once.
#[instrument(skip(self))]
pub fn send(mut self, t: T) -> Result<(), T> { pub fn send(mut self, t: T) -> Result<(), T> {
self.tx self.tx
.take() .take()
@ -150,7 +149,6 @@ impl<T: std::fmt::Debug> MustUseOneshotSender<T> {
/// Returns `tx.cancellation()`. /// Returns `tx.cancellation()`.
/// ///
/// Panics if `tx.send()` has previously been used. /// Panics if `tx.send()` has previously been used.
#[instrument(skip(self))]
pub fn cancellation(&mut self) -> oneshot::Cancellation<'_, T> { pub fn cancellation(&mut self) -> oneshot::Cancellation<'_, T> {
self.tx self.tx
.as_mut() .as_mut()
@ -163,7 +161,6 @@ impl<T: std::fmt::Debug> MustUseOneshotSender<T> {
/// Returns `tx.is_canceled()`. /// Returns `tx.is_canceled()`.
/// ///
/// Panics if `tx.send()` has previously been used. /// Panics if `tx.send()` has previously been used.
#[instrument(skip(self))]
pub fn is_canceled(&self) -> bool { pub fn is_canceled(&self) -> bool {
self.tx self.tx
.as_ref() .as_ref()
@ -208,7 +205,6 @@ impl Service<Request> for Client {
} }
} }
#[instrument(skip(self))]
fn call(&mut self, request: Request) -> Self::Future { fn call(&mut self, request: Request) -> Self::Future {
use futures::future::FutureExt; use futures::future::FutureExt;

2
zebra-network/src/peer/connection.rs
View File

@ -345,7 +345,6 @@ where
Tx: Sink<Message, Error = SerializationError> + Unpin, Tx: Sink<Message, Error = SerializationError> + Unpin,
{ {
/// Consume this `Connection` to form a spawnable future containing its event loop. /// Consume this `Connection` to form a spawnable future containing its event loop.
#[instrument(skip(self, peer_rx))]
pub async fn run<Rx>(mut self, mut peer_rx: Rx) pub async fn run<Rx>(mut self, mut peer_rx: Rx)
where where
Rx: Stream<Item = Result<Message, SerializationError>> + Unpin, Rx: Stream<Item = Result<Message, SerializationError>> + Unpin,
@ -538,7 +537,6 @@ where
/// remote peer. /// remote peer.
/// ///
/// NOTE: the caller should use .instrument(msg.span) to instrument the function. /// NOTE: the caller should use .instrument(msg.span) to instrument the function.
#[instrument(skip(self))]
async fn handle_client_request(&mut self, req: InProgressClientRequest) { async fn handle_client_request(&mut self, req: InProgressClientRequest) {
trace!(?req.request); trace!(?req.request);
use Request::*; use Request::*;

1
zebra-network/src/peer/handshake.rs
View File

@ -188,7 +188,6 @@ where
Poll::Ready(Ok(())) Poll::Ready(Ok(()))
} }
#[instrument(skip(self))]
fn call(&mut self, req: (TcpStream, SocketAddr)) -> Self::Future { fn call(&mut self, req: (TcpStream, SocketAddr)) -> Self::Future {
let (tcp_stream, addr) = req; let (tcp_stream, addr) = req;