diff --git a/Cargo.lock b/Cargo.lock index c9fb7e1e149..3cabff4234f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2308,9 +2308,9 @@ dependencies = [ [[package]] name = "mobc" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc79c4a77e312fee9c7bd4b957c12ad1196db73c4a81e5c0b13f02083c4f7f2f" +checksum = "0bdeff49b387edef305eccfe166af3e1483bb57902dbf369dddc42dc824df23b" dependencies = [ "async-trait", "futures-channel", diff --git a/query-engine/black-box-tests/tests/metrics/smoke_tests.rs b/query-engine/black-box-tests/tests/metrics/smoke_tests.rs index e3826d9cafe..6b81dd2e3e8 100644 --- a/query-engine/black-box-tests/tests/metrics/smoke_tests.rs +++ b/query-engine/black-box-tests/tests/metrics/smoke_tests.rs @@ -55,15 +55,21 @@ mod smoke_tests { .await .unwrap(); + // counters assert!(metrics.contains("prisma_client_queries_total counter")); assert!(metrics.contains("prisma_datasource_queries_total counter")); - assert!(metrics.contains("prisma_pool_connections_open counter")); - assert!(metrics.contains("prisma_client_queries_active gauge")); - assert!(metrics.contains("prisma_client_queries_wait gauge")); + assert!(metrics.contains("prisma_pool_connections_opened_total counter")); + assert!(metrics.contains("prisma_pool_connections_closed_total counter")); + // gauges + assert!(metrics.contains("prisma_pool_connections_open gauge")); assert!(metrics.contains("prisma_pool_connections_busy gauge")); assert!(metrics.contains("prisma_pool_connections_idle gauge")); - assert!(metrics.contains("prisma_pool_connections_opened_total gauge")); - assert!(metrics.contains("prisma_datasource_queries_duration_histogram_ms_bucket")); + assert!(metrics.contains("prisma_client_queries_active gauge")); + assert!(metrics.contains("prisma_client_queries_wait gauge")); + // histograms + assert!(metrics.contains("prisma_client_queries_duration_histogram_ms histogram")); + assert!(metrics.contains("prisma_client_queries_wait_histogram_ms histogram")); + assert!(metrics.contains("prisma_datasource_queries_duration_histogram_ms histogram")); }) .await } diff --git a/query-engine/metrics/src/lib.rs b/query-engine/metrics/src/lib.rs index 4e9fcc69f5c..4fb3be90ad4 100644 --- a/query-engine/metrics/src/lib.rs +++ b/query-engine/metrics/src/lib.rs @@ -79,11 +79,18 @@ const ACCEPT_LIST: &[&str] = &[ MOBC_POOL_CONNECTIONS_IDLE, MOBC_POOL_WAIT_COUNT, MOBC_POOL_WAIT_DURATION, - PRISMA_CLIENT_QUERIES_DURATION_HISTOGRAM_MS, PRISMA_CLIENT_QUERIES_TOTAL, - PRISMA_DATASOURCE_QUERIES_DURATION_HISTOGRAM_MS, PRISMA_DATASOURCE_QUERIES_TOTAL, + PRISMA_POOL_CONNECTIONS_OPENED_TOTAL, + PRISMA_POOL_CONNECTIONS_CLOSED_TOTAL, + PRISMA_POOL_CONNECTIONS_OPEN, + PRISMA_POOL_CONNECTIONS_BUSY, + PRISMA_POOL_CONNECTIONS_IDLE, + PRISMA_CLIENT_QUERIES_WAIT, PRISMA_CLIENT_QUERIES_ACTIVE, + PRISMA_CLIENT_QUERIES_DURATION_HISTOGRAM_MS, + PRISMA_CLIENT_QUERIES_WAIT_HISTOGRAM_MS, + PRISMA_DATASOURCE_QUERIES_DURATION_HISTOGRAM_MS, ]; // Some of the metrics we receive have their internal names, and we need to expose them under a different