gui: fix gossip votes in sankey

jherrera-jump · jherrera-jump · commit b15faf31126a · 2025-10-31T20:50:36.000Z
diff --git a/book/api/metrics-generated.md b/book/api/metrics-generated.md
@@ -222,6 +222,7 @@
 | <span class="metrics-name">verify_&#8203;transaction_&#8203;parse_&#8203;failure</span> | counter | Count of transactions that failed to parse |
 | <span class="metrics-name">verify_&#8203;transaction_&#8203;dedup_&#8203;failure</span> | counter | Count of transactions that failed to deduplicate in the verify stage |
 | <span class="metrics-name">verify_&#8203;transaction_&#8203;verify_&#8203;failure</span> | counter | Count of transactions that failed to deduplicate in the verify stage |
+| <span class="metrics-name">verify_&#8203;gossiped_&#8203;votes_&#8203;received</span> | counter | Count of simple vote transactions received over gossip instead of via the normal TPU path |
 
 </div>
 
@@ -720,6 +721,7 @@
 | <span class="metrics-name">send_&#8203;leader_&#8203;not_&#8203;found</span> | counter | Total number of times slot leader not found |
 | <span class="metrics-name">send_&#8203;unstaked_&#8203;ci</span> | counter | Total number of times we received contact info for an unstaked node |
 | <span class="metrics-name">send_&#8203;ci_&#8203;removed</span> | counter | Total number of times we removed contact info |
+| <span class="metrics-name">send_&#8203;votes</span> | counter | Total number of simple vote transactions sent into the normal TPU path |
 | <span class="metrics-name">send_&#8203;new_&#8203;contact_&#8203;info_&#8203;quic_&#8203;vote</span><br/>{new_&#8203;contact_&#8203;outcome="<span class="metrics-enum">unroutable</span>"} | counter | Total number of contact infos received and handled for QUIC Vote port (Skipped (unroutable)) |
 | <span class="metrics-name">send_&#8203;new_&#8203;contact_&#8203;info_&#8203;quic_&#8203;vote</span><br/>{new_&#8203;contact_&#8203;outcome="<span class="metrics-enum">initialized</span>"} | counter | Total number of contact infos received and handled for QUIC Vote port (Initialized) |
 | <span class="metrics-name">send_&#8203;new_&#8203;contact_&#8203;info_&#8203;quic_&#8203;vote</span><br/>{new_&#8203;contact_&#8203;outcome="<span class="metrics-enum">changed</span>"} | counter | Total number of contact infos received and handled for QUIC Vote port (Contact info changed) |
