From 61bf13d3c3d17bf776e6c1d6050ea4f5dcbf5861 Mon Sep 17 00:00:00 2001 From: Eric Mc Sween Date: Wed, 1 Mar 2023 07:12:23 -0500 Subject: [PATCH] Merge pull request #12044 from overleaf/em-fix-mongo-connection-pool-metrics Fix Mongo connection pool metrics in web GitOrigin-RevId: 10de58c5e04a43f2014fbf9cde84d0bbb7daa9ad --- services/web/app/src/infrastructure/Mongoose.js | 5 +++++ services/web/app/src/infrastructure/mongodb.js | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/services/web/app/src/infrastructure/Mongoose.js b/services/web/app/src/infrastructure/Mongoose.js index 18053ffd67..417ff3e720 100644 --- a/services/web/app/src/infrastructure/Mongoose.js +++ b/services/web/app/src/infrastructure/Mongoose.js @@ -1,5 +1,6 @@ const mongoose = require('mongoose') const Settings = require('@overleaf/settings') +const Metrics = require('@overleaf/metrics') const logger = require('@overleaf/logger') const { addConnectionDrainer } = require('./GracefulShutdown') @@ -20,6 +21,10 @@ const connectionPromise = mongoose.connect( Settings.mongo.options ) +connectionPromise.then(mongooseInstance => { + Metrics.mongodb.monitor(mongooseInstance.connection.client) +}) + addConnectionDrainer('mongoose', async () => { await connectionPromise await mongoose.disconnect() diff --git a/services/web/app/src/infrastructure/mongodb.js b/services/web/app/src/infrastructure/mongodb.js index 5316060aed..db2c8a36e3 100644 --- a/services/web/app/src/infrastructure/mongodb.js +++ b/services/web/app/src/infrastructure/mongodb.js @@ -1,4 +1,3 @@ -const Metrics = require('@overleaf/metrics') const { ObjectId } = require('mongodb') const OError = require('@overleaf/o-error') const { getNativeDb } = require('./Mongoose') @@ -23,7 +22,6 @@ async function waitForDb() { const db = {} async function setupDb() { const internalDb = await getNativeDb() - Metrics.mongodb.monitor(internalDb) db.contacts = internalDb.collection('contacts') db.deletedFiles = internalDb.collection('deletedFiles')