newrelic 2.0.0 → 2.2.0

package/lib/utilization/pcf-info.js

@@ -0,0 +1,38 @@
+'use strict'
+
+var logger = require('../logger.js').child({component: 'pcf-info'})
+var NAMES = require('../metrics/names.js')
+var common = require('./common')
+
+module.exports = fetchPCFInfo
+
+function fetchPCFInfo(agent, callback) {
+  if (!agent.config.utilization || !agent.config.utilization.detect_pcf) {
+    return setImmediate(callback, null, null)
+  }
+
+  var metadataMap = {
+    'CF_INSTANCE_GUID': 'cf_instance_guid',
+    'CF_INSTANCE_IP': 'cf_instance_ip',
+    'MEMORY_LIMIT': 'memory_limit'
+  }
+
+  var results = {}
+  var keys = Object.keys(metadataMap)
+  for (var i = 0; i < keys.length; i++) {
+    var key = keys[i]
+    var value = process.env[key]
+    if (value == null) {
+      logger.trace('Could not find environment value for %s', key)
+      return setImmediate(callback, null, null)
+    }
+    if (!common.checkValueString(value)) {
+      logger.trace('Invalid environment value for %s: %j', key, value)
+      agent.metrics.getOrCreateMetric(NAMES.UTILIZATION.PCF_ERROR).incrementCallCount()
+      return setImmediate(callback, null, null)
+    }
+    results[metadataMap[key]] = value
+  }
+
+  setImmediate(callback, null, results)
+}

package/newrelic.js

@@ -1,9 +1,8 @@
 'use strict'
-
 /**
  * New Relic agent configuration.
  *
- * See lib/config.default.js in the agent distribution for a more complete
+ * See lib/config.defaults.js in the agent distribution for a more complete
  * description of configuration variables and their potential values.
  */
 exports.config = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "2.0.0",
