From 4bd064406329bb1596ee678ef6dc102c44c08c4d Mon Sep 17 00:00:00 2001 From: Vivien Date: Fri, 1 Mar 2024 12:37:45 +0100 Subject: [PATCH] p2p: move metrics closer to the measured action This may prevent missing to count sent message --- src/lib_p2p/p2p.ml | 8 +------- src/lib_p2p/p2p_conn.ml | 10 ++++++++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/lib_p2p/p2p.ml b/src/lib_p2p/p2p.ml index 211def07bdc4..5ca03af94131 100644 --- a/src/lib_p2p/p2p.ml +++ b/src/lib_p2p/p2p.ml @@ -393,12 +393,7 @@ module Real = struct | Ok v -> Events.(emit__dont_wait__use_with_care message_trysent) ((P2p_conn.info conn).peer_id, v) ; - if v then ( - (* TODO: https://gitlab.com/tezos/tezos/-/issues/4874 - - the counter should be moved to P2p_conn instead *) - Prometheus.Counter.inc_one P2p_metrics.Messages.user_message_sent ; - net.sent_msg_hook conn m) ; + if v then net.sent_msg_hook conn m ; v | Error err -> Events.(emit__dont_wait__use_with_care trysending_message_error) @@ -440,7 +435,6 @@ module Real = struct if if_conn conn then broadcast_encode conn alt_buf then_msg else broadcast_encode conn buf msg in - Prometheus.Counter.inc_one P2p_metrics.Messages.broadcast_message_sent ; P2p_conn.write_encoded_now conn (P2p_socket.copy_encoded_message encoded_msg) diff --git a/src/lib_p2p/p2p_conn.ml b/src/lib_p2p/p2p_conn.ml index 188445dfdb7c..693dbe9a8f48 100644 --- a/src/lib_p2p/p2p_conn.ml +++ b/src/lib_p2p/p2p_conn.ml @@ -221,9 +221,15 @@ let write_sync t msg = let encode t msg = P2p_socket.encode t.conn (Message msg) -let write_encoded_now t buf = P2p_socket.write_encoded_now t.conn buf +let write_encoded_now t buf = + let result = P2p_socket.write_encoded_now t.conn buf in + Prometheus.Counter.inc_one P2p_metrics.Messages.broadcast_message_sent ; + result -let write_now t msg = P2p_socket.write_now t.conn (Message msg) +let write_now t msg = + let result = P2p_socket.write_now t.conn (Message msg) in + Prometheus.Counter.inc_one P2p_metrics.Messages.user_message_sent ; + result let write_swap_request t point peer_id = t.last_sent_swap_request <- Some (Time.System.now (), peer_id) ; -- GitLab