diff --git a/libraries/metrics/metrics.coffee b/libraries/metrics/metrics.coffee index a603bc5327..1c19fa05e9 100644 --- a/libraries/metrics/metrics.coffee +++ b/libraries/metrics/metrics.coffee @@ -60,7 +60,7 @@ module.exports = Metrics = help: key, labelNames: ['app','host','status','method'] }) - console.log("doing inc", key, appname) + console.log("doing inc", key, opts) opts.app = appname opts.host = hostname promMetrics[key].inc(opts) diff --git a/libraries/metrics/timeAsyncMethod.coffee b/libraries/metrics/timeAsyncMethod.coffee index 0bf0108e56..e09e9bfa43 100644 --- a/libraries/metrics/timeAsyncMethod.coffee +++ b/libraries/metrics/timeAsyncMethod.coffee @@ -8,10 +8,14 @@ module.exports = (obj, methodName, prefix, logger) -> key = "#{prefix}.#{methodName}" realMethod = obj[methodName] - startPrefix = prefix.split(".")[0] - endPrefix = prefix.split(".")[1] - modifedMethodName = "#{endPrefix}_#{methodName}" + splitPrefix = prefix.split(".") + startPrefix = splitPrefix[0] + + if splitPrefix[1]? + modifedMethodName = "#{splitPrefix[1]}_#{methodName}" + else + modifedMethodName = methodName console.log "Async method", prefix, key, methodName, modifedMethodName obj[methodName] = (originalArgs...) -> @@ -31,9 +35,9 @@ module.exports = (obj, methodName, prefix, logger) -> elapsedTime = timer.done() possibleError = callbackArgs[0] if possibleError? - metrics.inc "#{startPrefix}", null, {status:"success", method: modifedMethodName} + metrics.inc "#{startPrefix}_result", null, {status:"failed", method: modifedMethodName} else - metrics.inc "#{startPrefix}", null, {status:"failed", method: modifedMethodName} + metrics.inc "#{startPrefix}_result", null, {status:"success", method: modifedMethodName} if logger? loggableArgs = {} try