newrelic 7.5.2 → 8.3.0

package/lib/utilization/gcp-info.js

@@ -5,17 +5,16 @@
 
 'use strict'
 
-var logger = require('../logger.js').child({component: 'gcp-info'})
+var logger = require('../logger.js').child({ component: 'gcp-info' })
 var common = require('./common')
 var NAMES = require('../metrics/names.js')
+let resultDict = null
 
 module.exports = fetchGCPInfo
 module.exports.clearCache = function clearGCPCache() {
   resultDict = null
 }
 
-var resultDict
-
 function fetchGCPInfo(agent, callback) {
   if (!agent.config.utilization || !agent.config.utilization.detect_gcp) {
     return setImmediate(callback, null)
@@ -25,37 +24,39 @@ function fetchGCPInfo(agent, callback) {
     return setImmediate(callback, null, resultDict)
   }
 
-  common.request({
-    host: 'metadata.google.internal',
-    path: '/computeMetadata/v1/instance/?recursive=true',
-    headers: {
-      'Metadata-Flavor': 'Google'
-    }
-  }, agent, function getMetadata(err, data) {
-    if (err) {
-      return callback(err)
-    }
-
-    try {
-      data = JSON.parse(data)
-    } catch (e) {
-      logger.debug(e, 'Failed to parse GCP metadata.')
-      data = null
-    }
-
-    var results = common.getKeys(data, ['id', 'machineType', 'name', 'zone'])
-    if (results == null) {
-      logger.debug('GCP metadata was invalid.')
-      agent.metrics.getOrCreateMetric(NAMES.UTILIZATION.GCP_ERROR).incrementCallCount()
-    } else {
-      // normalize
-      results.machineType =
-        results.machineType.substr(results.machineType.lastIndexOf('/') + 1)
-      results.zone =
-        results.zone.substr(results.zone.lastIndexOf('/') + 1)
-
-      resultDict = results
+  common.request(
+    {
+      host: 'metadata.google.internal',
+      path: '/computeMetadata/v1/instance/?recursive=true',
+      headers: {
+        'Metadata-Flavor': 'Google'
+      }
+    },
+    agent,
+    function getMetadata(err, data) {
+      if (err) {
+        return callback(err)
+      }
+
+      try {
+        data = JSON.parse(data)
+      } catch (e) {
+        logger.debug(e, 'Failed to parse GCP metadata.')
+        data = null
+      }
+
+      var results = common.getKeys(data, ['id', 'machineType', 'name', 'zone'])
+      if (results == null) {
+        logger.debug('GCP metadata was invalid.')
+        agent.metrics.getOrCreateMetric(NAMES.UTILIZATION.GCP_ERROR).incrementCallCount()
+      } else {
+        // normalize
+        results.machineType = results.machineType.substr(results.machineType.lastIndexOf('/') + 1)
+        results.zone = results.zone.substr(results.zone.lastIndexOf('/') + 1)
+
+        resultDict = results
+      }
+      callback(null, results)
     }
-    callback(null, results)
-  })
+  )
 }

package/lib/utilization/index.js

@@ -5,7 +5,7 @@
 
 'use strict'
 
-var logger = require('../logger').child({component: 'utilization'})
+var logger = require('../logger').child({ component: 'utilization' })
 
 var VENDOR_METHODS = {
   aws: require('./aws-info'),

package/lib/utilization/kubernetes-info.js

@@ -4,7 +4,7 @@
  */
 
 'use strict'
-const logger = require('../logger').child({component: 'kubernetes-info'})
+const logger = require('../logger').child({ component: 'kubernetes-info' })
 
 let info = null
 
@@ -27,7 +27,7 @@ function getKubernetesInfo(agent, callback) {
     return setImmediate(callback, null, null)
   }
 
-  info = {kubernetes_service_host: process.env.KUBERNETES_SERVICE_HOST}
+  info = { kubernetes_service_host: process.env.KUBERNETES_SERVICE_HOST }
 
   setImmediate(callback, null, info)
 }

package/lib/utilization/pcf-info.js

@@ -5,7 +5,7 @@
 
 'use strict'
 
-var logger = require('../logger.js').child({component: 'pcf-info'})
+var logger = require('../logger.js').child({ component: 'pcf-info' })
 var NAMES = require('../metrics/names.js')
 var common = require('./common')
 
@@ -17,9 +17,9 @@ function fetchPCFInfo(agent, callback) {
   }
 
   var metadataMap = {
-    'CF_INSTANCE_GUID': 'cf_instance_guid',
-    'CF_INSTANCE_IP': 'cf_instance_ip',
-    'MEMORY_LIMIT': 'memory_limit'
+    CF_INSTANCE_GUID: 'cf_instance_guid',
+    CF_INSTANCE_IP: 'cf_instance_ip',
+    MEMORY_LIMIT: 'memory_limit'
   }
 
   var results = Object.create(null)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "7.5.2",
+  "version": "8.3.0",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [
@@ -98,6 +98,11 @@
       "name": "Nick Tzaperas",
       "email": "ntzaperas@newrelic.com",
       "web": "https://newrelic.com"
+    },
+    {
+      "name": "Bob Evans",
+      "email": "revans@newrelic.com",
+      "web": "https://newrelic.com"
     }
   ],
   "description": "New Relic agent",
@@ -109,10 +114,10 @@
     "debugging",
     "profiling"
   ],
