Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add metrics around success rates #530

Merged
merged 5 commits into from
Mar 27, 2024
Merged

add metrics around success rates #530

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
33e5243
add metrics around success rates
ppca Mar 26, 2024
c13c6dd
add #signature success within 30 s
ppca Mar 26, 2024
0c765ae
remove mine triple generator metric
ppca Mar 26, 2024
2c0cc8d
update default param
ppca Mar 26, 2024
f9c3222
change testnet default param
ppca Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 79 additions & 0 deletions node/src/metrics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,85 @@ pub(crate) static MPC_CONTRACT_VERSION: Lazy<IntGaugeVec> = Lazy::new(|| {
.unwrap()
});

pub(crate) static NUM_TOTAL_HISTORICAL_TRIPLE_GENERATORS: Lazy<IntGaugeVec> = Lazy::new(|| {
try_create_int_gauge_vec(
"multichain_num_total_historical_triple_generators",
"number of all triple generators historically on the node",
&["node_account_id"],
)
.unwrap()
});

pub(crate) static NUM_TOTAL_HISTORICAL_TRIPLE_GENERATORS_SUCCESS: Lazy<IntGaugeVec> =
Lazy::new(|| {
try_create_int_gauge_vec(
"multichain_num_total_historical_triple_generators_success",
"number of all successful triple generators historically on the node",
&["node_account_id"],
)
.unwrap()
});

pub(crate) static NUM_TOTAL_HISTORICAL_TRIPLE_GENERATORS_MINE: Lazy<IntGaugeVec> =
Lazy::new(|| {
try_create_int_gauge_vec(
"multichain_num_total_historical_triple_generators_mine",
"number of mine triple generators historically on the node",
&["node_account_id"],
)
.unwrap()
});

pub(crate) static NUM_TOTAL_HISTORICAL_TRIPLE_GENERATORS_MINE_SUCCESS: Lazy<IntGaugeVec> =
Lazy::new(|| {
try_create_int_gauge_vec(
"multichain_num_total_historical_triple_generators_mine_success",
"number of successful mine triple generators historically on the node",
&["node_account_id"],
)
.unwrap()
});

pub(crate) static NUM_TOTAL_HISTORICAL_PRESIGNATURE_GENERATORS: Lazy<IntGaugeVec> =
Lazy::new(|| {
try_create_int_gauge_vec(
"multichain_num_total_historical_presignature_generators",
"number of all presignature generators historically on the node",
&["node_account_id"],
)
.unwrap()
});

pub(crate) static NUM_TOTAL_HISTORICAL_PRESIGNATURE_GENERATORS_SUCCESS: Lazy<IntGaugeVec> =
Lazy::new(|| {
try_create_int_gauge_vec(
"multichain_num_total_historical_presignature_generators_success",
"number of all successful presignature generators historically on the node",
&["node_account_id"],
)
.unwrap()
});

pub(crate) static NUM_TOTAL_HISTORICAL_PRESIGNATURE_GENERATORS_MINE: Lazy<IntGaugeVec> =
Lazy::new(|| {
try_create_int_gauge_vec(
"multichain_num_total_historical_presignature_generators_mine",
"number of mine presignature generators historically on the node",
&["node_account_id"],
)
.unwrap()
});

pub(crate) static NUM_TOTAL_HISTORICAL_PRESIGNATURE_GENERATORS_MINE_SUCCESS: Lazy<IntGaugeVec> =
Lazy::new(|| {
try_create_int_gauge_vec(
"multichain_num_total_historical_presignature_generators_mine_success",
"number of mine presignature generators historically on the node",
&["node_account_id"],
)
.unwrap()
});

