Skip to content

chore(histogram): Simplify code by using std lib method #547

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

Merged
lucab merged 4 commits into from
Apr 16, 2025
Merged

chore(histogram): Simplify code by using std lib method #547

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a8e057
chore(histogram): Simplify code by using std lib method
Cardosaum Apr 11, 2025
5067a18
Merge branch 'master' into cardosaum/simplify-duration-to-seconds
lucab Apr 15, 2025
ca08c6d
refactor(histogram): Remove `duration_to_seconds` function
Cardosaum Apr 15, 2025
e526679
tests(histogram): Remove `duration_to_second` test
Cardosaum Apr 15, 2025
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
19 changes: 1 addition & 18 deletions src/histogram.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ impl Instant {

#[inline]
pub fn elapsed_sec(&self) -> f64 {
duration_to_seconds(self.elapsed())
self.elapsed().as_secs_f64()
}
}

Expand Down Expand Up @@ -881,13 +881,6 @@ pub fn exponential_buckets(start: f64, factor: f64, count: usize) -> Result<Vec<
Ok(buckets)
}

/// `duration_to_seconds` converts Duration to seconds.
#[inline]
pub fn duration_to_seconds(d: Duration) -> f64 {
let nanos = f64::from(d.subsec_nanos()) / 1e9;
d.as_secs() as f64 + nanos
}

#[derive(Clone, Debug)]
pub struct LocalHistogramCore {
histogram: Histogram,
Expand Down Expand Up @@ -1363,16 +1356,6 @@ mod tests {
}
}

#[test]
fn test_duration_to_seconds() {
let tbls = vec![(1000, 1.0), (1100, 1.1), (100_111, 100.111)];
for (millis, seconds) in tbls {
let d = Duration::from_millis(millis);
let v = duration_to_seconds(d);
assert!((v - seconds).abs() < f64::EPSILON);
}
}

#[test]
fn test_histogram_vec_with_label_values() {
let vec = HistogramVec::new(
Expand Down