From a8cfa97463c193206ef2ff744ec7b4c54baa0753 Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Tue, 27 Nov 2018 11:33:45 +0000
Subject: [PATCH] use modified prefix and method name

---
 libraries/metrics/metrics.coffee         | 8 +++++---
 libraries/metrics/timeAsyncMethod.coffee | 9 ++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/libraries/metrics/metrics.coffee b/libraries/metrics/metrics.coffee
index 80dbf3cd03..a603bc5327 100644
--- a/libraries/metrics/metrics.coffee
+++ b/libraries/metrics/metrics.coffee
@@ -52,16 +52,18 @@ module.exports = Metrics =
 
 	set : (key, value, sampleRate = 1)->
 
-	inc : (key, sampleRate = 1)->
+	inc : (key, sampleRate = 1, opts)->
 		key = Metrics.buildPromKey(key)
 		if !promMetrics[key]?
 			promMetrics[key] = new prom.Counter({
 				name: key,
 				help: key, 
-				labelNames: ['app','host']
+				labelNames: ['app','host','status','method']
 			})
 		console.log("doing inc", key, appname)
-		promMetrics[key].inc({app: appname, host: hostname})
+		opts.app = appname
+		opts.host = hostname
+		promMetrics[key].inc(opts)
 
 	count : (key, count, sampleRate = 1)->
 		key = Metrics.buildPromKey(key)
diff --git a/libraries/metrics/timeAsyncMethod.coffee b/libraries/metrics/timeAsyncMethod.coffee
index 5248c43f79..0bf0108e56 100644
--- a/libraries/metrics/timeAsyncMethod.coffee
+++ b/libraries/metrics/timeAsyncMethod.coffee
@@ -11,7 +11,7 @@ module.exports = (obj, methodName, prefix, logger) ->
 	startPrefix = prefix.split(".")[0]
 
 	endPrefix = prefix.split(".")[1]
-	modifedMethodName = "#{endPrefix}_methodName"
+	modifedMethodName = "#{endPrefix}_#{methodName}"
 	console.log "Async method", prefix, key, methodName, modifedMethodName
 	obj[methodName] = (originalArgs...) ->
 
@@ -25,16 +25,15 @@ module.exports = (obj, methodName, prefix, logger) ->
 		console.log("creating timer for async method", prefix, startPrefix, modifedMethodName)
 
 
-		timer = new metrics.Timer(prefix, null, {method: methodName})
-		console.log("changed timer for async method", prefix, methodName, key)
+		timer = new metrics.Timer(startPrefix, null, {method: modifedMethodName})
 
 		realMethod.call this, firstArgs..., (callbackArgs...) ->
 			elapsedTime = timer.done()
 			possibleError = callbackArgs[0]
 			if possibleError? 
-				metrics.inc "#{key}.failure"
+				metrics.inc "#{startPrefix}", null, {status:"success", method: modifedMethodName}
 			else
-				metrics.inc "#{key}.success"
+				metrics.inc "#{startPrefix}", null, {status:"failed", method: modifedMethodName}
 			if logger?
 				loggableArgs = {}
 				try