-  "homepage": "http://github.com/newrelic/node-newrelic",
+  "homepage": "https://github.com/newrelic/node-newrelic",
   "engines": {
-    "node": ">=10.0.0",
-    "npm": ">=3.0.0"
+    "node": ">=12.0.0",
+    "npm": ">=6.0.0"
   },
   "directories": {
     "lib": "lib"
@@ -122,9 +127,10 @@
     "ca-gen": "./bin/update-ca-bundle.sh",
     "docker-env": "./bin/docker-env-vars.sh",
     "docs": "npm ci && jsdoc -c ./jsdoc-conf.json --private -r .",
-    "integration": "npm run prepare-test && npm run sub-install && time tap --no-esm test/integration/**/**/*.tap.js --timeout=180 --no-coverage",
+    "integration": "npm run prepare-test && npm run sub-install && time tap test/integration/**/**/*.tap.js --timeout=180 --no-coverage --reporter classic",
     "prepare-test": "npm run ca-gen && npm run ssl && npm run docker-env",
     "lint": "eslint ./*.js lib test bin",
+    "lint:fix": "eslint --fix, ./*.js lib test bin",
     "public-docs": "npm ci && jsdoc -c ./jsdoc-conf.json --tutorials examples/shim api.js lib/shim/ lib/transaction/handle.js && cp examples/shim/*.png out/",
     "publish-docs": "./bin/publish-docs.sh",
     "services": "./bin/docker-services.sh",
@@ -132,11 +138,14 @@
     "ssl": "./bin/ssl.sh",
     "sub-install": "node test/bin/install_sub_deps",
     "test": "npm run integration && npm run unit",
-    "unit": "rm -f newrelic_agent.log && time tap --test-regex='(\\/|^test\\/unit\\/.*\\.test\\.js)$' --timeout=180 --no-coverage",
+    "third-party-updates": "oss third-party manifest --includeOptDeps && oss third-party notices --includeOptDeps && git add THIRD_PARTY_NOTICES.md third_party_manifest.json",
+    "unit": "rm -f newrelic_agent.log && time tap --test-regex='(\\/|^test\\/unit\\/.*\\.test\\.js)$' --timeout=180 --no-coverage --reporter classic",
     "update-cross-agent-tests": "./bin/update-cats.sh",
     "versioned-tests": "./bin/run-versioned-tests.sh",
     "update-changelog-version": "node ./bin/update-changelog-version",
-    "versioned": "npm run prepare-test && time ./bin/run-versioned-tests.sh",
+    "versioned": "npm run versioned:npm7",
+    "versioned:npm6": "npm run prepare-test && time ./bin/run-versioned-tests.sh",
+    "versioned:npm7": "npm run prepare-test && NPM7=1 time ./bin/run-versioned-tests.sh",
     "prepare": "husky install"
   },
   "bin": {
@@ -145,33 +154,38 @@
   "dependencies": {
     "@grpc/grpc-js": "^1.2.11",
     "@grpc/proto-loader": "^0.5.6",
-    "@newrelic/aws-sdk": "^3.1.0",
-    "@newrelic/koa": "^5.0.0",
-    "@newrelic/superagent": "^4.0.0",
+    "@newrelic/aws-sdk": "^4.0.1",
+    "@newrelic/koa": "^6.0.1",
+    "@newrelic/superagent": "^5.0.1",
     "@tyriar/fibonacci-heap": "^2.0.7",
     "async": "^3.2.0",
     "concat-stream": "^2.0.0",
-    "https-proxy-agent": "^4.0.0",
+    "https-proxy-agent": "^5.0.0",
     "json-stringify-safe": "^5.0.0",
     "readable-stream": "^3.6.0",
     "semver": "^5.3.0"
   },
   "optionalDependencies": {
-    "@newrelic/native-metrics": "^6.0.0"
+    "@newrelic/native-metrics": "^7.0.1"
   },
   "devDependencies": {
+    "@newrelic/eslint-config": "^0.0.2",
+    "@newrelic/newrelic-oss-cli": "^0.1.2",
     "@newrelic/proxy": "^2.0.0",
-    "@newrelic/test-utilities": "^5.1.0",
+    "@newrelic/test-utilities": "^6.0.0",
     "@octokit/rest": "^18.0.15",
-    "JSV": "~4.0.2",
+    "ajv": "^6.12.6",
     "architect": "*",
     "benchmark": "^2.1.4",
     "bluebird": "^3.4.7",
     "chai": "^4.1.2",
     "commander": "^7.0.0",
-    "eslint": "^6.8.0",
+    "eslint": "^7.32.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-header": "^3.1.1",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-prettier": "^3.4.0",
     "express": "*",
-    "fastify": "^2.15.3",
     "generic-pool": "^3.6.1",
     "glob": "^7.1.2",
     "got": "^8.0.1",
@@ -184,6 +198,7 @@
     "mongodb": "^3.3.3",
     "mysql": "*",
     "nock": "11.8.0",
+    "prettier": "^2.3.2",
     "proxyquire": "^1.8.0",
     "q": "*",
     "redis": "^1.0.0",
@@ -192,9 +207,8 @@
     "rimraf": "^2.6.3",
     "should": "*",
     "sinon": "^4.5.0",
-    "tap": "^14.10.8",
+    "tap": "^15.0.9",
     "temp": "^0.8.1",
-    "through": "^2.3.6",
     "when": "*"
   },
   "repository": {

package/stub_api.js

@@ -9,13 +9,16 @@ var logger = require('./lib/logger.js')
 var RealAPI = require('./api.js')
 var TransactionHandle = require('./lib/transaction/handle')
 
-
 /* eslint-disable no-eval */
 function stubFunction(name) {
   return eval(
-    "(function () {return function " + name + "() {" +
-    "logger.debug('Not calling " + name + " because New Relic is disabled.');" +
-    "}}())"
+    '(function () {return function ' +
+      name +
+      '() {' +
+      "logger.debug('Not calling " +
+      name +
+      " because New Relic is disabled.');" +
+      '}}())'
   )
 }
 /* eslint-enable no-eval */
@@ -25,7 +28,6 @@ function Stub() {}
 var keys = Object.keys(RealAPI.prototype)
 var length = keys.length
 
-
 /* This way the stub API doesn't have to be updated in lockstep with the regular
  * API.
  */
@@ -110,7 +112,7 @@ function shutdown(options, cb) {
     if (typeof options === 'function') {
       callback = options
     } else {
-      callback = function __NR_defaultCb() {}
+      callback = function __NRDefaultCb() {}
     }
   }