newrelic 8.7.0 → 8.9.0

package/lib/utilization/aws-info.js

@@ -9,6 +9,7 @@ const logger = require('../logger.js').child({ component: 'aws-info' })
 const common = require('./common')
 const NAMES = require('../metrics/names.js')
 let results = null
+const INSTANCE_HOST = '169.254.169.254'
 
 module.exports = fetchAWSInfo
 module.exports.clearCache = function clearAWSCache() {
@@ -24,27 +25,45 @@ function fetchAWSInfo(agent, callback) {
     return setImmediate(callback, null, results)
   }
 
-  const instanceHost = '169.254.169.254'
-  const apiVersion = '2016-09-02'
-  const endpoint = 'dynamic/instance-identity/document'
-  const url = 'http://' + instanceHost + '/' + apiVersion + '/' + endpoint
-  common.request(url, agent, function getMetadata(err, data) {
+  const authTokenOpts = {
+    headers: { 'X-aws-ec2-metadata-token-ttl-seconds': '21600' },
+    host: INSTANCE_HOST,
+    method: 'PUT',
+    path: '/latest/api/token',
+    timeout: 500
+  }
+  common.request(authTokenOpts, agent, function getAuthToken(err, authToken) {
     if (err) {
+      logger.debug('Failed to get AWS auth token.')
       return callback(err)
     }
 
-    try {
-      data = JSON.parse(data)
-    } catch (e) {
-      logger.debug(e, 'Failed to parse AWS metadata.')
-      data = null
+    const metadataOpts = {
+      headers: { 'X-aws-ec2-metadata-token': authToken },
+      host: INSTANCE_HOST,
+      method: 'GET',
+      path: '/latest/dynamic/instance-identity/document',
+      timeout: 500
     }
 
-    results = common.getKeys(data, ['availabilityZone', 'instanceId', 'instanceType'])
-    if (results == null) {
-      logger.debug('AWS metadata was invalid.')
-      agent.metrics.getOrCreateMetric(NAMES.UTILIZATION.AWS_ERROR).incrementCallCount()
-    }
-    callback(null, results)
+    common.request(metadataOpts, agent, function getMetadata(metaErr, data) {
+      if (metaErr) {
+        return callback(metaErr)
+      }
+
+      try {
+        data = JSON.parse(data)
+      } catch (e) {
+        logger.debug(e, 'Failed to parse AWS metadata.')
+        data = null
+      }
+
+      results = common.getKeys(data, ['availabilityZone', 'instanceId', 'instanceType'])
+      if (results == null) {
+        logger.debug('AWS metadata was invalid.')
+        agent.metrics.getOrCreateMetric(NAMES.UTILIZATION.AWS_ERROR).incrementCallCount()
+      }
+      callback(null, results)
+    })
   })
 }

package/lib/utilization/common.js

@@ -65,6 +65,12 @@ exports.request = function request(opts, agent, cb) {
 
   opts.timeout = opts.timeout || 1000
 
+  // This can make more that GET requests if you pass in an object
+  // Node.js just pass this method into ClientRequest which accepts
+  // any valid HTTP Method
+  // see: https://github.com/nodejs/node/blob/master/lib/http.js#L106
+  // Technically this wouldn't work for a PUT/POST with a body
+  // but works fine in all cases where this is being used.
   const req = http.get(opts, function awsRequest(res) {
     res.pipe(concat(respond))
     function respond(data) {
@@ -89,9 +95,7 @@ exports.request = function request(opts, agent, cb) {
     }
   })
 
-  req.setTimeout(1000, function requestTimeout() {
-    req.abort()
-  })
+  req.on('timeout', abortRequest)
 
   req.on('error', function requestError(err) {
     if (err.code === 'ECONNRESET') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "8.7.0",
+  "version": "8.9.0",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [
@@ -136,7 +136,7 @@
     "prepare-test": "npm run ca-gen && npm run ssl && npm run docker-env",
     "lint": "eslint ./*.js lib test bin examples",
     "lint:fix": "eslint --fix, ./*.js lib test bin examples",
-    "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/",
+    "public-docs": "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",
     "smoke": "npm run ssl && time tap test/smoke/**/**/*.tap.js --timeout=180 --no-coverage",
@@ -159,13 +159,13 @@
     "newrelic-naming-rules": "./bin/test-naming-rules.js"
   },
   "dependencies": {
-    "@grpc/grpc-js": "^1.2.11",
-    "@grpc/proto-loader": "^0.5.6",
-    "@newrelic/aws-sdk": "^4.0.1",
-    "@newrelic/koa": "^6.0.1",
-    "@newrelic/superagent": "^5.0.1",
+    "@grpc/grpc-js": "^1.5.5",
+    "@grpc/proto-loader": "^0.6.9",
+    "@newrelic/aws-sdk": "^4.1.1",
+    "@newrelic/koa": "^6.1.1",
+    "@newrelic/superagent": "^5.1.0",
     "@tyriar/fibonacci-heap": "^2.0.7",
-    "async": "^3.2.0",
+    "async": "^3.2.3",
     "concat-stream": "^2.0.0",
     "https-proxy-agent": "^5.0.0",
     "json-stringify-safe": "^5.0.0",
@@ -173,13 +173,13 @@
     "semver": "^5.3.0"
   },
   "optionalDependencies": {
-    "@newrelic/native-metrics": "^7.0.1"
+    "@newrelic/native-metrics": "^7.1.1"
   },
   "devDependencies": {
     "@newrelic/eslint-config": "^0.0.3",
     "@newrelic/newrelic-oss-cli": "^0.1.2",
     "@newrelic/proxy": "^2.0.0",
-    "@newrelic/test-utilities": "^6.1.1",
+    "@newrelic/test-utilities": "^6.3.0",
     "@octokit/rest": "^18.0.15",
     "@slack/bolt": "^3.7.0",
     "ajv": "^6.12.6",