From f58f2568647396ddfc93d34f0e03f9125df84240 Mon Sep 17 00:00:00 2001
From: Shane Kilkelly <shane@kilkelly.me>
Date: Thu, 16 Mar 2017 16:08:57 +0000
Subject: [PATCH] upgrade metrics

---
 .../Features/Messages/MessageManager.coffee   | 28 ++++++++++++++++++
 .../Features/Threads/ThreadManager.coffee     | 29 +++++++++++++++++++
 services/chat/app/coffee/server.coffee        |  2 --
 3 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/services/chat/app/coffee/Features/Messages/MessageManager.coffee b/services/chat/app/coffee/Features/Messages/MessageManager.coffee
index 14a7142e68..a2bdc02307 100644
--- a/services/chat/app/coffee/Features/Messages/MessageManager.coffee
+++ b/services/chat/app/coffee/Features/Messages/MessageManager.coffee
@@ -2,6 +2,8 @@ mongojs = require "../../mongojs"
 db = mongojs.db
 ObjectId = mongojs.ObjectId
 async = require "async"
+metrics = require 'metrics-sharelatex'
+logger = require 'logger-sharelatex'
 
 module.exports = MessageManager =
 	createMessage: (room_id, user_id, content, timestamp, callback = (error, message) ->) ->
@@ -63,3 +65,29 @@ module.exports = MessageManager =
 			query._id = ObjectId(query._id)
 		return query
 		
+
+metrics.timeAsyncMethod(
+	MessageManager, 'createMessage',
+	'MessageManager.createMessage',
+	logger
+)
+metrics.timeAsyncMethod(
+	MessageManager, 'getMessages',
+	'MessageManager.getMessages',
+	logger
+)
+metrics.timeAsyncMethod(
+	MessageManager, 'findAllMessagesInRooms',
+	'MessageManager.findAllMessagesInRooms',
+	logger
+)
+metrics.timeAsyncMethod(
+	MessageManager, 'updateMessage',
+	'MessageManager.updateMessage',
+	logger
+)
+metrics.timeAsyncMethod(
+	MessageManager, 'deleteMessage',
+	'MessageManager.deleteMessage',
+	logger
+)
diff --git a/services/chat/app/coffee/Features/Threads/ThreadManager.coffee b/services/chat/app/coffee/Features/Threads/ThreadManager.coffee
index b58c3efe6c..e1f6bd2ebf 100644
--- a/services/chat/app/coffee/Features/Threads/ThreadManager.coffee
+++ b/services/chat/app/coffee/Features/Threads/ThreadManager.coffee
@@ -1,6 +1,8 @@
 mongojs = require("../../mongojs")
 db = mongojs.db
 ObjectId = mongojs.ObjectId
+logger = require('logger-sharelatex')
+metrics = require('metrics-sharelatex')
 
 module.exports = ThreadManager =
 	GLOBAL_THREAD: "GLOBAL"
@@ -74,3 +76,30 @@ module.exports = ThreadManager =
 			}, (error) ->
 				return callback(error) if error?
 				return callback null, room._id
+
+
+metrics.timeAsyncMethod(
+	ThreadManager, 'findOrCreateThread',
+	'ThreadManager.findOrCreateThread',
+	logger
+)
+metrics.timeAsyncMethod(
+	ThreadManager, 'findAllThreadRooms',
+	'ThreadManager.findAllThreadRooms',
+	logger
+)
+metrics.timeAsyncMethod(
+	ThreadManager, 'resolveThread',
+	'ThreadManager.resolveThread',
+	logger
+)
+metrics.timeAsyncMethod(
+	ThreadManager, 'reopenThread',
+	'ThreadManager.reopenThread',
+	logger
+)
+metrics.timeAsyncMethod(
+	ThreadManager, 'deleteThread',
+	'ThreadManager.deleteThread',
+	logger
+)
diff --git a/services/chat/app/coffee/server.coffee b/services/chat/app/coffee/server.coffee
index 7287a90902..3b0dc4b42d 100644
--- a/services/chat/app/coffee/server.coffee
+++ b/services/chat/app/coffee/server.coffee
@@ -8,8 +8,6 @@ app = express()
 server = require("http").createServer(app)
 Router = require "./router"
 
-metrics.mongodb.monitor(Path.resolve(__dirname + "/../../node_modules/mongojs/node_modules/mongodb"), logger)
-
 app.use express.bodyParser()
 app.use metrics.http.monitor(logger)