Merge pull request #4662 from withspectrum/improve-statsd-tracking

Track db connection count to statsd

Author: brianlovin

shared/bull/create-queue.js

@@ -63,7 +63,9 @@ function createQueue(name: string, queueOptions?: Object = {}) {
     jobPromise
       .then(() => {
         const duration = new Date().getTime() - startTime;
-        statsd.timing('jobs.duration', duration);
+        statsd.timing('jobs.duration', duration, {
+          queue: name,
+        });
         statsd.increment('jobs.active', -1, {
           queue: name,
         });

shared/db/db.js

@@ -9,11 +9,12 @@ import { statsd } from '../statsd';
 
 const IS_PROD = !process.env.FORCE_DEV && process.env.NODE_ENV === 'production';
 
+const CONNECTIONS = 20;
 const DEFAULT_CONFIG = {
   // Connect to the test database when, well, testing
   db: !process.env.TEST_DB ? 'spectrum' : 'testing',
-  max: 20, // Maximum number of connections, default is 1000
-  buffer: 20, // Minimum number of connections open at any given moment, default is 50
+  max: CONNECTIONS, // Maximum number of connections, default is 1000
+  buffer: CONNECTIONS, // Minimum number of connections open at any given moment, default is 50
   timeoutGb: 60 * 60 * 1000, // How long should an unused connection stick around, default is an hour, this is a minute
   timeout: 30, // The number of seconds for a connection to be opened, default 20
 };
@@ -58,6 +59,10 @@ poolMaster.on('queueing', size => {
   statsd.gauge('db.query_queue.size', size);
 });
 
+poolMaster.on('size', size => {
+  statsd.gauge('db.connections.count', size);
+});
+
 // Exit the process on unhealthy db in test env
 if (process.env.TEST_DB) {
   poolMaster.on('healthy', healthy => {