Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
address review nits
  • Loading branch information
ordian committed Sep 30, 2020
commit d97efe963070c7cc29f903b57c1209468339949f
4 changes: 2 additions & 2 deletions node/core/candidate-selection/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -396,14 +396,14 @@ struct MetricsInner {
pub struct Metrics(Option<MetricsInner>);

impl Metrics {
fn on_second(&self, result: core::result::Result<(), ()>) {
fn on_second(&self, result: Result<(), ()>) {
if let Some(metrics) = &self.0 {
let label = if result.is_ok() { "succeeded" } else { "failed" };
metrics.seconds.with_label_values(&[label]).inc();
}
}

fn on_invalid_selection(&self, result: core::result::Result<(), ()>) {
fn on_invalid_selection(&self, result: Result<(), ()>) {
if let Some(metrics) = &self.0 {
let label = if result.is_ok() { "succeeded" } else { "failed" };
metrics.invalid_selections.with_label_values(&[label]).inc();
Expand Down
2 changes: 1 addition & 1 deletion node/core/provisioner/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ struct MetricsInner {
pub struct Metrics(Option<MetricsInner>);

impl Metrics {
fn on_inherent_data_request(&self, response: core::result::Result<(), ()>) {
fn on_inherent_data_request(&self, response: Result<(), ()>) {
if let Some(metrics) = &self.0 {
match response {
Ok(()) => metrics.inherent_data_requests.with_label_values(&["succeded"]).inc(),
Expand Down
7 changes: 3 additions & 4 deletions node/overseer/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1458,9 +1458,9 @@ mod tests {
res = overseer_fut => {
assert!(res.is_ok());
let metrics = extract_metrics(&registry);
assert_eq!(metrics.get("activated").copied().unwrap(), 3);
assert_eq!(metrics.get("deactivated").copied().unwrap(), 2);
assert_eq!(metrics.get("relayed").copied().unwrap(), 1);
assert_eq!(metrics["activated"], 3);
assert_eq!(metrics["deactivated"], 2);
assert_eq!(metrics["relayed"], 1);
},
complete => (),
}
Expand All @@ -1475,7 +1475,6 @@ mod tests {
let activated = gather[0].get_metric()[0].get_counter().get_value() as u64;
let deactivated = gather[1].get_metric()[0].get_counter().get_value() as u64;
let relayed = gather[2].get_metric()[0].get_counter().get_value() as u64;

let mut result = HashMap::new();
result.insert("activated", activated);
result.insert("deactivated", deactivated);
Expand Down