Skip to content
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.

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

Adds new connections_created statistic #207

Merged
merged 1 commit into from
Jun 14, 2024
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
2 changes: 2 additions & 0 deletions bb8/src/api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ pub struct Statistics {
pub get_timed_out: u64,
/// Total time accumulated waiting for a connection.
pub get_wait_time: Duration,
/// Total connections created.
pub connections_created: u64,
/// Total connections that were closed due to be in broken state.
pub connections_closed_broken: u64,
/// Total connections that were closed due to be considered invalid.
Expand Down
1 change: 1 addition & 0 deletions bb8/src/inner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ where
.internals
.lock()
.put(conn, Some(approval), self.inner.clone());
self.inner.statistics.record(StatsKind::Created);
return Ok(());
}
Err(e) => {
Expand Down
4 changes: 4 additions & 0 deletions bb8/src/internals.rs
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ pub(crate) struct AtomicStatistics {
pub(crate) get_waited: AtomicU64,
pub(crate) get_timed_out: AtomicU64,
pub(crate) get_wait_time_micros: AtomicU64,
pub(crate) connections_created: AtomicU64,
pub(crate) connections_closed_broken: AtomicU64,
pub(crate) connections_closed_invalid: AtomicU64,
pub(crate) connections_closed_max_lifetime: AtomicU64,
Expand All @@ -295,6 +296,7 @@ impl AtomicStatistics {

pub(crate) fn record(&self, kind: StatsKind) {
match kind {
StatsKind::Created => &self.connections_created,
StatsKind::ClosedBroken => &self.connections_closed_broken,
StatsKind::ClosedInvalid => &self.connections_closed_invalid,
}
Expand All @@ -320,6 +322,7 @@ impl From<&AtomicStatistics> for Statistics {
get_waited: item.get_waited.load(Ordering::SeqCst),
get_timed_out: item.get_timed_out.load(Ordering::SeqCst),
get_wait_time: Duration::from_micros(item.get_wait_time_micros.load(Ordering::SeqCst)),
connections_created: item.connections_created.load(Ordering::SeqCst),
connections_closed_broken: item.connections_closed_broken.load(Ordering::SeqCst),
connections_closed_invalid: item.connections_closed_invalid.load(Ordering::SeqCst),
connections_closed_max_lifetime: item
Expand All @@ -339,6 +342,7 @@ pub(crate) enum StatsGetKind {
}

pub(crate) enum StatsKind {
Created,
ClosedBroken,
ClosedInvalid,
}
20 changes: 20 additions & 0 deletions bb8/tests/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -992,3 +992,23 @@ async fn test_state_get_contention() {
assert_eq!(statistics.get_waited, 1);
assert!(statistics.get_wait_time > Duration::from_micros(0));
}

#[tokio::test]
async fn test_statistics_connections_created() {
let pool = Pool::builder()
.max_size(1)
.min_idle(1)
.build(OkManager::<FakeConnection>::new())
.await
.unwrap();
let (tx1, rx1) = oneshot::channel();
let clone = pool.clone();
tokio::spawn(async move {
let _ = clone.get().await.unwrap();
tx1.send(()).unwrap();
});
// wait until finished.
rx1.await.unwrap();

assert_eq!(pool.state().statistics.connections_created, 1);
}
Loading