Skip to content

Commit

Permalink
Collect execute_callback timecost for metrics
Browse files Browse the repository at this point in the history
  • Loading branch information
@eval-exec
eval-exec committed Jan 22, 2024
1 parent 978eee2 commit ab3ea2a
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 48 deletions.
1 change: 0 additions & 1 deletion chain/src/consume_unverified.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ impl ConsumeUnverifiedBlocks {
recv(self.unverified_block_rx) -> msg => match msg {
Ok(unverified_task) => {
// process this unverified block
trace!("got an unverified block, wait cost: {:?}", begin_loop.elapsed());
if let Some(handle) = ckb_metrics::handle() {
handle.ckb_chain_consume_unverified_block_waiting_block_duration_sum.add(_trace_begin_loop.elapsed().as_secs_f64())
}
Expand Down
8 changes: 8 additions & 0 deletions chain/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,15 @@ pub struct LonelyBlockWithCallback {
impl LonelyBlockWithCallback {
pub(crate) fn execute_callback(self, verify_result: VerifyResult) {
if let Some(verify_callback) = self.verify_callback {
let _trace_now = minstant::Instant::now();

verify_callback(verify_result);

if let Some(handle) = ckb_metrics::handle() {
handle
.ckb_chain_execute_callback_duration_sum
.add(_trace_now.elapsed().as_secs_f64())
}
}
}

Expand Down
106 changes: 59 additions & 47 deletions util/metrics/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ pub struct Metrics {
pub ckb_chain_consume_unverified_block_duration_sum: Gauge,
/// ckb_chain consume_unverified thread's consume_unverified_block waiting for block duration sum (seconds)
pub ckb_chain_consume_unverified_block_waiting_block_duration_sum: Gauge,
/// ckb_chain execute_callback duration sum (seconds)
pub ckb_chain_execute_callback_duration_sum: Gauge,
/// Gauge for tracking the size of all frozen data
pub ckb_freezer_size: IntGauge,
/// Counter for measuring the effective amount of data read
Expand Down Expand Up @@ -94,110 +96,120 @@ pub struct Metrics {
pub ckb_network_ban_peer: IntCounter,
}

static METRICS: once_cell::sync::Lazy<Metrics> = once_cell::sync::Lazy::new(|| Metrics {
ckb_chain_tip: register_int_gauge!("ckb_chain_tip", "The CKB chain tip header number").unwrap(),
ckb_chain_unverified_tip: register_int_gauge!(
static METRICS: once_cell::sync::Lazy<Metrics> = once_cell::sync::Lazy::new(|| {
Metrics {
ckb_chain_tip: register_int_gauge!("ckb_chain_tip", "The CKB chain tip header number").unwrap(),
ckb_chain_unverified_tip: register_int_gauge!(
"ckb_chain_unverified_tip",
"The CKB chain unverified tip header number"
)
.unwrap(),
ckb_chain_async_process_block_duration_sum: register_gauge!(
"ckb_chain_async_process_block_duration",
.unwrap(),
ckb_chain_async_process_block_duration_sum: register_gauge!(
"ckb_chain_async_process_block_duration_sum",
"The CKB chain asynchronous_process_block duration sum"
)
.unwrap(),
ckb_chain_process_lonely_block_duration_sum: register_gauge!(
"ckb_chain_process_lonely_block_duration",
.unwrap(),
ckb_chain_process_lonely_block_duration_sum: register_gauge!(
"ckb_chain_process_lonely_block_duration_sum",
"The CKB chain consume_orphan thread's process_lonely_block duration sum"
)
.unwrap(),
ckb_chain_consume_unverified_block_duration_sum: register_gauge!(
"ckb_chain_consume_unverified_block_duration",
.unwrap(),
ckb_chain_consume_unverified_block_duration_sum: register_gauge!(
"ckb_chain_consume_unverified_block_duration_sum",
"The CKB chain consume_unverified thread's consume_unverified_block duration sum"
)
.unwrap(),
ckb_freezer_size: register_int_gauge!("ckb_freezer_size", "The CKB freezer size").unwrap(),
ckb_freezer_read: register_int_counter!("ckb_freezer_read", "The CKB freezer read").unwrap(),
ckb_relay_transaction_short_id_collide: register_int_counter!(
.unwrap(),
ckb_chain_consume_unverified_block_waiting_block_duration_sum: register_gauge!(
"ckb_chain_consume_unverified_block_waiting_block_duration_sum",
"The CKB chain consume_unverified thread's consume_unverified_block waiting for block duration sum"
).unwrap(),
ckb_chain_execute_callback_duration_sum: register_gauge!(
"ckb_chain_execute_callback_duration_sum",
"The CKB chain execute_callback duration sum"
).unwrap(),
ckb_freezer_size: register_int_gauge!("ckb_freezer_size", "The CKB freezer size").unwrap(),
ckb_freezer_read: register_int_counter!("ckb_freezer_read", "The CKB freezer read").unwrap(),
ckb_relay_transaction_short_id_collide: register_int_counter!(
"ckb_relay_transaction_short_id_collide",
"The CKB relay transaction short id collide"
)
.unwrap(),
ckb_relay_cb_verify_duration: register_histogram!(
.unwrap(),
ckb_relay_cb_verify_duration: register_histogram!(
"ckb_relay_cb_verify_duration",
"The CKB relay compact block verify duration"
)
.unwrap(),
ckb_relay_cb_transaction_count: register_int_counter!(
.unwrap(),
ckb_relay_cb_transaction_count: register_int_counter!(
"ckb_relay_cb_transaction_count",
"The CKB relay compact block transaction count"
)
.unwrap(),
ckb_relay_cb_reconstruct_ok: register_int_counter!(
.unwrap(),
ckb_relay_cb_reconstruct_ok: register_int_counter!(
"ckb_relay_cb_reconstruct_ok",
"The CKB relay compact block reconstruct ok count"
)
.unwrap(),
ckb_relay_cb_fresh_tx_cnt: register_int_counter!(
.unwrap(),
ckb_relay_cb_fresh_tx_cnt: register_int_counter!(
"ckb_relay_cb_fresh_tx_cnt",
"The CKB relay compact block fresh tx count"
)
.unwrap(),
ckb_relay_cb_reconstruct_fail: register_int_counter!(
.unwrap(),
ckb_relay_cb_reconstruct_fail: register_int_counter!(
"ckb_relay_cb_reconstruct_fail",
"The CKB relay compact block reconstruct fail count"
)
.unwrap(),
ckb_shared_best_number: register_int_gauge!(
.unwrap(),
ckb_shared_best_number: register_int_gauge!(
"ckb_shared_best_number",
"The CKB shared best header number"
)
.unwrap(),
ckb_sys_mem_process: CkbSysMemProcessStatistics::from(
&register_int_gauge_vec!(
.unwrap(),
ckb_sys_mem_process: CkbSysMemProcessStatistics::from(
&register_int_gauge_vec!(
"ckb_sys_mem_process",
"CKB system memory for process statistics",
&["type"]
)
.unwrap(),
),
ckb_sys_mem_jemalloc: CkbSysMemJemallocStatistics::from(
&register_int_gauge_vec!(
.unwrap(),
),
ckb_sys_mem_jemalloc: CkbSysMemJemallocStatistics::from(
&register_int_gauge_vec!(
"ckb_sys_mem_jemalloc",
"CKB system memory for jemalloc statistics",
&["type"]
)
.unwrap(),
),
ckb_tx_pool_entry: CkbTxPoolEntryStatistics::from(
&register_int_gauge_vec!(
.unwrap(),
),
ckb_tx_pool_entry: CkbTxPoolEntryStatistics::from(
&register_int_gauge_vec!(
"ckb_tx_pool_entry",
"CKB tx-pool entry status statistics",
&["type"]
)
.unwrap(),
),
ckb_message_bytes: register_histogram_vec!(
.unwrap(),
),
ckb_message_bytes: register_histogram_vec!(
"ckb_message_bytes",
"The CKB message bytes",
&["direction", "protocol_name", "msg_item_name", "status_code"],
vec![
500.0, 1000.0, 2000.0, 5000.0, 10000.0, 20000.0, 50000.0, 100000.0, 200000.0, 500000.0
]
)
.unwrap(),
.unwrap(),

ckb_sys_mem_rocksdb: register_int_gauge_vec!(
ckb_sys_mem_rocksdb: register_int_gauge_vec!(
"ckb_sys_mem_rocksdb",
"CKB system memory for rocksdb statistics",
&["type", "cf"]
)
.unwrap(),
ckb_network_ban_peer: register_int_counter!(
.unwrap(),
ckb_network_ban_peer: register_int_counter!(
"ckb_network_ban_peer",
"CKB network baned peer count"
)
.unwrap(),
.unwrap(),
}
});

/// Indicate whether the metrics service is enabled.
Expand Down

0 comments on commit ab3ea2a

Please sign in to comment.