Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions crates/node/src/handlers/dkg/handler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use types::network::network_event::{DirectMessage, NetworkEvent};
use types::network::network_protocol::Network;
use types::proto::ProtoDecode;
use types::proto::p2p_proto::{self, gossipsub_message::Message};
use types::{dkg_round1_package_metrics, dkg_round2_package_metrics, dkg_start_metrics};

#[async_trait::async_trait]
impl<N: Network, W: Wallet> Handler<N, W> for DkgState {
Expand All @@ -27,9 +28,14 @@ impl<N: Network, W: Wallet> Handler<N, W> for DkgState {
if let Some(Message::Dkg(inner_dkg)) = gossip_msg.message {
match inner_dkg.message {
Some(DkgInner::StartDkg(_)) => {
dkg_start_metrics!(node.network_handle.peer_name(&source_peer));
self.handle_dkg_start(node)?;
}
Some(DkgInner::Round1Package(_)) => {
dkg_round1_package_metrics!(
node.network_handle.peer_name(&source_peer),
node.network_handle.peer_name(&node.peer_id)
);
self.handle_round1_payload(node, source_peer, inner_dkg)?;
}
_ => {}
Expand All @@ -39,6 +45,10 @@ impl<N: Network, W: Wallet> Handler<N, W> for DkgState {
}
}
NetworkEvent::MessageEvent((peer, DirectMessage::Round2Package(package))) => {
dkg_round2_package_metrics!(
node.network_handle.peer_name(&peer),
node.network_handle.peer_name(&node.peer_id)
);
self.handle_round2_payload(node, peer, package).await?;
}
_ => {}
Expand Down
6 changes: 5 additions & 1 deletion crates/node/src/handlers/dkg/key_creation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,10 @@ impl DkgState {
.map(|peer_id| node.network_handle.peer_name(peer_id))
.collect();
tracing::info!("Still waiting for round1 packages from: {:?}", waiting_for);

for missing_peer in &waiting_for {
tracing::debug!("Missing round1 package from peer: {}", missing_peer);
}
}

if !self.dkg_started
Expand Down Expand Up @@ -360,7 +364,7 @@ impl DkgState {
.collect();

if self.round2_peer_packages.len() + 1 != max_signers {
tracing::info!("Still waiting for round1 packages from: {:?}", waiting_for);
tracing::info!("Still waiting for round2 packages from: {:?}", waiting_for);
}

if let Some(r2_secret_package) = self.r2_secret_package.as_ref() {
Expand Down
29 changes: 29 additions & 0 deletions crates/types/src/macros.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,32 @@ macro_rules! current_round_metrics {
metrics::gauge!("current_round", "node_id" => $node_id.to_string()).set(f64::from($round));
}};
}

#[macro_export]
macro_rules! dkg_start_metrics {
($peer_from:expr) => {{
metrics::counter!("dkg_start_dkg_initiated", "peer_from" => $peer_from.to_string()).increment(1);
}};
}

#[macro_export]
macro_rules! dkg_round1_package_metrics {
($peer_from:expr, $peer_to:expr) => {{
metrics::counter!("dkg_round1_packages_received",
"source" => $peer_from.to_string(),
"target" => $peer_to.to_string()
)
.increment(1);
}};
}

#[macro_export]
macro_rules! dkg_round2_package_metrics {
($peer_from:expr, $peer_to:expr) => {{
metrics::counter!("dkg_round2_packages_received",
"source" => $peer_from.to_string(),
"target" => $peer_to.to_string()
)
.increment(1);
}};
}
13 changes: 11 additions & 2 deletions grafana/provisioning/dashboards/dashboard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ providers:
type: file
disableDeletion: false
editable: true
updateIntervalSeconds: 30
updateIntervalSeconds: 5
options:
path: /etc/grafana/provisioning/dashboards/grpc_dashboards/
- name: "Broadcast Dashboards"
Expand All @@ -15,6 +15,15 @@ providers:
type: file
disableDeletion: false
editable: true
updateIntervalSeconds: 30
updateIntervalSeconds: 5
options:
path: /etc/grafana/provisioning/dashboards/broadcast_dashboards/
- name: "DKG Dashboards"
orgId: 1
folder: ""
type: file
disableDeletion: false
editable: true
updateIntervalSeconds: 5
options:
path: /etc/grafana/provisioning/dashboards/dkg_dashboards/
Loading
Loading