pub fn try_create_int_gauge_vec(name: &str, help: &str, labels: &[&str]) -> Result<IntGaugeVec> {
check_metric_multichain_prefix(name)?;
let opts = Opts::new(name, help);
Expand Down
10 changes: 7 additions & 3 deletions node/src/protocol/consensus.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,11 @@ impl ConsensusProtocol for StartedState {
}
Ordering::Less => Err(ConsensusError::EpochRollback),
Ordering::Equal => {
let account_id = ctx.my_account_id();
let sign_queue = ctx.sign_queue();
match contract_state.participants.find_participant(account_id) {
match contract_state
.participants
.find_participant(&ctx.my_account_id().clone())
{
Some(me) => {
tracing::info!(
"started: contract state is running and we are already a participant"
Expand All @@ -130,7 +132,7 @@ impl ConsensusProtocol for StartedState {
me,
contract_state.threshold,
epoch,
account_id.clone(),
ctx.my_account_id().clone(),
ctx.cfg(),
);
let triple_manager = TripleManager::new(
Expand All @@ -140,6 +142,7 @@ impl ConsensusProtocol for StartedState {
ctx.cfg(),
self.triple_data,
ctx.triple_storage(),
ctx.my_account_id().clone(),
);
Ok(NodeState::Running(RunningState {
epoch,
Expand Down Expand Up @@ -352,6 +355,7 @@ impl ConsensusProtocol for WaitingForConsensusState {
ctx.cfg(),
vec![],
ctx.triple_storage(),
ctx.my_account_id().clone(),
);

Ok(NodeState::Running(RunningState {
Expand Down
16 changes: 15 additions & 1 deletion node/src/protocol/presignature.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,12 @@ impl PresignatureManager {
)?;
self.generators.insert(id, generator);
self.introduced.insert(id);
crate::metrics::NUM_TOTAL_HISTORICAL_PRESIGNATURE_GENERATORS
.with_label_values(&[&self.my_account_id.as_ref()])
.inc();
crate::metrics::NUM_TOTAL_HISTORICAL_PRESIGNATURE_GENERATORS_MINE
.with_label_values(&[&self.my_account_id.as_ref()])
.inc();
Ok(())
}

Expand Down Expand Up @@ -321,6 +327,9 @@ impl PresignatureManager {
false,
)?;
let generator = entry.insert(generator);
crate::metrics::NUM_TOTAL_HISTORICAL_PRESIGNATURE_GENERATORS
.with_label_values(&[&self.my_account_id.as_ref()])
.inc();
Ok(&mut generator.protocol)
}
Entry::Occupied(entry) => Ok(&mut entry.into_mut().protocol),
Expand Down Expand Up @@ -410,13 +419,18 @@ impl PresignatureManager {
if generator.mine {
tracing::info!(id, "assigning presignature to myself");
self.mine.push_back(*id);
crate::metrics::NUM_TOTAL_HISTORICAL_PRESIGNATURE_GENERATORS_MINE_SUCCESS
.with_label_values(&[&self.my_account_id.as_ref()])
.inc();
}
self.introduced.remove(id);

crate::metrics::PRESIGNATURE_LATENCY
.with_label_values(&[&self.my_account_id.as_ref()])
.observe(generator.timestamp.elapsed().as_secs_f64());

crate::metrics::NUM_TOTAL_HISTORICAL_PRESIGNATURE_GENERATORS_SUCCESS
.with_label_values(&[&self.my_account_id.as_ref()])
.inc();
// Do not retain the protocol
return false;
}
Expand Down
44 changes: 37 additions & 7 deletions node/src/protocol/triple.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ use cait_sith::triples::{TripleGenerationOutput, TriplePub, TripleShare};
use highway::{HighwayHash, HighwayHasher};
use k256::elliptic_curve::group::GroupEncoding;
use k256::Secp256k1;
use near_lake_primitives::AccountId;
use serde::{Deserialize, Serialize};
use std::collections::hash_map::Entry;
use std::collections::{HashMap, HashSet, VecDeque};
Expand Down Expand Up @@ -41,15 +42,22 @@ pub struct TripleGenerator {
pub participants: Vec<Participant>,
pub protocol: TripleProtocol,
pub timestamp: Option<Instant>,
pub mine: bool,
}

impl TripleGenerator {
pub fn new(id: TripleId, participants: Vec<Participant>, protocol: TripleProtocol) -> Self {
pub fn new(
id: TripleId,
participants: Vec<Participant>,
protocol: TripleProtocol,
mine: bool,
) -> Self {
Self {
id,
participants,
protocol,
timestamp: None,
mine,
}
}

Expand Down Expand Up @@ -109,6 +117,7 @@ pub struct TripleManager {
pub triple_storage: LockTripleNodeStorageBox,
/// triple generation protocols that failed.
pub failed_triples: HashMap<TripleId, Instant>,
pub my_account_id: AccountId,
}

impl TripleManager {
Expand All @@ -119,6 +128,7 @@ impl TripleManager {
cfg: Config,
triple_data: Vec<TripleData>,
triple_storage: LockTripleNodeStorageBox,
my_account_id: AccountId,
) -> Self {
let mut mine: VecDeque<TripleId> = VecDeque::new();
let mut all_triples = HashMap::new();
Expand All @@ -143,6 +153,7 @@ impl TripleManager {
triple_cfg: cfg.triple_cfg,
triple_storage,
failed_triples: HashMap::new(),
my_account_id,
}
}

Expand Down Expand Up @@ -183,10 +194,17 @@ impl TripleManager {
self.me,
self.threshold,
)?);
let mine = true;
self.generators
.insert(id, TripleGenerator::new(id, participants, protocol));
.insert(id, TripleGenerator::new(id, participants, protocol, mine));
ChaoticTempest marked this conversation as resolved.
Show resolved Hide resolved
self.queued.push_back(id);
self.introduced.insert(id);
crate::metrics::NUM_TOTAL_HISTORICAL_TRIPLE_GENERATORS
.with_label_values(&[&self.my_account_id.as_ref()])
.inc();
crate::metrics::NUM_TOTAL_HISTORICAL_TRIPLE_GENERATORS_MINE
.with_label_values(&[&self.my_account_id.as_ref()])
.inc();
Ok(())
}

Expand Down Expand Up @@ -337,8 +355,13 @@ impl TripleManager {
self.me,
self.threshold,
)?);
let generator = e.insert(TripleGenerator::new(id, participants, protocol));
let mine = false;
let generator =
e.insert(TripleGenerator::new(id, participants, protocol, mine));
self.queued.push_back(id);
crate::metrics::NUM_TOTAL_HISTORICAL_TRIPLE_GENERATORS
.with_label_values(&[&self.my_account_id.as_ref()])
.inc();
Ok(Some(&mut generator.protocol))
}
Entry::Occupied(e) => Ok(Some(&mut e.into_mut().protocol)),
Expand All @@ -362,9 +385,6 @@ impl TripleManager {
let mut messages = Vec::new();
let mut result = Ok(());
let mut triples_to_insert = Vec::new();
let triple_storage_read_lock = self.triple_storage.read().await;
let my_account_id = triple_storage_read_lock.account_id();
drop(triple_storage_read_lock);
self.generators.retain(|id, generator| {
if !self.ongoing.contains(id) {
// If the protocol is not ongoing, we should retain it for the next time
Expand Down Expand Up @@ -429,10 +449,20 @@ impl TripleManager {

if let Some(start_time) = generator.timestamp {
crate::metrics::TRIPLE_LATENCY
.with_label_values(&[&my_account_id])
.with_label_values(&[&self.my_account_id.as_ref()])
.observe(start_time.elapsed().as_secs_f64());
}

crate::metrics::NUM_TOTAL_HISTORICAL_TRIPLE_GENERATORS_SUCCESS
.with_label_values(&[&self.my_account_id.as_ref()])
.inc();

if generator.mine {
crate::metrics::NUM_TOTAL_HISTORICAL_TRIPLE_GENERATORS_MINE_SUCCESS
.with_label_values(&[&self.my_account_id.as_ref()])
.inc();
}

let triple = Triple {
id: *id,
share: output.0,
Expand Down
1 change: 1 addition & 0 deletions node/src/test_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ impl TestTripleManagers {
DEFAULT_TEST_CONFIG,
vec![],
triple_storage,
num.to_string().parse().unwrap(),
)
})
.collect();
Expand Down
Loading