Skip to content
Open
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
2 changes: 1 addition & 1 deletion src/conn/pool/metrics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ impl MetricsHistogram {
#[cfg(feature = "hdrhistogram")]
impl Default for MetricsHistogram {
fn default() -> Self {
let hdr = hdrhistogram::Histogram::new_with_bounds(1, 30 * 1_000_000, 2).unwrap();
let hdr = hdrhistogram::Histogram::new(2).unwrap();
Self(std::sync::Mutex::new(hdr))
}
}
Expand Down
31 changes: 24 additions & 7 deletions src/conn/pool/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,8 @@ impl Pool {
.connection_idle_duration
.lock()
.unwrap()
.saturating_record(since.elapsed().as_micros() as u64);
.record(since.elapsed().as_micros() as u64)
.ok();
#[cfg(feature = "hdrhistogram")]
let metrics = self.metrics();
conn.inner.active_since = Instant::now();
Expand All @@ -371,9 +372,8 @@ impl Pool {
.check_duration
.lock()
.unwrap()
.saturating_record(
conn.inner.active_since.elapsed().as_micros() as u64
);
.record(conn.inner.active_since.elapsed().as_micros() as u64)
.ok();
Ok(conn)
}
.boxed(),
Expand Down Expand Up @@ -412,9 +412,8 @@ impl Pool {
.connect_duration
.lock()
.unwrap()
.saturating_record(
conn.inner.active_since.elapsed().as_micros() as u64
);
.record(conn.inner.active_since.elapsed().as_micros() as u64)
.ok();
}
conn
}
Expand Down Expand Up @@ -1244,6 +1243,24 @@ mod test {
Ok(())
}

#[cfg(feature = "hdrhistogram")]
#[tokio::test]
async fn metrics() -> super::Result<()> {
let pool = pool_with_one_connection();

let metrics = pool.metrics();
let conn = pool.get_conn().await.unwrap();
tokio::time::sleep(Duration::from_millis(100)).await;
drop(conn);
pool.get_conn().await.unwrap();

let max = metrics.connection_active_duration.lock().unwrap().max();
// We slept for 100 miliseconds holding a conneciton.
assert!(max > 100_000);

Ok(())
}

#[cfg(feature = "nightly")]
mod bench {
use futures_util::future::{FutureExt, TryFutureExt};
Expand Down
3 changes: 2 additions & 1 deletion src/conn/pool/recycler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ impl Future for Recycler {
.connection_active_duration
.lock()
.unwrap()
.saturating_record($conn.inner.active_since.elapsed().as_micros() as u64);
.record($conn.inner.active_since.elapsed().as_micros() as u64)
.ok();
exchange.available.push_back($conn.into());
$self
.inner
Expand Down
Loading