Skip to content

Commit e57cd88

Browse files
chore: fix wrong or missing span names for NetworkBehaviour::poll
Pull-Request: #4855.
1 parent 33f1765 commit e57cd88

File tree

14 files changed

+17
-20
lines changed

14 files changed

+17
-20
lines changed

protocols/autonat/src/behaviour.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ impl NetworkBehaviour for Behaviour {
435435
<request_response::Behaviour<AutoNatCodec> as NetworkBehaviour>::ConnectionHandler;
436436
type ToSwarm = Event;
437437

438-
#[tracing::instrument(level = "trace", name = "ConnectionHandler::poll", skip(self, cx))]
438+
#[tracing::instrument(level = "trace", name = "NetworkBehaviour::poll", skip(self, cx))]
439439
fn poll(
440440
&mut self,
441441
cx: &mut Context<'_>,

protocols/dcutr/src/behaviour.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,7 @@ impl NetworkBehaviour for Behaviour {
322322
};
323323
}
324324

325+
#[tracing::instrument(level = "trace", name = "NetworkBehaviour::poll", skip(self))]
325326
fn poll(&mut self, _: &mut Context<'_>) -> Poll<ToSwarm<Self::ToSwarm, THandlerInEvent<Self>>> {
326327
if let Some(event) = self.queued_events.pop_front() {
327328
return Poll::Ready(event);

protocols/floodsub/src/layer.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -474,6 +474,7 @@ impl NetworkBehaviour for Floodsub {
474474
}
475475
}
476476

477+
#[tracing::instrument(level = "trace", name = "NetworkBehaviour::poll", skip(self))]
477478
fn poll(&mut self, _: &mut Context<'_>) -> Poll<ToSwarm<Self::ToSwarm, THandlerInEvent<Self>>> {
478479
if let Some(event) = self.events.pop_front() {
479480
return Poll::Ready(event);

protocols/gossipsub/src/behaviour.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3426,7 +3426,7 @@ where
34263426
}
34273427
}
34283428

3429-
#[tracing::instrument(level = "trace", name = "ConnectionHandler::poll", skip(self, cx))]
3429+
#[tracing::instrument(level = "trace", name = "NetworkBehaviour::poll", skip(self, cx))]
34303430
fn poll(
34313431
&mut self,
34323432
cx: &mut Context<'_>,

protocols/kad/src/behaviour.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2413,7 +2413,7 @@ where
24132413
};
24142414
}
24152415

2416-
#[tracing::instrument(level = "trace", name = "ConnectionHandler::poll", skip(self, cx))]
2416+
#[tracing::instrument(level = "trace", name = "NetworkBehaviour::poll", skip(self, cx))]
24172417
fn poll(
24182418
&mut self,
24192419
cx: &mut Context<'_>,

protocols/mdns/src/behaviour.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ where
282282
.on_swarm_event(&event);
283283
}
284284

285-
#[tracing::instrument(level = "trace", name = "ConnectionHandler::poll", skip(self, cx))]
285+
#[tracing::instrument(level = "trace", name = "NetworkBehaviour::poll", skip(self, cx))]
286286
fn poll(
287287
&mut self,
288288
cx: &mut Context<'_>,

protocols/perf/src/client/behaviour.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,8 @@ impl NetworkBehaviour for Behaviour {
135135
.push_back(ToSwarm::GenerateEvent(Event { id, result }));
136136
}
137137

138-
#[tracing::instrument(level = "trace", name = "ConnectionHandler::poll", skip(self, _cx))]
139-
fn poll(
140-
&mut self,
141-
_cx: &mut Context<'_>,
142-
) -> Poll<ToSwarm<Self::ToSwarm, THandlerInEvent<Self>>> {
138+
#[tracing::instrument(level = "trace", name = "NetworkBehaviour::poll", skip(self))]
139+
fn poll(&mut self, _: &mut Context<'_>) -> Poll<ToSwarm<Self::ToSwarm, THandlerInEvent<Self>>> {
143140
if let Some(event) = self.queued_events.pop_front() {
144141
return Poll::Ready(event);
145142
}

protocols/perf/src/server/behaviour.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,8 @@ impl NetworkBehaviour for Behaviour {
8989
}))
9090
}
9191

92-
#[tracing::instrument(level = "trace", name = "ConnectionHandler::poll", skip(self, _cx))]
93-
fn poll(
94-
&mut self,
95-
_cx: &mut Context<'_>,
96-
) -> Poll<ToSwarm<Self::ToSwarm, THandlerInEvent<Self>>> {
92+
#[tracing::instrument(level = "trace", name = "NetworkBehaviour::poll", skip(self))]
93+
fn poll(&mut self, _: &mut Context<'_>) -> Poll<ToSwarm<Self::ToSwarm, THandlerInEvent<Self>>> {
9794
if let Some(event) = self.queued_events.pop_front() {
9895
return Poll::Ready(event);
9996
}

protocols/relay/src/behaviour.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -693,11 +693,8 @@ impl NetworkBehaviour for Behaviour {
693693
}
694694
}
695695

696-
#[tracing::instrument(level = "trace", name = "ConnectionHandler::poll", skip(self, _cx))]
697-
fn poll(
698-
&mut self,
699-
_cx: &mut Context<'_>,
700-
) -> Poll<ToSwarm<Self::ToSwarm, THandlerInEvent<Self>>> {
696+
#[tracing::instrument(level = "trace", name = "NetworkBehaviour::poll", skip(self))]
697+
fn poll(&mut self, _: &mut Context<'_>) -> Poll<ToSwarm<Self::ToSwarm, THandlerInEvent<Self>>> {
701698
if let Some(to_swarm) = self.queued_actions.pop_front() {
702699
return Poll::Ready(to_swarm);
703700
}

protocols/relay/src/priv_client.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ impl NetworkBehaviour for Behaviour {
239239
self.queued_actions.push_back(ToSwarm::GenerateEvent(event))
240240
}
241241

242+
#[tracing::instrument(level = "trace", name = "NetworkBehaviour::poll", skip(self, cx))]
242243
fn poll(
243244
&mut self,
244245
cx: &mut Context<'_>,

0 commit comments

Comments
 (0)