+  "version": "2.2.0",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "licenses": [
     {
@@ -115,6 +115,7 @@
   },
   "devDependencies": {
     "async": "^2.1.4",
+    "benchmark": "^2.1.4",
     "bluebird": "^3.4.7",
     "eslint": "^2.9.0",
     "jsdoc": "^3.4.0",

package/stub_api.js

@@ -3,13 +3,16 @@
 var logger = require('./lib/logger.js')
 var RealAPI = require('./api.js')
 var TransactionHandle = require('./lib/transaction/handle')
+var util = require('util')
 
 
 /* eslint-disable no-eval */
 function stubFunction(name) {
-  return eval("(function () {return function " + name + "() {" +
-              "logger.debug('Not calling " + name + " because New Relic is disabled.');" +
-              "}}())")
+  return eval(
+    "(function () {return function " + name + "() {" +
+    "logger.debug('Not calling " + name + " because New Relic is disabled.');" +
+    "}}())"
+  )
 }
 /* eslint-enable no-eval */
 
@@ -28,8 +31,22 @@ for (var i = 0; i < length; i++) {
 }
 
 Stub.prototype.createTracer = createTracer
-Stub.prototype.createWebTransaction = createWebTransaction
-Stub.prototype.createBackgroundTransaction = createBackgroundTransaction
+Stub.prototype.createWebTransaction = util.deprecate(
+  createWebTransaction, [
+    'API#createWebTransaction is being deprecated!',
+    'Please use API#startWebTransaction for transaction creation',
+    'and API#getTransaction for transaction management including',
+    'ending transactions.'
+  ].join(' ')
+)
+Stub.prototype.createBackgroundTransaction = util.deprecate(
+  createBackgroundTransaction, [
+    'API#createBackgroundTransaction is being deprecated!',
+    'Please use API#startBackgroundTransaction for transaction creation',
+    'and API#getTransaction for transaction management including',
+    'ending transactions.'
+  ].join(' ')
+)
 Stub.prototype.startWebTransaction = startWebTransaction
 Stub.prototype.startBackgroundTransaction = startBackgroundTransaction
 Stub.prototype.getTransaction = getTransaction
@@ -89,17 +106,17 @@ function startBackgroundTransaction(name, group, callback) {
 // Normally the following call executes callback asynchronously
 function shutdown(options, cb) {
   logger.debug('Not calling shutdown because New Relic is disabled.')
-  
+
   var callback = cb
   if (!callback) {
     if (typeof options === 'function') {
       callback = options
     } else {
-      callback = new Function()
+      callback = function __NR_defaultCb() {}
     }
   }
-  
-  process.nextTick(callback)
+
+  setImmediate(callback)
 }
 
 module.exports = Stub

package/lib/aws-info.js

@@ -1,100 +0,0 @@
-'use strict'
-
-var logger = require('./logger.js').child({component: 'aws-info'})
-var http = require('http')
-var NAMES = require('./metrics/names.js')
-var concat = require('concat-stream')
-
-module.exports = fetchAWSInfo
-module.exports.clearCache = function clearAWSCache() {
-  resultDict = null
-}
-
-var resultDict
-
-function fetchAWSInfo(agent, callback) {
-  if (!agent.config.utilization || !agent.config.utilization.detect_aws) {
-    return callback(null)
-  }
-
-  if (resultDict) {
-    return callback(resultDict)
-  }
-
-  var awsQuery = module.exports._awsQuery
-
-  awsQuery('instance-type', agent, function getInstanceType(type) {
-    if (!type) return callback(null)
-    awsQuery('instance-id', agent, function getInstanceId(id) {
-      if (!id) return callback(null)
-      awsQuery('placement/availability-zone', agent, function getZone(zone) {
-        if (!zone) return callback(null)
-        resultDict = {
-          type: type,
-          id: id,
-          zone: zone
-        }
-        return callback(resultDict)
-      })
-    })
-  })
-}
-
-
-module.exports._awsQuery = function awsQuery(key, agent, callback) {
-  var instanceHost = '169.254.169.254'
-  var apiVersion = '2008-02-01'
-  var url = ['http:/', instanceHost, apiVersion, 'meta-data', key].join('/')
-  var req = http.get(url, function awsRequest(res) {
-    res.pipe(concat(respond))
-    function respond(data) {
-      var valid = checkResponseString(data)
-      if (!valid) {
-        var awsError = agent.metrics.getOrCreateMetric(NAMES.UTILIZATION.AWS_ERROR)
-        awsError.incrementCallCount()
-        logger.debug('Response for attribute ' + key + ': %s'
-          , data)
-        data = null
-      } else {
-        data = data.toString('utf8')
-      }
-
-      agent.removeListener('errored', abortRequest)
-      agent.removeListener('stopped', abortRequest)
-      callback(data)
-    }
-  })
-  req.setTimeout(1000, function awsTimeout() {
-    logger.debug('Request for attribute %s timed out', key)
-    callback(null)
-  })
-  req.on('error', function awsError(err) {
-    logger.debug('Message for attribute %s: %s', key, err.message)
-    callback(null)
-  })
-
-  agent.once('errored', abortRequest)
-  agent.once('stopped', abortRequest)
-
-  function abortRequest() {
-    logger.debug('Abborting request for attribute %s', key)
-    req.abort()
-    agent.removeListener('errored', abortRequest)
-    agent.removeListener('stopped', abortRequest)
-  }
-}
-
-function checkResponseString(str) {
-  var validCharacters = /[0-9a-zA-Z_ ./-]/
-  var valid = str.length <= 255 && str.length > 0
-
-  var i = 0
-  var len = str.length
-
-  while (valid && i < len) {
-    valid = valid && (str[i] > 127 || String.fromCharCode(str[i]).match(validCharacters))
-    i++
-  }
-
-  return valid
-}

package/lib/parse-dockerinfo.js

@@ -1,57 +0,0 @@
-'use strict'
-
-var logger = require('./logger.js').child({component: 'dockerinfo'})
-var NAMES = require('./metrics/names.js')
-module.exports = parseDockerInfo
-
-function parseDockerInfo(agent, data) {
-  if (!agent.config.utilization || !agent.config.utilization.detect_docker) return null
-  var cpuCgroup = parseCgroupIds(data).cpu
-  // if we can't parse the cgroups, or if the cpu is not in a cgroup
-  var dockerError = agent.metrics.getOrCreateMetric(NAMES.UTILIZATION.DOCKER_ERROR)
-  if (!cpuCgroup) {
-    logger.debug('Could not parse cgroup data from: ' + data)
-    dockerError.incrementCallCount()
-    return null
-  }
-
-  // if cpu isn't in a cgroup
-  if (cpuCgroup === '/') return null
-
-  var patterns = [
-    /^\/docker\/([0-9a-f]+)$/, // docker native driver w/out systemd
-    /^\/system\.slice\/docker-([0-9a-f]+)\.scope$/, // with systemd
-    /^\/lxc\/([0-9a-f]+)$/ // docker lxc driver
-  ]
-  for (var i = 0; i < patterns.length; i++) {
-    var pattern = patterns[i]
-    var matches = cpuCgroup.match(pattern)
-    if (matches) {
-      var id = matches[1]
-      if (id.length !== 64) {
-        dockerError.incrementCallCount()
-        logger.debug('Encountered a malformed docker id: ', id)
-        return null
-      }
-      return id
-    }
-  }
-
-  logger.debug('Unable to recognise cgroup format')
-
-  return null
-}
-
-function parseCgroupIds(cgroupInfo) {
-  var cgroupIds = {}
-  cgroupInfo.split('\n').forEach(function parseCgroupInfo(line) {
-    var parts = line.split(':')
-    if (parts.length !== 3) return
-    var subsystems = parts[1]
-    var cgroupId = parts[2]
-    subsystems.split(',').forEach(function assignGroupIds(subsystem) {
-      cgroupIds[subsystem] = cgroupId
-    })
-  })
-  return cgroupIds
-}