Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Add support for sourced metrics. #6895

Merged
romanb merged 8 commits into from
Aug 18, 2020
Merged

Add support for sourced metrics. #6895

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
aeaa398
Add support for sourced metrics.
Aug 14, 2020
b26aee3
Tabs, not spaces.
Aug 14, 2020
22be2f7
Tweak bandwidth counter registration.
Aug 17, 2020
45b734c
Add debug assertion for variable labels and values.
Aug 17, 2020
d341e21
Document monotonicity requirement for sourced counters.
Aug 17, 2020
d08fb2a
CI
Aug 17, 2020
0c21a81
Merge branch 'master' into sourced-metrics
Aug 17, 2020
aa3126a
Update client/network/src/service.rs
romanb Aug 17, 2020
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
Next Next commit
Add debug assertion for variable labels and values.
  • Loading branch information
Roman S. Borschel committed Aug 17, 2020
commit 45b734cce4708839bf290c0d872b4cb1d690fd52
1 change: 1 addition & 0 deletions utils/prometheus/src/sourced.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ impl<T: SourcedType, S: MetricSource> Collector for SourcedMetric<T, S> {
}
}

debug_assert_eq!(self.desc.variable_labels.len(), label_values.len());
match self.desc.variable_labels.len().cmp(&label_values.len()) {
Copy link
Contributor

@mxinden mxinden Aug 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All rust-prometheus methods panic when providing unequal label keys and values. While not the greates UX, I would do the same (at least in debug mode) to stay consistent.

E.g. https://docs.rs/prometheus/0.7.0/prometheus/core/struct.MetricVec.html#method.with_label_values.

Copy link
Contributor Author

@romanb romanb Aug 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in 45b734c.

Ordering::Greater =>
log::warn!("Missing label values for sourced metric {}", self.desc.fq_name),
Expand Down