diff --git a/src/disco/gui/fd_gui.c b/src/disco/gui/fd_gui.c
@@ -554,7 +554,22 @@ fd_gui_txn_waterfall_snap( fd_gui_t *               gui,
     + pack_metrics[ MIDX( COUNTER, PACK, BUNDLE_CRANK_STATUS_INSERTION_FAILED ) ]
     + pack_metrics[ MIDX( COUNTER, PACK, BUNDLE_CRANK_STATUS_CREATION_FAILED ) ];
 
-  cur->in.gossip   = dedup_metrics[ MIDX( COUNTER, DEDUP, GOSSIPED_VOTES_RECEIVED ) ];
+  if( FD_UNLIKELY( gui->summary.is_full_client ) ) {
+    cur->in.gossip = 0UL;
+    for( ulong i=0UL; i<gui->summary.verify_tile_cnt; i++ ) {
+      fd_topo_tile_t const * verify = &topo->tiles[ fd_topo_find_tile( topo, "verify", i ) ];
+      volatile ulong const * verify_metrics = fd_metrics_tile( verify->metrics );
+      cur->in.gossip += verify_metrics[ MIDX( COUNTER, VERIFY, GOSSIPED_VOTES_RECEIVED ) ];
+    }
+
+    fd_topo_tile_t const * send = &topo->tiles[ fd_topo_find_tile( topo, "send", 0UL ) ];
+    volatile ulong const * send_metrics = fd_metrics_tile( send->metrics );
+    cur->in.gossip += send_metrics[ MIDX( COUNTER, SEND, VOTES ) ];
+    cur->in.gossip += dedup_metrics[ MIDX( COUNTER, DEDUP, GOSSIPED_VOTES_RECEIVED ) ];
+  } else {
+    cur->in.gossip = dedup_metrics[ MIDX( COUNTER, DEDUP, GOSSIPED_VOTES_RECEIVED ) ];
+  }
+
   cur->in.quic     = cur->out.tpu_quic_invalid +
                      cur->out.quic_overrun +
                      cur->out.quic_frag_drop +
diff --git a/src/disco/metrics/generated/fd_metrics_send.c b/src/disco/metrics/generated/fd_metrics_send.c
@@ -5,6 +5,7 @@ const fd_metrics_meta_t FD_METRICS_SEND[FD_METRICS_SEND_TOTAL] = {
     DECLARE_METRIC( SEND_LEADER_NOT_FOUND, COUNTER ),
     DECLARE_METRIC( SEND_UNSTAKED_CI, COUNTER ),
     DECLARE_METRIC( SEND_CI_REMOVED, COUNTER ),
+    DECLARE_METRIC( SEND_VOTES, COUNTER ),
     DECLARE_METRIC_ENUM( SEND_NEW_CONTACT_INFO_QUIC_VOTE, COUNTER, NEW_CONTACT_OUTCOME, UNROUTABLE ),
     DECLARE_METRIC_ENUM( SEND_NEW_CONTACT_INFO_QUIC_VOTE, COUNTER, NEW_CONTACT_OUTCOME, INITIALIZED ),
     DECLARE_METRIC_ENUM( SEND_NEW_CONTACT_INFO_QUIC_VOTE, COUNTER, NEW_CONTACT_OUTCOME, CHANGED ),
diff --git a/src/disco/metrics/generated/fd_metrics_send.h b/src/disco/metrics/generated/fd_metrics_send.h
diff --git a/src/disco/metrics/generated/fd_metrics_verify.c b/src/disco/metrics/generated/fd_metrics_verify.c
@@ -6,4 +6,5 @@ const fd_metrics_meta_t FD_METRICS_VERIFY[FD_METRICS_VERIFY_TOTAL] = {
     DECLARE_METRIC( VERIFY_TRANSACTION_PARSE_FAILURE, COUNTER ),
     DECLARE_METRIC( VERIFY_TRANSACTION_DEDUP_FAILURE, COUNTER ),
     DECLARE_METRIC( VERIFY_TRANSACTION_VERIFY_FAILURE, COUNTER ),
+    DECLARE_METRIC( VERIFY_GOSSIPED_VOTES_RECEIVED, COUNTER ),
 };
diff --git a/src/disco/metrics/generated/fd_metrics_verify.h b/src/disco/metrics/generated/fd_metrics_verify.h
@@ -30,7 +30,13 @@
 #define FD_METRICS_COUNTER_VERIFY_TRANSACTION_VERIFY_FAILURE_DESC "Count of transactions that failed to deduplicate in the verify stage"
 #define FD_METRICS_COUNTER_VERIFY_TRANSACTION_VERIFY_FAILURE_CVT  (FD_METRICS_CONVERTER_NONE)
 
-#define FD_METRICS_VERIFY_TOTAL (4UL)
+#define FD_METRICS_COUNTER_VERIFY_GOSSIPED_VOTES_RECEIVED_OFF  (20UL)
+#define FD_METRICS_COUNTER_VERIFY_GOSSIPED_VOTES_RECEIVED_NAME "verify_gossiped_votes_received"
+#define FD_METRICS_COUNTER_VERIFY_GOSSIPED_VOTES_RECEIVED_TYPE (FD_METRICS_TYPE_COUNTER)
+#define FD_METRICS_COUNTER_VERIFY_GOSSIPED_VOTES_RECEIVED_DESC "Count of simple vote transactions received over gossip instead of via the normal TPU path"
+#define FD_METRICS_COUNTER_VERIFY_GOSSIPED_VOTES_RECEIVED_CVT  (FD_METRICS_CONVERTER_NONE)
+
+#define FD_METRICS_VERIFY_TOTAL (5UL)
 extern const fd_metrics_meta_t FD_METRICS_VERIFY[FD_METRICS_VERIFY_TOTAL];
 
 #endif /* HEADER_fd_src_disco_metrics_generated_fd_metrics_verify_h */
diff --git a/src/disco/metrics/metrics.xml b/src/disco/metrics/metrics.xml
@@ -290,6 +290,7 @@ metric introduced.
     <counter name="LeaderNotFound" summary="Total number of times slot leader not found" />
     <counter name="UnstakedCi" summary="Total number of times we received contact info for an unstaked node" />
     <counter name="CiRemoved" summary="Total number of times we removed contact info" />
+    <counter name="Votes" summary="Total number of simple vote transactions sent into the normal TPU path" />
 
     <counter name="NewContactInfoQuicVote" enum="NewContactOutcome" summary="Total number of contact infos received and handled for QUIC Vote port" />
     <counter name="NewContactInfoQuicTpu" enum="NewContactOutcome" summary="Total number of contact infos received and handled for QUIC TPU port" />
@@ -403,6 +404,7 @@ metric introduced.
     <counter name="TransactionParseFailure" summary="Count of transactions that failed to parse" />
     <counter name="TransactionDedupFailure" summary="Count of transactions that failed to deduplicate in the verify stage" />
     <counter name="TransactionVerifyFailure" summary="Count of transactions that failed to deduplicate in the verify stage" />
+    <counter name="GossipedVotesReceived" summary="Count of simple vote transactions received over gossip instead of via the normal TPU path" />
 </tile>
 
 <tile name="dedup">
diff --git a/src/disco/verify/fd_verify_tile.c b/src/disco/verify/fd_verify_tile.c
@@ -27,10 +27,11 @@ scratch_footprint( fd_topo_tile_t const * tile ) {
 
 static inline void
 metrics_write( fd_verify_ctx_t * ctx ) {
+  FD_MCNT_SET( VERIFY, TRANSACTION_BUNDLE_PEER_FAILURE, ctx->metrics.bundle_peer_fail_cnt );
   FD_MCNT_SET( VERIFY, TRANSACTION_BUNDLE_PEER_FAILURE, ctx->metrics.bundle_peer_fail_cnt );
   FD_MCNT_SET( VERIFY, TRANSACTION_PARSE_FAILURE,       ctx->metrics.parse_fail_cnt );
   FD_MCNT_SET( VERIFY, TRANSACTION_DEDUP_FAILURE,       ctx->metrics.dedup_fail_cnt );
-  FD_MCNT_SET( VERIFY, TRANSACTION_VERIFY_FAILURE,      ctx->metrics.verify_fail_cnt );
+  FD_MCNT_SET( VERIFY, GOSSIPED_VOTES_RECEIVED,         ctx->metrics.gossiped_votes_cnt );
 }
 
 static int
@@ -151,6 +152,8 @@ after_frag( fd_verify_ctx_t *   ctx,
     return;
   }
 
+  if( FD_UNLIKELY( ctx->in_kind[ in_idx ]==IN_KIND_GOSSIP ) ) ctx->metrics.gossiped_votes_cnt++;
+
   ulong realized_sz = fd_txn_m_realized_footprint( txnm, 1, 0 );
   ulong tspub = (ulong)fd_frag_meta_ts_comp( fd_tickcount() );
   fd_stem_publish( stem, 0UL, 0UL, ctx->out_chunk, realized_sz, 0UL, tsorig, tspub );
diff --git a/src/disco/verify/fd_verify_tile.h b/src/disco/verify/fd_verify_tile.h
@@ -53,6 +53,7 @@ typedef struct {
     ulong verify_fail_cnt;
     ulong dedup_fail_cnt;
     ulong bundle_peer_fail_cnt;
+    ulong gossiped_votes_cnt;
   } metrics;
 } fd_verify_ctx_t;
 
diff --git a/src/discof/send/fd_send_tile.c b/src/discof/send/fd_send_tile.c
@@ -503,6 +503,8 @@ handle_vote_msg( fd_send_tile_ctx_t * ctx,
     msg_sz,
     gossip_verify_out->chunk0,
     gossip_verify_out->wmark );
+
+  ctx->metrics.votes_sent++;
 }
 
 /* Stem callbacks */
@@ -803,6 +805,7 @@ metrics_write( fd_send_tile_ctx_t * ctx ) {
   FD_MCNT_SET(       SEND, LEADER_NOT_FOUND,             ctx->metrics.leader_not_found                             );
   FD_MCNT_SET(       SEND, UNSTAKED_CI,                  ctx->metrics.unstaked_ci_rcvd                             );
   FD_MCNT_SET(       SEND, CI_REMOVED,                   ctx->metrics.ci_removed                                   );
+  FD_MCNT_SET(       SEND, VOTES,                        ctx->metrics.votes_sent                                   );
 
   /* Port-separated contact info metrics */
   FD_MCNT_ENUM_COPY( SEND, NEW_CONTACT_INFO_QUIC_VOTE,   ctx->metrics.new_contact_info[FD_SEND_PORT_QUIC_VOTE_IDX] );
diff --git a/src/discof/send/fd_send_tile.h b/src/discof/send/fd_send_tile.h
@@ -150,6 +150,7 @@ struct fd_send_tile_ctx {
     ulong leader_not_found;
     ulong staked_no_ci;
     ulong stale_ci;
+    ulong votes_sent;
 
     /* Contact info */
     ulong unstaked_ci_rcvd;
