fix(metrics): include num pending validations in knex metrics (#2444)

specklesystems · Jun 27, 2024 · e55a940 · e55a940
1 parent d851cec
commit e55a940
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 16 deletions.
diff --git a/packages/fileimport-service/src/prometheusMetrics.js b/packages/fileimport-service/src/prometheusMetrics.js
@@ -9,6 +9,7 @@ let metricFree = null
 let metricUsed = null
 let metricPendingAquires = null
 let metricPendingCreates = null
+let metricPendingValidations = null
 let metricRemainingCapacity = null
 let metricQueryDuration = null
 let metricQueryErrors = null
@@ -56,6 +57,14 @@ function initKnexPrometheusMetrics() {
     }
   })
 
+  metricPendingValidations = new prometheusClient.Gauge({
+    name: 'speckle_server_knex_pending_validations',
+    help: 'Number of pending DB connection validations. This is a state between pending acquisition and acquiring a connection.',
+    collect() {
+      this.set(knex.client.pool.numPendingValidations())
+    }
+  })
+
   metricRemainingCapacity = new prometheusClient.Gauge({
     name: 'speckle_server_knex_remaining_capacity',
     help: 'Remaining capacity of the DB connection pool',
@@ -65,12 +74,10 @@ function initKnexPrometheusMetrics() {
       const demand =
         knex.client.pool.numUsed() +
         knex.client.pool.numPendingCreates() +
+        knex.client.pool.numPendingValidations() +
         knex.client.pool.numPendingAcquires()
 
-      //the higher value of zero or the difference between the postgresMaxConnections and the demand
-      const remainingCapacity =
-        postgresMaxConnections <= demand ? 0 : postgresMaxConnections - demand
-      this.set(remainingCapacity)
+      this.set(Math.max(postgresMaxConnections - demand, 0))
     }
   })
 

diff --git a/packages/preview-service/bg_service/prometheusMetrics.js b/packages/preview-service/bg_service/prometheusMetrics.js
@@ -9,6 +9,7 @@ let metricFree = null
 let metricUsed = null
 let metricPendingAquires = null
 let metricPendingCreates = null
+let metricPendingValidations = null
 let metricRemainingCapacity = null
 let metricQueryDuration = null
 let metricQueryErrors = null
@@ -56,6 +57,14 @@ function initKnexPrometheusMetrics() {
     }
   })
 
+  metricPendingValidations = new prometheusClient.Gauge({
+    name: 'speckle_server_knex_pending_validations',
+    help: 'Number of pending DB connection validations. This is a state between pending acquisition and acquiring a connection.',
+    collect() {
+      this.set(knex.client.pool.numPendingValidations())
+    }
+  })
+
   metricRemainingCapacity = new prometheusClient.Gauge({
     name: 'speckle_server_knex_remaining_capacity',
     help: 'Remaining capacity of the DB connection pool',
@@ -65,12 +74,10 @@ function initKnexPrometheusMetrics() {
       const demand =
         knex.client.pool.numUsed() +
         knex.client.pool.numPendingCreates() +
+        knex.client.pool.numPendingValidations() +
         knex.client.pool.numPendingAcquires()
 
-      //the higher value of zero or the difference between the postgresMaxConnections and the demand
-      const remainingCapacity =
-        postgresMaxConnections <= demand ? 0 : postgresMaxConnections - demand
-      this.set(remainingCapacity)
+      this.set(Math.max(postgresMaxConnections - demand, 0))
     }
   })
 

diff --git a/packages/server/logging/knexMonitoring.js b/packages/server/logging/knexMonitoring.js
@@ -8,6 +8,7 @@ const prometheusClient = require('prom-client')
 let metricFree = null
 let metricUsed = null
 let metricPendingCreates = null
+let metricPendingValidations = null
 let metricRemainingCapacity = null
 let metricPendingAquires = null
 let metricQueryDuration = null
@@ -51,6 +52,14 @@ module.exports = {
       }
     })
 
+    metricPendingValidations = new prometheusClient.Gauge({
+      name: 'speckle_server_knex_pending_validations',
+      help: 'Number of pending DB connection validations. This is a state between pending acquisition and acquiring a connection.',
+      collect() {
+        this.set(knex.client.pool.numPendingValidations())
+      }
+    })
+
     metricRemainingCapacity = new prometheusClient.Gauge({
       name: 'speckle_server_knex_remaining_capacity',
       help: 'Remaining capacity of the DB connection pool',
@@ -60,12 +69,10 @@ module.exports = {
         const demand =
           knex.client.pool.numUsed() +
           knex.client.pool.numPendingCreates() +
+          knex.client.pool.numPendingValidations() +
           knex.client.pool.numPendingAcquires()
 
-        //the higher value of zero or the difference between the postgresMaxConnections and the demand
-        const remainingCapacity =
-          postgresMaxConnections <= demand ? 0 : postgresMaxConnections - demand
-        this.set(remainingCapacity)
+        this.set(Math.max(postgresMaxConnections - demand, 0))
       }
     })
 

diff --git a/packages/webhook-service/src/observability/prometheusMetrics.js b/packages/webhook-service/src/observability/prometheusMetrics.js
@@ -9,6 +9,7 @@ let metricFree = null
 let metricUsed = null
 let metricPendingAquires = null
 let metricPendingCreates = null
+let metricPendingValidations = null
 let metricRemainingCapacity = null
 let metricQueryDuration = null
 let metricQueryErrors = null
@@ -56,6 +57,14 @@ function initKnexPrometheusMetrics() {
     }
   })
 
+  metricPendingValidations = new prometheusClient.Gauge({
+    name: 'speckle_server_knex_pending_validations',
+    help: 'Number of pending DB connection validations. This is a state between pending acquisition and acquiring a connection.',
+    collect() {
+      this.set(knex.client.pool.numPendingValidations())
+    }
+  })
+
   metricRemainingCapacity = new prometheusClient.Gauge({
     name: 'speckle_server_knex_remaining_capacity',
     help: 'Remaining capacity of the DB connection pool',
@@ -65,12 +74,10 @@ function initKnexPrometheusMetrics() {
       const demand =
         knex.client.pool.numUsed() +
         knex.client.pool.numPendingCreates() +
+        knex.client.pool.numPendingValidations() +
         knex.client.pool.numPendingAcquires()
 
-      //the higher value of zero or the difference between the postgresMaxConnections and the demand
-      const remainingCapacity =
-        postgresMaxConnections <= demand ? 0 : postgresMaxConnections - demand
-      this.set(remainingCapacity)
+      this.set(Math.max(postgresMaxConnections - demand, 0))
     }
   })