Trace context for the following actors:

chain/client/src/client_actor.rs

@@ -266,13 +266,7 @@ impl Handler<WithSpanContext<NetworkClientMessages>> for ClientActor {
         msg: WithSpanContext<NetworkClientMessages>,
         ctx: &mut Context<Self>,
     ) -> Self::Result {
-        let (_span, msg) = handler_span!(
-            "client",
-            "ClientActor",
-            "NetworkClientMessages",
-            msg,
-            |msg: &NetworkClientMessages| msg.into()
-        );
+        let (_span, msg) = handler_span!("client", msg, |msg: &NetworkClientMessages| msg.into());
 
         self.check_triggers(ctx);
 
@@ -630,12 +624,6 @@ impl ClientActor {
     }
 }
 
-macro_rules! client_handler_span {
-    ($handler:expr, $msg:expr) => {
-        handler_span!("client", "ClientActor", $handler, $msg)
-    };
-}
-
 #[cfg(feature = "sandbox")]
 impl Handler<WithSpanContext<near_client_primitives::types::SandboxMessage>> for ClientActor {
     type Result = near_client_primitives::types::SandboxResponse;
@@ -645,7 +633,7 @@ impl Handler<WithSpanContext<near_client_primitives::types::SandboxMessage>> for
         msg: WithSpanContext<near_client_primitives::types::SandboxMessage>,
         _ctx: &mut Context<Self>,
     ) -> near_client_primitives::types::SandboxResponse {
-        let (_span, msg) = client_handler_span!("SandboxMessage", msg);
+        let (_span, msg) = handler_span!("client", msg);
         match msg {
             near_client_primitives::types::SandboxMessage::SandboxPatchState(state) => {
                 self.client.chain.patch_state(
@@ -681,7 +669,7 @@ impl Handler<WithSpanContext<Status>> for ClientActor {
 
     #[perf]
     fn handle(&mut self, msg: WithSpanContext<Status>, ctx: &mut Context<Self>) -> Self::Result {
-        let (_span, msg) = client_handler_span!("Status", msg);
+        let (_span, msg) = handler_span!("client", msg);
         let _d = delay_detector::DelayDetector::new(|| "client status".into());
         self.check_triggers(ctx);
 
@@ -827,7 +815,7 @@ impl Handler<WithSpanContext<GetNetworkInfo>> for ClientActor {
         msg: WithSpanContext<GetNetworkInfo>,
         ctx: &mut Context<Self>,
     ) -> Self::Result {
-        let (_span, _msg) = client_handler_span!("GetNetworkInfo", msg);
+        let (_span, _msg) = handler_span!("client", msg);
         let _d = delay_detector::DelayDetector::new(|| "client get network info".into());
         self.check_triggers(ctx);
 
@@ -864,7 +852,7 @@ impl Handler<WithSpanContext<ApplyChunksDoneMessage>> for ClientActor {
         msg: WithSpanContext<ApplyChunksDoneMessage>,
         _ctx: &mut Self::Context,
     ) -> Self::Result {
-        let (_span, _msg) = client_handler_span!("ApplyChunksDoneMessage", msg);
+        let (_span, _msg) = handler_span!("client", msg);
         self.try_process_unfinished_blocks();
     }
 }
@@ -1926,7 +1914,7 @@ impl Handler<WithSpanContext<ApplyStatePartsRequest>> for SyncJobsActor {
         msg: WithSpanContext<ApplyStatePartsRequest>,
         _: &mut Self::Context,
     ) -> Self::Result {
-        let (_span, msg) = handler_span!("client", "SyncJobsActor", "ApplyStatePartsRequest", msg);
+        let (_span, msg) = handler_span!("client", msg);
         let result = self.apply_parts(&msg);
 
         self.client_addr.do_send(
@@ -1948,7 +1936,7 @@ impl Handler<WithSpanContext<ApplyStatePartsResponse>> for ClientActor {
         msg: WithSpanContext<ApplyStatePartsResponse>,
         _: &mut Self::Context,
     ) -> Self::Result {
-        let (_span, msg) = client_handler_span!("ApplyStatePartsResponse", msg);
+        let (_span, msg) = handler_span!("client", msg);
         if let Some((sync, _, _)) = self.client.catchup_state_syncs.get_mut(&msg.sync_hash) {
             // We are doing catchup
             sync.set_apply_result(msg.shard_id, msg.apply_result);
@@ -1966,7 +1954,7 @@ impl Handler<WithSpanContext<BlockCatchUpRequest>> for SyncJobsActor {
         msg: WithSpanContext<BlockCatchUpRequest>,
         _: &mut Self::Context,
     ) -> Self::Result {
-        let (_span, msg) = handler_span!("client", "SyncJobsActor", "BlockCatchUpRequest", msg);
+        let (_span, msg) = handler_span!("client", msg);
         let results = do_apply_chunks(msg.block_hash, msg.block_height, msg.work);
 
         self.client_addr.do_send(
@@ -1984,7 +1972,7 @@ impl Handler<WithSpanContext<BlockCatchUpResponse>> for ClientActor {
         msg: WithSpanContext<BlockCatchUpResponse>,
         _: &mut Self::Context,
     ) -> Self::Result {
-        let (_span, msg) = client_handler_span!("BlockCatchUpResponse", msg);
+        let (_span, msg) = handler_span!("client", msg);
         if let Some((_, _, blocks_catch_up_state)) =
             self.client.catchup_state_syncs.get_mut(&msg.sync_hash)
         {
@@ -2004,7 +1992,7 @@ impl Handler<WithSpanContext<StateSplitRequest>> for SyncJobsActor {
         msg: WithSpanContext<StateSplitRequest>,
         _: &mut Self::Context,
     ) -> Self::Result {
-        let (_span, msg) = handler_span!("client", "SyncJobsActor", "StateSplitRequest", msg);
+        let (_span, msg) = handler_span!("client", msg);
         let results = msg.runtime.build_state_for_split_shards(
             msg.shard_uid,
             &msg.state_root,
@@ -2031,7 +2019,7 @@ impl Handler<WithSpanContext<StateSplitResponse>> for ClientActor {
         msg: WithSpanContext<StateSplitResponse>,
         _: &mut Self::Context,
     ) -> Self::Result {
-        let (_span, msg) = client_handler_span!("StateSplitResponse", msg);
+        let (_span, msg) = handler_span!("client", msg);
         if let Some((sync, _, _)) = self.client.catchup_state_syncs.get_mut(&msg.sync_hash) {
             // We are doing catchup
             sync.set_split_result(msg.shard_id, msg.new_state_roots);
@@ -2049,7 +2037,7 @@ impl Handler<WithSpanContext<ShardsManagerResponse>> for ClientActor {
         msg: WithSpanContext<ShardsManagerResponse>,
         _: &mut Self::Context,
     ) -> Self::Result {
-        let (_span, msg) = client_handler_span!("ShardsManagerResponse", msg);
+        let (_span, msg) = handler_span!("client", msg);
         match msg {
             ShardsManagerResponse::ChunkCompleted { partial_chunk, shard_chunk } => {
                 self.client.on_chunk_completed(

chain/client/src/debug.rs

@@ -152,7 +152,7 @@ impl Handler<WithSpanContext<DebugStatus>> for ClientActor {
         msg: WithSpanContext<DebugStatus>,
         _ctx: &mut Context<Self>,
     ) -> Self::Result {
-        let (_span, msg) = handler_span!("client", "ClientActor", "DebugStatus", msg);
+        let (_span, msg) = handler_span!("client", msg);
         match msg {
             DebugStatus::SyncStatus => {
                 Ok(DebugStatusResponse::SyncStatus(self.client.sync_status.clone().into()))

chain/client/src/view_client.rs

@@ -476,18 +476,12 @@ impl Actor for ViewClientActor {
     type Context = SyncContext<Self>;
 }
 
-macro_rules! view_client_handler_span {
-    ($handler:expr, $msg:expr) => {
-        handler_span!("client", "ViewClientActor", $handler, $msg)
-    };
-}
-
 impl Handler<WithSpanContext<Query>> for ViewClientActor {
     type Result = Result<QueryResponse, QueryError>;
 
     #[perf]
     fn handle(&mut self, msg: WithSpanContext<Query>, _: &mut Self::Context) -> Self::Result {
-        let (_span, msg) = view_client_handler_span!("Query", msg);
+        let (_span, msg) = handler_span!("client", msg);
         let _timer = metrics::VIEW_CLIENT_MESSAGE_TIME.with_label_values(&["Query"]).start_timer();
         self.handle_query(msg)
     }
@@ -499,7 +493,7 @@ impl Handler<WithSpanContext<GetBlock>> for ViewClientActor {
 
     #[perf]
     fn handle(&mut self, msg: WithSpanContext<GetBlock>, _: &mut Self::Context) -> Self::Result {
-        let (_span, msg) = view_client_handler_span!("GetBlock", msg);
+        let (_span, msg) = handler_span!("client", msg);
         let _timer =
             metrics::VIEW_CLIENT_MESSAGE_TIME.with_label_values(&["GetBlock"]).start_timer();
         let block = match self.get_block_by_reference(&msg.0)? {
@@ -522,7 +516,7 @@ impl Handler<WithSpanContext<GetBlockWithMerkleTree>> for ViewClientActor {
         msg: WithSpanContext<GetBlockWithMerkleTree>,
         ctx: &mut Self::Context,
     ) -> Self::Result {
-        let (_span, msg) = view_client_handler_span!("GetBlockWithMerkleTree", msg);
+        let (_span, msg) = handler_span!("client", msg);
         let _timer = metrics::VIEW_CLIENT_MESSAGE_TIME
             .with_label_values(&["GetBlockWithMerkleTree"])
             .start_timer();
@@ -540,7 +534,7 @@ impl Handler<WithSpanContext<GetChunk>> for ViewClientActor {
 
     #[perf]
     fn handle(&mut self, msg: WithSpanContext<GetChunk>, _: &mut Self::Context) -> Self::Result {
-        let (_span, msg) = view_client_handler_span!("GetChunk", msg);
+        let (_span, msg) = handler_span!("client", msg);
         let _timer =
             metrics::VIEW_CLIENT_MESSAGE_TIME.with_label_values(&["GetChunk"]).start_timer();
         let get_chunk_from_block = |block: Block,
@@ -596,7 +590,7 @@ impl Handler<WithSpanContext<TxStatus>> for ViewClientActor {
 
     #[perf]
     fn handle(&mut self, msg: WithSpanContext<TxStatus>, _: &mut Self::Context) -> Self::Result {
-        let (_span, msg) = view_client_handler_span!("TxStatus", msg);
+        let (_span, msg) = handler_span!("client", msg);
         let _timer =
             metrics::VIEW_CLIENT_MESSAGE_TIME.with_label_values(&["TxStatus"]).start_timer();
         self.get_tx_status(msg.tx_hash, msg.signer_account_id, msg.fetch_receipt)
@@ -612,7 +606,7 @@ impl Handler<WithSpanContext<GetValidatorInfo>> for ViewClientActor {
         msg: WithSpanContext<GetValidatorInfo>,
         _: &mut Self::Context,
     ) -> Self::Result {
-        let (_span, msg) = view_client_handler_span!("GetValidatorInfo", msg);
+        let (_span, msg) = handler_span!("client", msg);
         let _timer = metrics::VIEW_CLIENT_MESSAGE_TIME
             .with_label_values(&["GetValidatorInfo"])
             .start_timer();
@@ -664,7 +658,7 @@ impl Handler<WithSpanContext<GetValidatorOrdered>> for ViewClientActor {
         msg: WithSpanContext<GetValidatorOrdered>,
         _: &mut Self::Context,
     ) -> Self::Result {
-        let (_span, msg) = view_client_handler_span!("GetValidatorOrdered", msg);
+        let (_span, msg) = handler_span!("client", msg);
         let _timer = metrics::VIEW_CLIENT_MESSAGE_TIME
             .with_label_values(&["GetValidatorOrdered"])
             .start_timer();
@@ -687,7 +681,7 @@ impl Handler<WithSpanContext<GetStateChangesInBlock>> for ViewClientActor {
         msg: WithSpanContext<GetStateChangesInBlock>,
         _: &mut Self::Context,
     ) -> Self::Result {
-        let (_span, msg) = view_client_handler_span!("GetStateChangesInBlock", msg);
+        let (_span, msg) = handler_span!("client", msg);
         let _timer = metrics::VIEW_CLIENT_MESSAGE_TIME
             .with_label_values(&["GetStateChangesInBlock"])
             .start_timer();
@@ -711,7 +705,7 @@ impl Handler<WithSpanContext<GetStateChanges>> for ViewClientActor {
         msg: WithSpanContext<GetStateChanges>,
         _: &mut Self::Context,
     ) -> Self::Result {
-        let (_span, msg) = view_client_handler_span!("GetStateChanges", msg);
+        let (_span, msg) = handler_span!("client", msg);
         let _timer =
             metrics::VIEW_CLIENT_MESSAGE_TIME.with_label_values(&["GetStateChanges"]).start_timer();
         Ok(self
@@ -734,7 +728,7 @@ impl Handler<WithSpanContext<GetStateChangesWithCauseInBlock>> for ViewClientAct
         msg: WithSpanContext<GetStateChangesWithCauseInBlock>,
         _: &mut Self::Context,
     ) -> Self::Result {
-        let (_span, msg) = view_client_handler_span!("GetStateChangesWithCauseInBlock", msg);
+        let (_span, msg) = handler_span!("client", msg);
         let _timer = metrics::VIEW_CLIENT_MESSAGE_TIME
             .with_label_values(&["GetStateChangesWithCauseInBlock"])
             .start_timer();
@@ -759,8 +753,7 @@ impl Handler<WithSpanContext<GetStateChangesWithCauseInBlockForTrackedShards>> f
         msg: WithSpanContext<GetStateChangesWithCauseInBlockForTrackedShards>,
         _: &mut Self::Context,
     ) -> Self::Result {
-        let (_span, msg) =
-            view_client_handler_span!("GetStateChangesWithCauseInBlockForTrackedShards", msg);
+        let (_span, msg) = handler_span!("client", msg);
         let _timer = metrics::VIEW_CLIENT_MESSAGE_TIME
             .with_label_values(&["GetStateChangesWithCauseInBlockForTrackedShards"])
             .start_timer();
@@ -807,7 +800,7 @@ impl Handler<WithSpanContext<GetNextLightClientBlock>> for ViewClientActor {
         msg: WithSpanContext<GetNextLightClientBlock>,
         _: &mut Self::Context,
     ) -> Self::Result {
-        let (_span, msg) = view_client_handler_span!("GetNextLightClientBlock", msg);
+        let (_span, msg) = handler_span!("client", msg);
         let _timer = metrics::VIEW_CLIENT_MESSAGE_TIME
             .with_label_values(&["GetNextLightClientBlock"])
             .start_timer();
@@ -854,7 +847,7 @@ impl Handler<WithSpanContext<GetExecutionOutcome>> for ViewClientActor {
         msg: WithSpanContext<GetExecutionOutcome>,
         _: &mut Self::Context,
     ) -> Self::Result {
-        let (_span, msg) = view_client_handler_span!("GetExecutionOutcome", msg);
+        let (_span, msg) = handler_span!("client", msg);
         let _timer = metrics::VIEW_CLIENT_MESSAGE_TIME
             .with_label_values(&["GetExecutionOutcome"])
             .start_timer();
@@ -945,7 +938,7 @@ impl Handler<WithSpanContext<GetExecutionOutcomesForBlock>> for ViewClientActor
         msg: WithSpanContext<GetExecutionOutcomesForBlock>,
         _: &mut Self::Context,
     ) -> Self::Result {
-        let (_span, msg) = view_client_handler_span!("GetExecutionOutcomesForBlock", msg);
+        let (_span, msg) = handler_span!("client", msg);
         let _timer = metrics::VIEW_CLIENT_MESSAGE_TIME
             .with_label_values(&["GetExecutionOutcomesForBlock"])
             .start_timer();
@@ -964,7 +957,7 @@ impl Handler<WithSpanContext<GetReceipt>> for ViewClientActor {
 
     #[perf]
     fn handle(&mut self, msg: WithSpanContext<GetReceipt>, _: &mut Self::Context) -> Self::Result {
-        let (_span, msg) = view_client_handler_span!("GetReceipt", msg);
+        let (_span, msg) = handler_span!("client", msg);
         let _timer =
             metrics::VIEW_CLIENT_MESSAGE_TIME.with_label_values(&["GetReceipt"]).start_timer();
         Ok(self
@@ -984,7 +977,7 @@ impl Handler<WithSpanContext<GetBlockProof>> for ViewClientActor {
         msg: WithSpanContext<GetBlockProof>,
         _: &mut Self::Context,
     ) -> Self::Result {
-        let (_span, msg) = view_client_handler_span!("GetBlockProof", msg);
+        let (_span, msg) = handler_span!("client", msg);
         let _timer =
             metrics::VIEW_CLIENT_MESSAGE_TIME.with_label_values(&["GetBlockProof"]).start_timer();
         let block_header = self.chain.get_block_header(&msg.block_hash)?;
@@ -1005,7 +998,7 @@ impl Handler<WithSpanContext<GetProtocolConfig>> for ViewClientActor {
         msg: WithSpanContext<GetProtocolConfig>,
         _: &mut Self::Context,
     ) -> Self::Result {
-        let (_span, msg) = view_client_handler_span!("GetProtocolConfig", msg);
+        let (_span, msg) = handler_span!("client", msg);
         let _timer = metrics::VIEW_CLIENT_MESSAGE_TIME
             .with_label_values(&["GetProtocolConfig"])
             .start_timer();
@@ -1029,7 +1022,7 @@ impl Handler<WithSpanContext<NetworkViewClientMessages>> for ViewClientActor {
         msg: WithSpanContext<NetworkViewClientMessages>,
         _ctx: &mut Self::Context,
     ) -> Self::Result {
-        let (_span, msg) = view_client_handler_span!("NetworkViewClientMessages", msg);
+        let (_span, msg) = handler_span!("client", msg);
         let _timer =
             metrics::VIEW_CLIENT_MESSAGE_TIME.with_label_values(&[(&msg).into()]).start_timer();
         match msg {
@@ -1281,7 +1274,7 @@ impl Handler<WithSpanContext<GetGasPrice>> for ViewClientActor {
         msg: WithSpanContext<GetGasPrice>,
         _ctx: &mut Self::Context,
     ) -> Self::Result {
-        let (_span, msg) = view_client_handler_span!("GetGasPrice", msg);
+        let (_span, msg) = handler_span!("client", msg);
         let _timer =
             metrics::VIEW_CLIENT_MESSAGE_TIME.with_label_values(&["GetGasPrice"]).start_timer();
         let header = self.maybe_block_id_to_block_header(msg.block_id);

chain/network/src/peer/peer_actor.rs

@@ -1383,7 +1383,7 @@ impl Handler<WithSpanContext<SendMessage>> for PeerActor {
 
     #[perf]
     fn handle(&mut self, msg: WithSpanContext<SendMessage>, _: &mut Self::Context) {
-        let (_span, msg) = handler_span!("network", "PeerActor", "SendMessage", msg);
+        let (_span, msg) = handler_span!("network", msg);
         let _d = delay_detector::DelayDetector::new(|| "send message".into());
         self.send_message_or_log(&msg.message);
     }
@@ -1401,7 +1401,7 @@ impl actix::Handler<WithSpanContext<Stop>> for PeerActor {
 
     #[perf]
     fn handle(&mut self, msg: WithSpanContext<Stop>, ctx: &mut Self::Context) -> Self::Result {
-        let (_span, msg) = handler_span!("network", "PeerActor", "Stop", msg);
+        let (_span, msg) = handler_span!("network", msg);
         self.stop(
             ctx,
             match msg.ban_reason {

chain/telemetry/src/lib.rs

@@ -84,7 +84,7 @@ impl Handler<WithSpanContext<TelemetryEvent>> for TelemetryActor {
 
     #[perf]
     fn handle(&mut self, msg: WithSpanContext<TelemetryEvent>, _ctx: &mut Context<Self>) {
-        let (_span, msg) = handler_span!("telemetry", "TelemetryActor", "TelemetryEvent", msg);
+        let (_span, msg) = handler_span!("telemetry", msg);
         let now = Clock::instant();
         if now.duration_since(self.last_telemetry_update) < self.config.reporting_interval {
             // Throttle requests to the telemetry endpoints, to at most one