cleanup modules

Author: podviaznikov

app.js

@@ -9,24 +9,24 @@ if (process.env.NEW_RELIC_LICENSE_KEY) {
   require('newrelic')
 }
 
-var cluster = require('cluster')
-var createCount = require('callback-count')
-
-var ApiServer = require('server')
-var dogstatsd = require('models/datadog')
-var envIs = require('101/env-is')
-var error = require('error')
-var keyGen = require('key-generator')
-var logger = require('middlewares/logger')(__filename)
-var mongooseControl = require('models/mongo/mongoose-control')
-var noop = require('101/noop')
-var redisClient = require('models/redis')
-var redisPubSub = require('models/redis/pubsub')
-
-var log = logger.log
+const cluster = require('cluster')
+const createCount = require('callback-count')
+
+const ApiServer = require('server')
+const envIs = require('101/env-is')
+const error = require('error')
+const keyGen = require('key-generator')
+const logger = require('middlewares/logger')(__filename)
+const mongooseControl = require('models/mongo/mongoose-control')
+const monitor = require('monitor-dog')
+const noop = require('101/noop')
+const redisClient = require('models/redis')
+const redisPubSub = require('models/redis/pubsub')
+
+const log = logger.log
 
 // express server, handles web HTTP requests
-var apiServer = new ApiServer()
+const apiServer = new ApiServer()
 
 /**
  * @class
@@ -52,7 +52,7 @@ Api.prototype.start = function (cb) {
   // start github ssh key generator
   keyGen.start(count.inc().next)
   // start sending socket count
-  dogstatsd.monitorStart()
+  monitor.startSocketsMonitor()
   // connect to mongoose
   mongooseControl.start(count.inc().next)
   // express server start
@@ -91,7 +91,7 @@ Api.prototype.stop = function (cb) {
   // stop github ssh key generator
   keyGen.stop(count.inc().next)
   // stop sending socket count
-  dogstatsd.monitorStop()
+  monitor.stopSocketsMonitor()
   // express server
   apiServer.stop(count.inc().next)
 

lib/express-app.js

@@ -11,7 +11,7 @@ var morganFreeman = require('morgan')
 
 var Timer = require('models/apis/timers')
 var csrf = require('middlewares/csrf')
-var dogstatsd = require('models/datadog')
+var dogstatsd = require('monitor-dog')
 var error = require('error')
 var passport = require('middlewares/passport')
 var pkg = require('../package.json')

lib/hasher.js

@@ -7,7 +7,7 @@
 'use strict'
 
 var crypto = require('crypto')
-var dogstatsd = require('models/datadog')
+var monitorDog = require('monitor-dog')
 var exists = require('101/exists')
 var isFunction = require('101/is-function')
 var strim = require('strim')
@@ -18,7 +18,7 @@ var strim = require('strim')
  * @param  {Function} cb           callback
  */
 module.exports = function hasher (data, dontReplaceWhitespace, cb) {
-  var start = new Date()
+  const timer = monitorDog.timer('infraCodeVersion.hashTime', true, ['length:' + data.length])
   if (isFunction(dontReplaceWhitespace)) {
     cb = dontReplaceWhitespace
     dontReplaceWhitespace = false
@@ -60,7 +60,7 @@ module.exports = function hasher (data, dontReplaceWhitespace, cb) {
   function done (err, hash) {
     if (calledBack) { return }
     calledBack = true
-    dogstatsd.timing('api.infraCodeVersion.hashTime', new Date() - start, 1, ['length:' + data.length])
+    timer.stop()
     cb(err, hash)
   }
 }

lib/key-generator.js

@@ -8,7 +8,7 @@ require('loadenv')()
 var async = require('async')
 
 var Keypair = require('models/mongo/keypair')
-var dogstatsd = require('models/datadog')
+var monitorDog = require('monitor-dog')
 var logger = require('middlewares/logger')(__filename)
 var noop = require('101/noop')
 var bindAll = require('101/bind-all')
@@ -89,7 +89,7 @@ KeyGen.prototype._handleInterval = function () {
       log.error({err: err}, 'error getting the keypair count')
       return handleComplete(err)
     }
-    dogstatsd.gauge('api.keypairs.count', count)
+    monitorDog.gauge('keypairs.count', count)
     var numKeysToCreate = self.poolSize - count
     var tasks = []
     for (var i = 0; i < numKeysToCreate; i++) {

lib/models/apis/container-fs.js

@@ -4,7 +4,7 @@ var pathModule = require('path')
 var request = require('request')
 var url = require('url')
 var Boom = require('dat-middleware').Boom
-var dogstatsd = require('models/datadog')
+var monitorDog = require('monitor-dog')
 
 function formatURL (container, path) {
   var parsedHost = url.parse(container.host)
@@ -54,7 +54,7 @@ function logTime (err, res, method, call, start) {
     statusCode = res.statusCode
   }
 
-  dogstatsd.timing('api.krain.request',
+  monitorDog.histogram('krain.request',
     new Date() - start,
     ['statusCode:' + statusCode,
       'didErr:' + (err ? 'true' : 'false'),

lib/models/apis/timers.js

@@ -5,7 +5,7 @@
 
 var isFunction = require('101/is-function')
 
-var dogstatsd = require('models/datadog')
+var monitorDog = require('monitor-dog')
 var logger = require('middlewares/logger')(__filename)
 
 var log = logger.log
@@ -26,7 +26,7 @@ Timers.prototype.debug = function (name, message) {
 Timers.prototype.sendToDatadog = function (name, timer, tags) {
   var ms = (timer[0] * 1000) + (timer[1] / 1000000)
   // ms = seconds * 1000 + nanoseconds / 1000000
-  dogstatsd.timing('api.timers.' + name, ms, tags)
+  monitorDog.histogram('timers.' + name, ms, tags)
 }
 
 Timers.prototype.startTimer = function (name, cb) {

lib/models/datadog/index.js

@@ -21,7 +21,7 @@ const pick = require('101/pick')
 const Promise = require('bluebird')
 const util = require('util')
 
-const dogstatsd = require('models/datadog')
+const monitorDog = require('monitor-dog')
 const error = require('error')
 const Github = require('models/apis/github')
 const InfraCodeVersion = require('models/mongo/infra-code-version')
@@ -1155,11 +1155,11 @@ ContextVersionSchema.methods.dedupeBuild = function (callback) {
     log.trace('dedupeBuild: replaceIfDupe')
     if (dupe) { // dupe found
       log.trace('dedupeBuild: replaceIfDupe dupe found')
-      dogstatsd.increment('api.contextVersion.build.deduped')
+      monitorDog.increment('contextVersion.build.deduped')
       self.copyBuildFromContextVersion(dupe, cb)
     } else {
       log.trace('dedupeBuild: replaceIfDupe no dupe')
-      dogstatsd.increment('api.contextVersion.build.noDupe')
+      monitorDog.increment('contextVersion.build.noDupe')
       cb(null, self)
     }
   }

lib/models/mongo/context-version.js

@@ -13,7 +13,7 @@ var isObject = require('101/is-object')
 var keypath = require('keypather')()
 var mw = require('dat-middleware')
 
-var dogstatsd = require('models/datadog')
+var monitorDog = require('monitor-dog')
 var GitHub = require('models/apis/github')
 var logger = require('logger')
 var stacks = require('routes/actions/analyze/data/stacks')
@@ -160,7 +160,10 @@ function extractJS (req, res, next) {
     languageFramework: req.languageFramework
   })
   log.info('extractJS called')
-  var start = new Date()
+  const timer = monitorDog.timitimerng('actions-analyze-index.extractJS', true, [
+    'dependencyFile:' + req.dependencyFile.name,
+    'languageFramework:' + req.languageFramework
+  ])
   var depFile
   try {
     depFile = JSON.parse(req.dependencyFileContent)
@@ -179,10 +182,7 @@ function extractJS (req, res, next) {
     nodejs: nodev,
     npm: npmv
   }
-  dogstatsd.timing('api.actions-analyze-index.extractJS', new Date() - start, 1, [
-    'dependencyFile:' + req.dependencyFile.name,
-    'languageFramework:' + req.languageFramework
-  ])
+  timer.stop()
   next()
 }
 
@@ -196,7 +196,11 @@ function extractRuby (req, res, next) {
   logger.trace({
     languageFramework: req.languageFramework
   }, 'extractRuby')
-  var start = new Date()
+  const timer = monitorDog.timer('actions-analyze-index.extractRuby', true, [
+    'dependencyFile:' + req.dependencyFile.name,
+    'languageFramework:' + req.languageFramework,
+    'dependencies.length:' + dependencies.length
+  ])
   var dependencies = []
   var gemfileDependenciesRegexPattern = /^(\s+)?gem\s+['"](\S+)['"]/gm
   var execResult = gemfileDependenciesRegexPattern.exec(req.dependencyFileContent)
@@ -209,11 +213,7 @@ function extractRuby (req, res, next) {
     ruby: req.supportedLanguageVersions.defaultVersion,
     rails: stacks.rails.defaultVersion
   }
-  dogstatsd.timing('api.actions-analyze-index.extractRuby', new Date() - start, 1, [
-    'dependencyFile:' + req.dependencyFile.name,
-    'languageFramework:' + req.languageFramework,
-    'dependencies.length:' + dependencies.length
-  ])
+  timer.stop()
   next()
 }
 
@@ -227,7 +227,11 @@ function extractPython (req, res, next) {
   logger.trace({
     languageFramework: req.languageFramework
   }, 'extractPython')
-  var start = new Date()
+  const timer = monitorDog.timer('actions-analyze-index.extractPython', true, [
+    'dependencyFile:' + req.dependencyFile.name,
+    'languageFramework:' + req.languageFramework,
+    'dependencies.length:' + dependencies.length
+  ])
   var dependencies = []
   var pythonDependenciesRegexPattern
   var execResult
@@ -253,11 +257,7 @@ function extractPython (req, res, next) {
   req.inferredLanguageVersion = {
     python: req.supportedLanguageVersions.defaultVersion
   }
-  dogstatsd.timing('api.actions-analyze-index.extractPython', new Date() - start, 1, [
-    'dependencyFile:' + req.dependencyFile.name,
-    'languageFramework:' + req.languageFramework,
-    'dependencies.length:' + dependencies.length
-  ])
+  timer.stop()
   next()
 }
 
@@ -273,7 +273,10 @@ function extractPHP (req, res, next) {
     method: 'extractPHP'
   })
   log.info('extractPHP')
-  var start = new Date()
+  const timer = monitorDog.timer('actions-analyze-index.extractPHP', true, [
+    'dependencyFile:' + req.dependencyFile.name,
+    'languageFramework:' + req.languageFramework
+  ])
   var depFile
   try {
     depFile = JSON.parse(req.dependencyFileContent)
@@ -287,10 +290,7 @@ function extractPHP (req, res, next) {
   req.inferredLanguageVersion = {
     php: req.supportedLanguageVersions.defaultVersion
   }
-  dogstatsd.timing('api.actions-analyze-index.extractPHP', new Date() - start, 1, [
-    'dependencyFile:' + req.dependencyFile.name,
-    'languageFramework:' + req.languageFramework
-  ])
+  timer.stop()
   next()
 }
 
@@ -326,7 +326,7 @@ function inferDependenciesFromDependencyList (req, res, next) {
       suggestableServices = suggestableServicesPHP
       break
   }
-  var start = new Date()
+  const timer = monitorDog.timer('actions-analyze-index.inferDependenciesFromDependencyList', true, [])
   var inferredServices = suggestableServicesKeys.filter(function (key) {
     return find(suggestableServices[key], function (moduleThatMatchesSuggestableService) {
       return find(req.dependencyList, function (dependencyInProject) {
@@ -335,8 +335,7 @@ function inferDependenciesFromDependencyList (req, res, next) {
       })
     })
   })
-  dogstatsd.timing('api.actions-analyze-index.inferDependenciesFromDependencyList',
-    new Date() - start, 1, [])
+  timer.stop()
   req.inferredDependencies = inferredServices
   next()
 }

lib/routes/actions/analyze/index.js

@@ -9,7 +9,7 @@ const keypather = require('keypather')()
 const Promise = require('bluebird')
 const uuid = require('uuid')
 
-const dogstatsd = require('models/datadog')
+const monitorDog = require('monitor-dog')
 const error = require('dat-middleware').Boom
 const errorModule = require('error')
 const GitHub = require('models/apis/github')
@@ -19,7 +19,7 @@ const User = require('models/mongo/user')
 
 module.exports = new Messenger()
 
-const baseDataName = 'api.socket.messenger'
+const baseDataName = 'socket.messenger'
 function Messenger () {}
 
 Messenger.prototype.setServer = function (server) {
@@ -267,11 +267,11 @@ Messenger.prototype.canJoin = function (socket, data, cb) {
  * @returns Promise with either a success, or a rejection if something fails
  */
 Messenger.prototype.subscribeStreamHandler = function (socket, id, data) {
-  dogstatsd.increment(baseDataName + '.connections')
+  monitorDog.increment(baseDataName + '.connections')
   // check required args
   return Promise.try(function () {
     if (!data.name || !data.type || !data.action) {
-      dogstatsd.increment(baseDataName + '.err.invalid_args')
+      monitorDog.increment(baseDataName + '.err.invalid_args')
       const notFound = error.create(400, 'name, type and action are required', data)
       keypather.set(notFound, 'data.level', 'warning')
       throw notFound