Skip to content

Commit 91a2400

Browse files
committed
Add RPC method instruments.
1 parent d340231 commit 91a2400

File tree

1 file changed

+17
-7
lines changed

1 file changed

+17
-7
lines changed

beacon_node/network/src/network_beacon_processor/rpc_methods.rs

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use slot_clock::SlotClock;
1515
use std::collections::{hash_map::Entry, HashMap};
1616
use std::sync::Arc;
1717
use tokio_stream::StreamExt;
18-
use tracing::{debug, error, warn};
18+
use tracing::{debug, error, instrument, warn};
1919
use types::blob_sidecar::BlobIdentifier;
2020
use types::{Epoch, EthSpec, Hash256, Slot};
2121

@@ -155,6 +155,7 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
155155
}
156156

157157
/// Handle a `BlocksByRoot` request from the peer.
158+
#[instrument(skip_all, level = "debug")]
158159
pub async fn handle_blocks_by_root_request(
159160
self: Arc<Self>,
160161
peer_id: PeerId,
@@ -172,7 +173,7 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
172173
}
173174

174175
/// Handle a `BlocksByRoot` request from the peer.
175-
pub async fn handle_blocks_by_root_request_inner(
176+
async fn handle_blocks_by_root_request_inner(
176177
self: Arc<Self>,
177178
peer_id: PeerId,
178179
inbound_request_id: InboundRequestId,
@@ -245,6 +246,7 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
245246
}
246247

247248
/// Handle a `BlobsByRoot` request from the peer.
249+
#[instrument(skip_all, level = "debug")]
248250
pub fn handle_blobs_by_root_request(
249251
self: Arc<Self>,
250252
peer_id: PeerId,
@@ -260,7 +262,7 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
260262
}
261263

262264
/// Handle a `BlobsByRoot` request from the peer.
263-
pub fn handle_blobs_by_root_request_inner(
265+
fn handle_blobs_by_root_request_inner(
264266
&self,
265267
peer_id: PeerId,
266268
inbound_request_id: InboundRequestId,
@@ -339,6 +341,7 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
339341
}
340342

341343
/// Handle a `DataColumnsByRoot` request from the peer.
344+
#[instrument(skip_all, level = "debug")]
342345
pub fn handle_data_columns_by_root_request(
343346
self: Arc<Self>,
344347
peer_id: PeerId,
@@ -354,7 +357,7 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
354357
}
355358

356359
/// Handle a `DataColumnsByRoot` request from the peer.
357-
pub fn handle_data_columns_by_root_request_inner(
360+
fn handle_data_columns_by_root_request_inner(
358361
&self,
359362
peer_id: PeerId,
360363
inbound_request_id: InboundRequestId,
@@ -400,6 +403,7 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
400403
Ok(())
401404
}
402405

406+
#[instrument(skip_all, level = "debug")]
403407
pub fn handle_light_client_updates_by_range(
404408
self: &Arc<Self>,
405409
peer_id: PeerId,
@@ -420,7 +424,7 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
420424
}
421425

422426
/// Handle a `LightClientUpdatesByRange` request from the peer.
423-
pub fn handle_light_client_updates_by_range_request_inner(
427+
fn handle_light_client_updates_by_range_request_inner(
424428
self: Arc<Self>,
425429
peer_id: PeerId,
426430
inbound_request_id: InboundRequestId,
@@ -491,6 +495,7 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
491495
}
492496

493497
/// Handle a `LightClientBootstrap` request from the peer.
498+
#[instrument(skip_all, level = "debug")]
494499
pub fn handle_light_client_bootstrap(
495500
self: &Arc<Self>,
496501
peer_id: PeerId,
@@ -521,6 +526,7 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
521526
}
522527

523528
/// Handle a `LightClientOptimisticUpdate` request from the peer.
529+
#[instrument(skip_all, level = "debug")]
524530
pub fn handle_light_client_optimistic_update(
525531
self: &Arc<Self>,
526532
peer_id: PeerId,
@@ -545,6 +551,7 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
545551
}
546552

547553
/// Handle a `LightClientFinalityUpdate` request from the peer.
554+
#[instrument(skip_all, level = "debug")]
548555
pub fn handle_light_client_finality_update(
549556
self: &Arc<Self>,
550557
peer_id: PeerId,
@@ -569,6 +576,7 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
569576
}
570577

571578
/// Handle a `BlocksByRange` request from the peer.
579+
#[instrument(skip_all, level = "debug")]
572580
pub async fn handle_blocks_by_range_request(
573581
self: Arc<Self>,
574582
peer_id: PeerId,
@@ -586,7 +594,7 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
586594
}
587595

588596
/// Handle a `BlocksByRange` request from the peer.
589-
pub async fn handle_blocks_by_range_request_inner(
597+
async fn handle_blocks_by_range_request_inner(
590598
self: Arc<Self>,
591599
peer_id: PeerId,
592600
inbound_request_id: InboundRequestId,
@@ -855,6 +863,7 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
855863
}
856864

857865
/// Handle a `BlobsByRange` request from the peer.
866+
#[instrument(skip_all, level = "debug")]
858867
pub fn handle_blobs_by_range_request(
859868
self: Arc<Self>,
860869
peer_id: PeerId,
@@ -982,6 +991,7 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
982991
}
983992

984993
/// Handle a `DataColumnsByRange` request from the peer.
994+
#[instrument(skip_all, level = "debug")]
985995
pub fn handle_data_columns_by_range_request(
986996
&self,
987997
peer_id: PeerId,
@@ -997,7 +1007,7 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
9971007
}
9981008

9991009
/// Handle a `DataColumnsByRange` request from the peer.
1000-
pub fn handle_data_columns_by_range_request_inner(
1010+
fn handle_data_columns_by_range_request_inner(
10011011
&self,
10021012
peer_id: PeerId,
10031013
inbound_request_id: InboundRequestId,

0 commit comments

Comments
 (0)