newrelic 8.6.0 → 8.8.0

package/NEWS.md

@@ -1,19 +1,129 @@
-### v8.6.0 (2021-11-17)
-
+### v8.8.0 (2022-02-23)
+
+* Updated AWS metadata capture to utilize IMDSv2.
+
+* Fixed link to discuss.newrelic.com in README
+
+* Updated minimum Node version warning to output current Node version from process.
+
+* Bumped `@newrelic/native-metrics` to ^7.1.1.
+
+* Added `Nextjs` to a framework constant within the webframework-shim.
+
+* Updated shim to pass active segment to inContext callback.
+
+* Bumped `@grpc/grpc-js` to ^1.5.5.
+
+* Bumped `@grpc/proto-loader` to ^0.6.9.
+
+* Bumped `@newrelic/superagent` to ^5.1.0.
+
+* Bumped `@newrelic/koa` to ^6.1.0.
+
+* Bumped `async` to ^3.2.3.
+
+* Resolved several npm audit warnings for dev deps.
+
+* Fixed Post Release workflow by properly configuring git credentials so it can push API docs to branch
+ * Added `set -e` in publish docs script to exit on possible failures
+ * Removed redundant `npm ci` in publish API docs script
+
+* Added ability to ignore certain PRs in `bin/pending-prs.js` report to slack
+
+* Updated README to include `@newrelic/pino-enricher` as an external module.
+
+* Fixed documentation in a sample of the Datastore Instrumentation for Node.js.
+
+* Added a new `mongo:5` container to `npm run sevices` to test mongodb driver >=4.2.0.
+
+* Fixed conditions in post release workflow to function when triggered via successful release and manual invoked.
+
+* Updated method for retrieving agent version from repository by using `cat package.json | jq .version`
+
+* Fixed minor formatting and spelling issues in `create-docs-pr.js`.
+
+* Fixed an issue with the docs PR script that assumed `\n` in the NEWS.md file when extract version and release date
+
+### v8.7.1 (2022-01-18)
+
+* Bumped @newrelic/aws-sdk to ^4.1.1.
+
+* Upgraded `@newrelic/test-utilities` to ^6.3.0.
+
+  Includes `helpers.getShim` so sub packages properly execute.
+
+* Resolved dependabot and certain npm audit warnings.
+
+* Automation and CI improvements:
+  * Added a script to be used by agent developers to add a PR to `docs-website` after the release of agent.
+  * Changed the trigger for post release jobs.
+  * Updated the `create-release-tag` script to pass in workflows to check before creating tag.
+    * Fixed `create-release-tag` to properly filter out all async workflow run checks
+    * Updated agent release to pass in a different list of workflows vs the default
+  * Fixed release creation reusable workflow by passing in repo to `bin/create-release-tag.js` and `bin/create-github-release.js`.
+  * Added `workflow_dispatch` to Agent Post Release workflow for manual testing.
+  * Added a reusable workflow to create a release tag, publish to NPM and publish a GitHub release.
+    * Updated agent release workflow to reference reusable workflow.
+    * Added a new workflow to update RPM and publish API docs on a published release event type.
+
+
+### v8.7.0 (2022-01-04)
+
+* Updated `onResolved` instrumentation hook to only be called the first time we see a specific module filepath resolved.
+
+* Removed `tracer.segment` in place of direct usage of context manager.
+
+* Fixed an issue where multiple calls to `instrumentLoadedModule` resulted in re-instrumenting the same module.
+
+* Fixed issue where `instrumentLoadedModule` would return `true` even if the instrumentation handler indicated it did not apply instrumentation.
+
+* Added support metrics for tracking when instrumentation was applied per module.
+
+  * `Supportability/Features/Instrumentation/OnResolved/<module-name>`
+  * `Supportability/Features/Instrumentation/OnResolved/<module-name>/Version/<major version>`
+  * `Supportability/Features/Instrumentation/OnRequire/<module-name>`
+  * `Supportability/Features/Instrumentation/OnRequire/<module-name>/Version/<major version>`
+
+* Fixed issue where expected status code ranges would not be parsed until ignored status codes were also defined.
+
+* Added an input `changelog_file` to pass in name of changelog.  This defaults to `NEWS.md` but some repos use `CHANGELOG.md`
+
+* Abstracted `bin/prepare-release.js` to work against other repositories.
+
+* Added reusable prepare-release workflow that can be referenced in all other newrelic Node.js repositories.
+
+* Updated pending PRs workflow to check all repos the team owns.
+
+* Changed the event type from `pull_request` to `pull_request_target` to allow for auto assign of PRs to the Node.js Engineering Board
+
+* Fixed add to board workflow to properly pass repository secrets into reusable board workflow.
+
+* Changes token used to post issues to org level project board
+
+* Runs versioned tests for external modules against tests defined in the external repository instead of tests published in npm modules.
+
+* Added a reusable workflow to automatically add issues to the Node.js Engineering Board when created.
+
+* Added CI job to update system configurations with new agent version on release.
+
+* Moved `methods.js` under bluebird versioned test folder.
+
+### v8.6.0 (2021-11-17)
+
 * Added `onResolved` instrumentation hook to apply instrumentation prior to module load.
 
-  This hook fires after the module filepath has been resolved just prior to the module being loaded by the CommonJS module loader.
-
-* Fixed issue where `recordConsume` was not binding consumer if it was a promise
-
-* Pinned mongo versioned tests to `<4.2.0` until we can address https://github.com/newrelic/node-newrelic/issues/982
-
-* Introduced a context management API to be used in place of manually calling tracer.segment get/set.
-
-### v8.5.2 (2021-11-09)
-
-* Fixed issue where unhandled promise rejections were not getting logged as errors in a lambda execution
-
+  This hook fires after the module filepath has been resolved just prior to the module being loaded by the CommonJS module loader.
+
+* Fixed issue where `recordConsume` was not binding consumer if it was a promise
+
+* Pinned mongo versioned tests to `<4.2.0` until we can address https://github.com/newrelic/node-newrelic/issues/982
+
+* Introduced a context management API to be used in place of manually calling tracer.segment get/set.
+
+### v8.5.2 (2021-11-09)
+
+* Fixed issue where unhandled promise rejections were not getting logged as errors in a lambda execution
+
 ### v8.5.1 (2021-11-03)
 
 * Fixed bug where failure to retrieve CPU/Memory details for certain Linux distros could result in a crash.

package/README.md

@@ -67,7 +67,8 @@ For more information on getting started, [check the Node.js docs](https://docs.n
 There are several modules that can be installed and configured to accompany the Node.js agent:
 
  * [@newrelic/apollo-server-plugin](https://github.com/newrelic/newrelic-node-apollo-server-plugin): New Relic's official Apollo Server plugin for use with the Node.js agent.
- * [@newrelic/winston-enricher](https://github.com/newrelic/newrelic-winston-logenricher-node): Provides distributed trace and span information output as JSON-formatted log messages.  This is most commonly used with the New Relic Logs product.
+ * [@newrelic/winston-enricher](https://github.com/newrelic/newrelic-node-log-extensions/tree/main/packages/winston-log-enricher): Provides distributed trace and span information output as JSON-formatted log messages in Winston.  This is most commonly used with the New Relic Logs product.
+ * [@newrelic/pino-enricher](https://github.com/newrelic/newrelic-node-log-extensions/tree/main/packages/pino-log-enricher): Provides distributed trace and span information output as JSON-formatted log messages in Pino.  This is most commonly used with the New Relic Logs product.
  * [@newrelic/mysql](https://github.com/newrelic/node-newrelic-mysql)(**Experimental**): Standalone instrumentation for [mysql2](https://github.com/sidorares/node-mysql2#readme) and [mysql2/promise](https://github.com/sidorares/node-mysql2/blob/master/documentation/Promise-Wrapper.md) as well as the same instrumentation for [mysql](https://github.com/mysqljs/mysql#readme) within the Node.js agent.
 
 There are several modules included within the Node.js agent to add more instrumentation for 3rd party modules:
@@ -152,7 +153,7 @@ If the issue has been confirmed as a bug or is a feature request, please file a
 **Support Channels**
 
 * [New Relic Documentation](https://docs.newrelic.com/docs/agents/nodejs-agent/getting-started/introduction-new-relic-nodejs): Comprehensive guidance for using our platform
-* [New Relic Community](https://discuss.newrelic.com/c/support-products-agents/node-js-agent/): The best place to engage in troubleshooting questions
+* [New Relic Community](https://discuss.newrelic.com/tags/c/telemetry-data-platform/agents/nodeagent): The best place to engage in troubleshooting questions
 * [New Relic Developer](https://developer.newrelic.com/): Resources for building a custom observability applications
 * [New Relic University](https://learn.newrelic.com/): A range of online training for New Relic users of every level
 * [New Relic Technical Support](https://support.newrelic.com/) 24/7/365 ticketed support. Read more about our [Technical Support Offerings](https://docs.newrelic.com/docs/licenses/license-information/general-usage-licenses/support-plan).

package/THIRD_PARTY_NOTICES.md

@@ -86,7 +86,7 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 
 ### @grpc/grpc-js
 
-This product includes source derived from [@grpc/grpc-js](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js) ([v1.3.7](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/tree/v1.3.7)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/blob/v1.3.7/LICENSE):
+This product includes source derived from [@grpc/grpc-js](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js) ([v1.5.5](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/tree/v1.5.5)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/blob/v1.5.5/LICENSE):
 
 ```
                                  Apache License
@@ -295,7 +295,7 @@ This product includes source derived from [@grpc/grpc-js](https://github.com/grp
 
 ### @grpc/proto-loader
 
-This product includes source derived from [@grpc/proto-loader](https://github.com/grpc/grpc-node) ([v0.5.6](https://github.com/grpc/grpc-node/tree/v0.5.6)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/blob/v0.5.6/LICENSE):
+This product includes source derived from [@grpc/proto-loader](https://github.com/grpc/grpc-node) ([v0.6.9](https://github.com/grpc/grpc-node/tree/v0.6.9)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/blob/v0.6.9/LICENSE):
 
 ```
                                  Apache License
@@ -504,7 +504,7 @@ This product includes source derived from [@grpc/proto-loader](https://github.co
 
 ### @newrelic/aws-sdk
 
-This product includes source derived from [@newrelic/aws-sdk](https://github.com/newrelic/node-newrelic-aws-sdk) ([v4.0.1](https://github.com/newrelic/node-newrelic-aws-sdk/tree/v4.0.1)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-newrelic-aws-sdk/blob/v4.0.1/LICENSE):
+This product includes source derived from [@newrelic/aws-sdk](https://github.com/newrelic/node-newrelic-aws-sdk) ([v4.1.1](https://github.com/newrelic/node-newrelic-aws-sdk/tree/v4.1.1)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-newrelic-aws-sdk/blob/v4.1.1/LICENSE):
 
 ```
                                  Apache License
@@ -712,7 +712,7 @@ This product includes source derived from [@newrelic/aws-sdk](https://github.com
 
 ### @newrelic/koa
 
-This product includes source derived from [@newrelic/koa](https://github.com/newrelic/node-newrelic-koa) ([v6.0.1](https://github.com/newrelic/node-newrelic-koa/tree/v6.0.1)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-newrelic-koa/blob/v6.0.1/LICENSE):
+This product includes source derived from [@newrelic/koa](https://github.com/newrelic/node-newrelic-koa) ([v6.1.0](https://github.com/newrelic/node-newrelic-koa/tree/v6.1.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-newrelic-koa/blob/v6.1.0/LICENSE):
 
 ```
 Apache License
@@ -921,7 +921,7 @@ Apache License
 
 ### @newrelic/superagent
 
-This product includes source derived from [@newrelic/superagent](https://github.com/newrelic/node-newrelic-superagent) ([v5.0.1](https://github.com/newrelic/node-newrelic-superagent/tree/v5.0.1)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-newrelic-superagent/blob/v5.0.1/LICENSE):
+This product includes source derived from [@newrelic/superagent](https://github.com/newrelic/node-newrelic-superagent) ([v5.1.0](https://github.com/newrelic/node-newrelic-superagent/tree/v5.1.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-newrelic-superagent/blob/v5.1.0/LICENSE):
 
 ```
                                  Apache License
@@ -1159,7 +1159,7 @@ THE SOFTWARE.
 
 ### async
 
-This product includes source derived from [async](https://github.com/caolan/async) ([v3.2.1](https://github.com/caolan/async/tree/v3.2.1)), distributed under the [MIT License](https://github.com/caolan/async/blob/v3.2.1/LICENSE):
+This product includes source derived from [async](https://github.com/caolan/async) ([v3.2.3](https://github.com/caolan/async/tree/v3.2.3)), distributed under the [MIT License](https://github.com/caolan/async/blob/v3.2.3/LICENSE):
 
 ```
 Copyright (c) 2010-2018 Caolan McMahon
@@ -1770,7 +1770,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ### @newrelic/test-utilities
 
-This product includes source derived from [@newrelic/test-utilities](https://github.com/newrelic/node-test-utilities) ([v6.1.1](https://github.com/newrelic/node-test-utilities/tree/v6.1.1)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-test-utilities/blob/v6.1.1/LICENSE):
+This product includes source derived from [@newrelic/test-utilities](https://github.com/newrelic/node-test-utilities) ([v6.3.0](https://github.com/newrelic/node-test-utilities/tree/v6.3.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-test-utilities/blob/v6.3.0/LICENSE):
 
 ```
                                  Apache License
@@ -2531,7 +2531,7 @@ SOFTWARE.
 
 ### jsdoc
 
-This product includes source derived from [jsdoc](https://github.com/jsdoc/jsdoc) ([v3.6.7](https://github.com/jsdoc/jsdoc/tree/v3.6.7)), distributed under the [Apache-2.0 License](https://github.com/jsdoc/jsdoc/blob/v3.6.7/LICENSE.md):
+This product includes source derived from [jsdoc](https://github.com/jsdoc/jsdoc) ([v3.6.10](https://github.com/jsdoc/jsdoc/tree/v3.6.10)), distributed under the [Apache-2.0 License](https://github.com/jsdoc/jsdoc/blob/v3.6.10/LICENSE.md):
 
 ```
 # License
@@ -3292,7 +3292,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ### tap
 
-This product includes source derived from [tap](https://github.com/tapjs/node-tap) ([v15.0.10](https://github.com/tapjs/node-tap/tree/v15.0.10)), distributed under the [ISC License](https://github.com/tapjs/node-tap/blob/v15.0.10/LICENSE):
+This product includes source derived from [tap](https://github.com/tapjs/node-tap) ([v15.1.6](https://github.com/tapjs/node-tap/tree/v15.1.6)), distributed under the [ISC License](https://github.com/tapjs/node-tap/blob/v15.1.6/LICENSE):
 
 ```
 The ISC License
@@ -3377,7 +3377,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ### @newrelic/native-metrics
 
-This product includes source derived from [@newrelic/native-metrics](https://github.com/newrelic/node-native-metrics) ([v7.0.1](https://github.com/newrelic/node-native-metrics/tree/v7.0.1)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-native-metrics/blob/v7.0.1/LICENSE):
+This product includes source derived from [@newrelic/native-metrics](https://github.com/newrelic/node-native-metrics) ([v7.1.1](https://github.com/newrelic/node-native-metrics/tree/v7.1.1)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-native-metrics/blob/v7.1.1/LICENSE):
 
 ```
                                  Apache License

package/api.js

@@ -14,7 +14,6 @@ const hashes = require('./lib/util/hashes')
 const properties = require('./lib/util/properties')
 const stringify = require('json-stringify-safe')
 const shimmer = require('./lib/shimmer')
-const shims = require('./lib/shim')
 const isValidType = require('./lib/util/attribute-types')
 const TransactionShim = require('./lib/shim/transaction-shim')
 const TransactionHandle = require('./lib/transaction/handle')
@@ -1332,34 +1331,16 @@ API.prototype.instrumentLoadedModule = function instrumentLoadedModule(moduleNam
     NAMES.SUPPORTABILITY.API + '/instrumentLoadedModule'
   )
   metric.incrementCallCount()
-  try {
-    const instrumentationName = shimmer.getInstrumentationNameFromModuleName(moduleName)
-    if (!shimmer.registeredInstrumentations[instrumentationName]) {
-      logger.warn("No instrumentation registered for '%s'.", instrumentationName)
-      return false
-    }
-
-    const instrumentation = shimmer.registeredInstrumentations[instrumentationName]
-    if (!instrumentation.onRequire) {
-      logger.warn("No onRequire function registered for '%s'.", instrumentationName)
-      return false
-    }
 
+  try {
     const resolvedName = require.resolve(moduleName)
 
-    const shim = shims.createShimFromType(
-      instrumentation.type,
-      this.agent,
-      moduleName,
-      resolvedName
-    )
-
-    instrumentation.onRequire(shim, module, moduleName)
-
-    return true
+    return shimmer.instrumentPostLoad(this.agent, module, moduleName, resolvedName)
   } catch (error) {
     logger.error('instrumentLoadedModule encountered an error, module not instrumented: %s', error)
   }
+
+  return false
 }
 
 /**

package/index.js

@@ -45,10 +45,9 @@ function initialize() {
     logger.debug('Process was running %s seconds before agent was loaded.', preAgentTime)
 
     if (!psemver.satisfies(pkgJSON.engines.node)) {
-      // TODO: Update this message when Node v12 is deprecated.
       message =
-        'New Relic for Node.js requires a version of Node equal to or\n' +
-        'greater than 12.0.0. Not starting!'
+        `New Relic for Node.js requires a version of Node ${pkgJSON.engines.node}. \n` +
+        `Please upgrade from your current Node version: ${process.version}. Not starting!`
 
       logger.error(message)
       throw new Error(message)

package/lib/config/index.js

@@ -229,6 +229,7 @@ Config.prototype.mergeServerConfig = mergeServerConfig
  * recognized, unsupported, and unknown parameters.
  *
  * @param {object} json The config blob sent by New Relic.
+ * @param recursion
  */
 Config.prototype.onConnect = function onConnect(json, recursion) {
   json = json || Object.create(null)
@@ -865,7 +866,7 @@ Config.prototype.checkAsyncHookStatus = function checkAsyncHookStatus() {
  * I wanted to cache the DisplayHost, but if I attached the variable to the config object,
  * it sends the extra variable to New Relic, which is not desired.
  *
- * @return {string} display host name
+ * @returns {string} display host name
  */
 Config.prototype.getDisplayHost = getDisplayHost
 
@@ -903,7 +904,7 @@ function getDisplayHost() {
  * I wanted to cache the Hostname, but if I attached the variable to the config object,
  * it sends the extra variable to New Relic, which is not desired.
  *
- * @return {string} host name
+ * @returns {string} host name
  */
 Config.prototype.getHostnameSafe = getHostnameSafe
 
@@ -980,6 +981,7 @@ Config.prototype.applications = function applications() {
  *
  * @param {object} external The configuration being loaded.
  * @param {object} internal Whichever chunk of the config being overridden.
+ * @param arbitrary
  */
 Config.prototype._fromPassed = function _fromPassed(external, internal, arbitrary) {
   if (!external) {
@@ -1065,6 +1067,8 @@ Config.prototype._featureFlagsFromEnv = function _featureFlagsFromEnv() {
  *                        need to set this yourself.
  * @param object data     The current level of the configuration object. Should
  *                        never need to set this yourself.
+ * @param metadata
+ * @param data
  */
 Config.prototype._fromEnvironment = function _fromEnvironment(metadata, data) {
   if (!metadata) {
@@ -1122,7 +1126,6 @@ Config.prototype._fromEnvironment = function _fromEnvironment(metadata, data) {
  * environment variable.
  *
  * @param {*} inputConfig configuration passed to the Config constructor
- *
  * @returns {boolean}
  */
 Config.prototype._loggingManuallySet = function _loggingManuallySet(inputConfig) {
@@ -1137,7 +1140,6 @@ Config.prototype._loggingManuallySet = function _loggingManuallySet(inputConfig)
  * file or enveironment variable
  *
  * @param {*} inputConfig configuration pass to the Config constructor
- *
  * @returns {boolean}
  */
 Config.prototype._nativeMetricsManuallySet = function _nativeMetricsManuallySet(inputConfig) {
@@ -1156,7 +1158,6 @@ Config.prototype._nativeMetricsManuallySet = function _nativeMetricsManuallySet(
  * environment variable.
  *
  * @param {*} inputConfig configuration passed to the Config constructor
- *
  * @returns {boolean}
  */
 Config.prototype._DTManuallySet = function _DTManuallySet(inputConfig) {
@@ -1173,6 +1174,7 @@ Config.prototype._DTManuallySet = function _DTManuallySet(inputConfig) {
  *   - disables cross_application_tracer.enabled if set
  *   - defaults logging to disabled
  *   - verifies data specific to running DT is defined either in config file of env vars
+ *
  * @param {*} inputConfig configuration passed to the Config constructor
  */
 Config.prototype._enforceServerless = function _enforceServerless(inputConfig) {
@@ -1282,7 +1284,7 @@ Config.prototype._canonicalize = function _canonicalize() {
   }
 
   const expectedCodes = this.error_collector && this.error_collector.expected_status_codes
-  if (statusCodes) {
+  if (expectedCodes) {
     this.error_collector.expected_status_codes = _parseCodes(expectedCodes)
   }
 
@@ -1410,7 +1412,6 @@ Config.prototype._applyHighSecurity = function _applyHighSecurity() {
  *
  * @param {Agent} agent
  * @param {object} policies
- *
  * @returns {CollectorResponse} The result of the processing, with the known
  *  policies as the response payload.
  */
@@ -1540,7 +1541,7 @@ function redactValue(value) {
  * Get a JSONifiable object containing all settings we want to report to the
  * collector and store in the environment_values table.
  *
- * @return Object containing simple key-value pairs of settings
+ * @returns Object containing simple key-value pairs of settings
  */
 Config.prototype.publicSettings = function publicSettings() {
   let settings = Object.create(null)
@@ -1683,6 +1684,8 @@ function initialize(config) {
 
 /**
  * This helper function creates an empty configuration object
+ *
+ * @param config
  */
 function createNewConfigObject(config) {
   config = new Config(Object.create(null))

package/lib/metrics/names.js

@@ -252,7 +252,11 @@ const INFINITE_TRACING = {
 }
 
 const FEATURES = {
-  CERTIFICATES: SUPPORTABILITY.FEATURES + '/Certificates'
+  CERTIFICATES: SUPPORTABILITY.FEATURES + '/Certificates',
+  INSTRUMENTATION: {
+    ON_RESOLVED: SUPPORTABILITY.FEATURES + '/Instrumentation/OnResolved',
+    ON_REQUIRE: SUPPORTABILITY.FEATURES + '/Instrumentation/OnRequire'
+  }
 }
 
 module.exports = {

package/lib/shim/shim.js

@@ -1307,7 +1307,7 @@ function applySegment(func, segment, full, context, args, inContextCB) {
     }
 
     if (typeof inContextCB === 'function') {
-      inContextCB()
+      inContextCB(segment)
     }
 
     try {

package/lib/shim/webframework-shim.js

@@ -29,10 +29,11 @@ const FRAMEWORK_NAMES = {
   CONNECT: 'Connect',
   DIRECTOR: 'Director',
   EXPRESS: 'Expressjs',
+  FASTIFY: 'Fastify',
   HAPI: 'Hapi',
   KOA: 'Koa',
-  RESTIFY: 'Restify',
-  FASTIFY: 'Fastify'
+  NEXT: 'Nextjs',
+  RESTIFY: 'Restify'
 }
 
 const MIDDLEWARE_TYPE_DETAILS = {
@@ -64,24 +65,19 @@ const TRANSACTION_INFO_KEY = '__NR_transactionInfo'
  * Constructs a shim associated with the given agent instance, specialized for
  * instrumenting web frameworks.
  *
- * @constructor
- * @extends TransactionShim
+ * @class
+ * @augments TransactionShim
  * @classdesc
  *  A helper class for wrapping web framework modules.
- *
  * @param {Agent} agent
  *  The agent this shim will use.
- *
  * @param {string} moduleName
  *  The name of the module being instrumented.
- *
  * @param {string} resolvedName
  *  The full path to the loaded module.
- *
  * @param {string} [frameworkId]
  *  The name of the web framework being instrumented. If available, use one of
  *  the values from {@link WebFrameworkShim.FRAMEWORK_NAMES}.
- *
  * @see TransactionShim
  * @see WebFrameworkShim.FRAMEWORK_NAMES
  */
@@ -130,123 +126,93 @@ WebFrameworkShim.prototype.captureUrlParams = captureUrlParams
 
 /**
  * @callback RouteParserFunction
- *
  * @summary
  *  Called whenever new middleware are mounted using the instrumented framework,
  *  this method should pull out a representation of the mounted path.
- *
  * @param {WebFrameworkShim} shim
  *  The shim in use for this instrumentation.
- *
- * @param {function} fn
+ * @param {Function} fn
  *  The function which received this route string/RegExp.
- *
  * @param {string} fnName
  *  The name of the function to which this route was given.
- *
  * @param {string|RegExp} route
  *  The route that was given to the function.
- *
- * @return {string|RegExp} The mount point from the given route.
+ * @returns {string|RegExp} The mount point from the given route.
  */
 
 /**
  * @callback RouteRequestFunction
- *
  * @summary
  *  Extracts the request object from the arguments to the middleware function.
- *
  * @param {WebFrameworkShim}  shim    - The shim used for instrumentation.
- * @param {function}          fn      - The middleware function.
+ * @param {Function}          fn      - The middleware function.
  * @param {string}            fnName  - The name of the middleware function.
  * @param {Array}             args    - The arguments to the middleware function.
- *
- * @return {Object} The request object.
+ * @returns {object} The request object.
  */
 
 /**
  * @callback RouteNextFunction
- *
  * @summary
  *  Used to wrap functions that users can call to continue to the next middleware.
- *
  * @param {WebFrameworkShim}    shim    - The shim used for instrumentation.
- * @param {function}            fn      - The middleware function.
+ * @param {Function}            fn      - The middleware function.
  * @param {string}              fnName  - The name of the middleware function.
  * @param {Array}               args    - The arguments to the middleware function.
  * @param {NextWrapperFunction} wrap    - A function to wrap an individual next function.
- *
- * @return {Object} The request object.
+ * @returns {object} The request object.
  */
 
 /**
  * @callback RouteParameterFunction
- *
  * @summary
  *  Extracts the route parameters from the arguments to the middleware function.
- *
  * @param {WebFrameworkShim}  shim    - The shim used for instrumentation.
- * @param {function}          fn      - The middleware function.
+ * @param {Function}          fn      - The middleware function.
  * @param {string}            fnName  - The name of the middleware function.
  * @param {Array}             args    - The arguments to the middleware function.
- *
- * @return {Object} A map of route parameter names to values.
+ * @returns {object} A map of route parameter names to values.
  */
 
 /**
  * @callback MiddlewareWrapperFunction
- *
  * @summary
  *  Called for each middleware passed to a mounting method. Should perform the
  *  wrapping of the middleware.
- *
  * @param {WebFrameworkShim} shim
  *  The shim used for instrumentation.
- *
- * @param {function} middleware
+ * @param {Function} middleware
  *  The middleware function to wrap.
- *
  * @param {string} fnName
  *  The name of the middleware function.
- *
  * @param {string} [route=null]
  *  The route the middleware is mounted on if one was found.
- *
  * @see WebFrameworkShim#recordMiddleware
  * @see WebFrameworkShim#recordParamware
  */
 
 /**
  * @interface MiddlewareSpec
- *
  * @description
  *  Describes the interface for middleware functions with this instrumentation.
- *
  * @property {number|RouteRequestFunction} [req=shim.FIRST]
  *  Indicates which argument to the middleware is the request object. It can also be
  *  a function to extract the request object from the middleware arguments.
- *
  * @property {number} [res=shim.SECOND]
  *  Indicates which argument to the middleware is the response object.
- *
  * @property {number|RouteNextFunction} [next=shim.THIRD]
  *  Indicates which argument to the middleware function is the callback.  When it is
  *  a function, it will be called with the arguments of the middleware and a function
  *  for wrapping calls that represent continuation from the current middleware.
- *
  * @property {string} [name]
  *  The name to use for this middleware. Defaults to `middleware.name`.
- *
  * @property {RouteParameterFunction} [params]
  *  A function to extract the route parameters from the middleware arguments.
  *  Defaults to using `req.params`.
- *
  * @property {string} [type='MIDDLEWARE']
- *
- * @property {string|function} [route=null]
+ * @property {string | Function} [route=null]
  *  Route/path used for naming segments and transaction name candidates. If a function,
  *  will be invoked just before segment creation with middleware invocation.
- *
  * @property {boolean} [appendPath=true]
  *  Indicates that the path associated with the middleware should be appended
  *  and popped from the stack of name candidates.
@@ -254,31 +220,25 @@ WebFrameworkShim.prototype.captureUrlParams = captureUrlParams
 
 /**
  * @interface MiddlewareMounterSpec
- *
  * @description
  *  Describes the arguments provided to mounting methods (e.g. `app.post()`).
- *
  * @property {number|string} [route=null]
  *  Tells which argument may be the mounting path for the other arguments. If
  *  the indicated argument is a function it is assumed the route was not provided
  *  and the indicated argument is a middleware function. If a string is provided
  *  it will be used as the mounting path.
- *
  * @property {MiddlewareWrapperFunction} [wrapper]
  *  A function to call for each middleware function passed to the mounter.
  */
 
 /**
  * @interface RenderSpec
- * @extends RecorderSpec
- *
+ * @augments RecorderSpec
  * @description
  *  Describes the interface for render methods.
- *
  * @property {number} [view=shim.FIRST]
  *  Identifies which argument is the name of the view being rendered. Defaults
  *  to {@link Shim#ARG_INDEXES shim.FIRST}.
- *
  * @see SegmentSpec
  * @see RecorderSpec
  */
@@ -292,7 +252,6 @@ WebFrameworkShim.prototype.captureUrlParams = captureUrlParams
  * - `setRouteParser(parser)`
  *
  * @memberof WebFrameworkShim.prototype
- *
  * @param {RouteParserFunction} parser - The parser function to use.
  */
 function setRouteParser(parser) {
@@ -310,10 +269,8 @@ function setRouteParser(parser) {
  * This should be the first thing the instrumentation does.
  *
  * @memberof WebFrameworkShim.prototype
- *
  * @param {WebFrameworkShim.FRAMEWORK_NAMES|string} framework
  *  The name of the framework.
- *
  * @see WebFrameworkShim.FRAMEWORK_NAMES
  */
 function setFramework(framework) {
@@ -332,7 +289,6 @@ function setFramework(framework) {
  * Sets the URI path to be used for naming the transaction currently in scope.
  *
  * @memberof WebFrameworkShim.prototype
- *
  * @param {string} uri - The URI path to use for the transaction.
  */
 function setTransactionUri(uri) {
@@ -351,18 +307,14 @@ function setTransactionUri(uri) {
  * - `recordRender(func [, spec])`
  *
  * @memberof WebFrameworkShim.prototype
- *
- * @param {Object|Function} nodule
+ * @param {object | Function} nodule
  *  The source for the properties to wrap, or a single function to wrap.
- *
  * @param {string|Array.<string>} [properties]
  *  One or more properties to wrap. If omitted, the `nodule` parameter is
  *  assumed to be the function to wrap.
- *
  * @param {RenderSpec} [spec]
  *  The spec for wrapping the render method.
- *
- * @return {Object|Function} The first parameter to this function, after
+ * @returns {object | Function} The first parameter to this function, after
  *  wrapping it or its properties.
  */
 function recordRender(nodule, properties, spec) {
@@ -407,20 +359,15 @@ function recordRender(nodule, properties, spec) {
  * - `wrapMiddlewareMounter(func [, spec])`
  *
  * @memberof WebFrameworkShim.prototype
- *
- * @param {Object|Function} nodule
+ * @param {object | Function} nodule
  *  The source for the properties to wrap, or a single function to wrap.
- *
  * @param {string|Array.<string>} [properties]
  *  One or more properties to wrap. If omitted, the `nodule` parameter is
  *  assumed to be the function to wrap.
- *
  * @param {MiddlewareMounterSpec} [spec]
  *  Spec describing the parameters for this middleware mount point.
- *
- * @return {Object|Function} The first parameter to this function, after
+ * @returns {object | Function} The first parameter to this function, after
  *  wrapping it or its properties.
- *
  * @see WebFrameworkShim#recordMiddleware
  */
 function wrapMiddlewareMounter(nodule, properties, spec) {
@@ -470,6 +417,10 @@ function wrapMiddlewareMounter(nodule, properties, spec) {
         }
 
         _wrapMiddlewares.call(this, routeIdx, args)
+        /**
+         * @param _routeIdx
+         * @param middlewares
+         */
         function _wrapMiddlewares(_routeIdx, middlewares) {
           for (let i = 0; i < middlewares.length; ++i) {
             // If this argument is the route argument skip it.
@@ -512,20 +463,15 @@ function wrapMiddlewareMounter(nodule, properties, spec) {
  * - `recordMiddleware(func [, spec])`
  *
  * @memberof WebFrameworkShim.prototype
- *
- * @param {Object|Function} nodule
+ * @param {object | Function} nodule
  *  The source for the properties to wrap, or a single function to wrap.
- *
  * @param {string|Array.<string>} [properties]
  *  One or more properties to wrap. If omitted, the `nodule` parameter is
  *  assumed to be the function to wrap.
- *
  * @param {MiddlewareSpec} [spec]
  *  The spec for wrapping the middleware.
- *
- * @return {Object|Function} The first parameter to this function, after
+ * @returns {object | Function} The first parameter to this function, after
  *  wrapping it or its properties.
- *
  * @see WebFrameworkShim#wrapMiddlewareMounter
  */
 function recordMiddleware(nodule, properties, spec) {
@@ -560,18 +506,14 @@ function recordMiddleware(nodule, properties, spec) {
  * processing as possible.
  *
  * @memberof WebFrameworkShim.prototype
- *
- * @param {Object|Function} nodule
+ * @param {object | Function} nodule
  *  The source for the properties to wrap, or a single function to wrap.
- *
  * @param {string|Array.<string>} [properties]
  *  One or more properties to wrap. If omitted, the `nodule` parameter is
  *  assumed to be the function to wrap.
- *
  * @param {MiddlewareSpec} [spec]
  *  The spec for wrapping the middleware.
- *
- * @return {Object|Function} The first parameter to this function, after
+ * @returns {object | Function} The first parameter to this function, after
  *  wrapping it or its properties.
  */
 function recordParamware(nodule, properties, spec) {
@@ -610,10 +552,8 @@ function recordParamware(nodule, properties, spec) {
  * caught by the user.
  *
  * @memberof WebFrameworkShim.prototype
- *
  * @param {Request} req - The request which caused the error.
  * @param {*?}      err - The error which has occurred.
- *
  * @see WebFrameworkShim#errorHandled
  * @see WebFrameworkShim#setErrorPredicate
  */
@@ -628,10 +568,8 @@ function noticeError(req, err) {
  * Indicates that the given error has been handled for this request.
  *
  * @memberof WebFrameworkShim.prototype
- *
  * @param {Request} req - The request which caused the error.
  * @param {*}       err - The error which has been handled.
- *
  * @see WebFrameworkShim#noticeError
  * @see WebFrameworkShim#setErrorPredicate
  */
@@ -647,11 +585,9 @@ function errorHandled(req, err) {
  * an error.
  *
  * @memberof WebFrameworkShim.prototype
- *
  * @param {function(object): bool} pred
  *  Function which should return true if the object passed to it is considered
  *  an error.
- *
  * @see WebFrameworkShim#noticeError
  * @see WebFrameworkShim#errorHandled
  */
@@ -663,7 +599,6 @@ function setErrorPredicate(pred) {
  * Marks the current path as a potential responder.
  *
  * @memberof WebFrameworkShim.prototype
- *
  * @param {Request} req - The request which caused the error.
  */
 function savePossibleTransactionName(req) {
@@ -678,7 +613,6 @@ function savePossibleTransactionName(req) {
  * responded.
  *
  * @memberof WebFrameworkShim.prototype
- *
  * @param {function(args, object): bool} pred
  *  Function which should return true if the object passed to it is considered
  *  a response.
@@ -691,8 +625,7 @@ function setResponsePredicate(pred) {
  * Capture URL parameters from a request object as attributes of the current segment.
  *
  * @memberof WebFrameworkShim.prototype
- *
- * @param {Object} params
+ * @param {object} params
  *  An object with key-value pairs.
  */
 function captureUrlParams(params) {
@@ -708,19 +641,14 @@ function captureUrlParams(params) {
  * Default route parser function if one is not provided.
  *
  * @private
- *
  * @param {WebFrameworkShim} shim
  *  The shim in use for this instrumentation.
- *
- * @param {function} fn
+ * @param {Function} fn
  *  The function which received this route string/RegExp.
- *
  * @param {string} fnName
  *  The name of the function to which this route was given.
- *
  * @param {string|RegExp} route
  *  The route that was given to the function.
- *
  * @see RouteParserFunction
  */
 function _defaultRouteParser(shim, fn, fnName, route) {
@@ -737,8 +665,7 @@ function _defaultRouteParser(shim, fn, fnName, route) {
  * Default error predicate just returns true.
  *
  * @private
- *
- * @return {bool} True. Always.
+ * @returns {bool} True. Always.
  */
 function _defaultErrorPredicate() {
   return true
@@ -748,8 +675,7 @@ function _defaultErrorPredicate() {
  * Default response predicate just returns false.
  *
  * @private
- *
- * @return {bool} False. Always.
+ * @returns {bool} False. Always.
  */
 function _defaultResponsePredicate() {
   return false
@@ -759,19 +685,18 @@ function _defaultResponsePredicate() {
  * Wraps the given function in a middleware recorder function.
  *
  * @private
- *
  * @param {WebFrameworkShim} shim
  *  The shim used for this instrumentation.
- *
- * @param {function} middleware
+ * @param {Function} middleware
  *  The middleware function to record.
- *
  * @param {MiddlewareSpec} spec
  *  The spec describing the middleware.
- *
- * @return {function} The middleware function wrapped in a recorder.
+ * @returns {Function} The middleware function wrapped in a recorder.
  */
 function _recordMiddleware(shim, middleware, spec) {
+  /**
+   *
+   */
   function getRoute() {
     let route = spec.route || '/'
 
@@ -797,6 +722,9 @@ function _recordMiddleware(shim, middleware, spec) {
     metricName = shim._metrics.MIDDLEWARE + metricName + name
   }
 
+  /**
+   * @param route
+   */
   function getSegmentName(route) {
     let segmentName = metricName
     if (typeDetails.path) {
@@ -817,6 +745,12 @@ function _recordMiddleware(shim, middleware, spec) {
   )
 
   // TODO: let's please break these out
+  /**
+   * @param shim
+   * @param fn
+   * @param fnName
+   * @param args
+   */
   function middlewareWithCallbackRecorder(shim, fn, fnName, args) {
     const route = getRoute()
 
@@ -909,6 +843,12 @@ function _recordMiddleware(shim, middleware, spec) {
     }
   }
 
+  /**
+   * @param shim
+   * @param fn
+   * @param fnName
+   * @param args
+   */
   function middlewareWithPromiseRecorder(shim, fn, fnName, args) {
     const route = getRoute()
 
@@ -1007,6 +947,10 @@ function _recordMiddleware(shim, middleware, spec) {
   }
 }
 
+/**
+ * @param shim
+ * @param req
+ */
 function _makeGetReq(shim, req) {
   return function getReqFromArgs(shim, fn, name, args) {
     const reqIdx = shim.normalizeIndex(args.length, req)
@@ -1018,6 +962,10 @@ function _makeGetReq(shim, req) {
   }
 }
 
+/**
+ * @param nextDetails
+ * @param txInfo
+ */
 function _makeNextBinder(nextDetails, txInfo) {
   return function bindNext(shim, fn, _name, segment, args) {
     if (!segment) {
@@ -1029,6 +977,11 @@ function _makeNextBinder(nextDetails, txInfo) {
 
     // Called from outside to wrap functions that could be called to continue
     // to the next middleware
+    /**
+     * @param nodule
+     * @param property
+     * @param isFinal
+     */
     function nextWrapper(nodule, property, isFinal) {
       shim.wrap(nodule, property, function wrapper(shim, original) {
         const parentSegment = segment || shim.getSegment()
@@ -1077,11 +1030,9 @@ function _makeNextBinder(nextDetails, txInfo) {
  * available.
  *
  * @private
- *
  * @param {WebFrameworkShim}      shim  - The shim used for this instrumentation.
  * @param {http.IncomingMessage}  req   - The incoming request object.
- *
- * @return {object?} The transaction information if available, otherwise null.
+ * @returns {object?} The transaction information if available, otherwise null.
  */
 function _getTransactionInfo(shim, req) {
   try {
@@ -1096,8 +1047,8 @@ function _getTransactionInfo(shim, req) {
  * Creates a recorder for middleware metrics.
  *
  * @private
- *
- *
+ * @param shim
+ * @param metricName
  * @param {string}  path    - The mounting path of the middleware.
  * @param {Segment} segment - The segment generated for this middleware.
  * @param {string}  scope   - The scope of the metric to record.
@@ -1119,13 +1070,10 @@ function _makeMiddlewareRecorder(shim, metricName) {
  * Adds the given error to the transaction information if it is actually an error.
  *
  * @private
- *
  * @param {WebFrameworkShim} shim
  *  The shim used for this web framework.
- *
  * @param {TransactionInfo} txInfo
  *  The transaction context information for the request.
- *
  * @param {*} err
  *  The error to notice.
  */
@@ -1138,14 +1086,11 @@ function _noticeError(shim, txInfo, err) {
  * Determines if the given object is an error according to the shim.
  *
  * @private
- *
  * @param {WebFrameworkShim} shim
  *  The shim used for this web framework.
- *
  * @param {?*} err
  *  The object to check for error-ness.
- *
- * @return {bool} True if the given object is an error according to the shim.
+ * @returns {bool} True if the given object is an error according to the shim.
  */
 function _isError(shim, err) {
   return err && shim._errorPredicate(err)
@@ -1155,11 +1100,9 @@ function _isError(shim, err) {
  * Copy the keys expected from source to destination.
  *
  * @private
- *
- * @param {Object} destination
+ * @param {object} destination
  *   The spec object receiving the expected values
- *
- * @param {Object} source
+ * @param {object} source
  *   The spec object the values are coming from
  */
 function _copyExpectedSpecParameters(destination, source) {

package/lib/shimmer.js

@@ -6,12 +6,15 @@
 'use strict'
 
 const path = require('path')
+const semver = require('semver')
 const fs = require('./util/unwrapped-core').fs
 const logger = require('./logger').child({ component: 'shimmer' })
 const INSTRUMENTATIONS = require('./instrumentations')()
 const properties = require('./util/properties')
 const shims = require('./shim')
 
+const NAMES = require('./metrics/names')
+
 const MODULE_TYPE = shims.constants.MODULE_TYPE
 
 const CORE_INSTRUMENTATION = {
@@ -286,9 +289,13 @@ const shimmer = (module.exports = {
         // This is triggered by the load call, so record the path that has been seen so
         // we can examine it after the load call has returned.
         const resolvedFilepath = resolve.apply(this, arguments)
-        filepathMap[file] = resolvedFilepath
 
-        _onResolveFileName(agent, file, resolvedFilepath)
+        // Only fire the first time we see a specific module resolved
+        if (filepathMap[file] !== resolvedFilepath) {
+          filepathMap[file] = resolvedFilepath
+
+          _onResolveFileName(agent, file, resolvedFilepath)
+        }
 
         return resolvedFilepath
       }
@@ -458,6 +465,14 @@ const shimmer = (module.exports = {
       instrumentation = moduleName
     }
     return instrumentation
+  },
+
+  instrumentPostLoad(agent, module, moduleName, resolvedName) {
+    const result = _postLoad(agent, module, moduleName, resolvedName)
+    // This is to not break the public API
+    // previously it would just call instrumentation
+    // and not check the result
+    return !!result.__NR_instrumented
   }
 })
 
@@ -502,6 +517,7 @@ function instrumentPostLoad(agent, nodule, moduleName, resolvedName) {
   const shim = shims.createShimFromType(instrumentation.type, agent, moduleName, resolvedName)
 
   applyDebugState(shim, nodule)
+  trackInstrumentationUsage(agent, shim, moduleName, NAMES.FEATURES.INSTRUMENTATION.ON_REQUIRE)
 
   try {
     if (instrumentation.onRequire(shim, nodule, moduleName) !== false) {
@@ -597,6 +613,8 @@ function _instrumentOnResolved(agent, moduleName, resolvedFilepath) {
 
   const shim = shims.createShimFromType(instrumentation.type, agent, moduleName, resolvedFilepath)
 
+  trackInstrumentationUsage(agent, shim, moduleName, NAMES.FEATURES.INSTRUMENTATION.ON_RESOLVED)
+
   try {
     instrumentation.onResolved(shim, moduleName, resolvedFilepath)
   } catch (instrumentationError) {
@@ -644,3 +662,45 @@ function hasValidRegisterOptions(opts) {
 
   return true
 }
+
+/**
+ * Adds metrics to indicate instrumentation was used for a particular module and
+ * what major version the module was at, if possible.
+ *
+ * @param {*} agent The agent instance.
+ * @param {*} shim The instance of the shim used to instrument the module.
+ * @param {string} moduleName The name of the required module.
+ * @param {string} metricPrefix Support metric prefix to prepend to the metrics. Will indicate onRequire or onResolved
+ * from NAMES.FEATURES.INSTRUMENTATION.
+ */
+function trackInstrumentationUsage(agent, shim, moduleName, metricPrefix) {
+  try {
+    const version = tryGetVersion(shim)
+    const instrumentationMetricName = `${metricPrefix}/${moduleName}`
+
+    agent.metrics.getOrCreateMetric(instrumentationMetricName).incrementCallCount()
+
+    if (version) {
+      const majorVersion = semver.major(version)
+      const versionMetricName = `${instrumentationMetricName}/Version/${majorVersion}`
+
+      agent.metrics.getOrCreateMetric(versionMetricName).incrementCallCount()
+    }
+  } catch (error) {
+    logger.debug('Unable to track instrumentation usage for: ', moduleName, error)
+  }
+}
+
+function tryGetVersion(shim) {
+  // Global module (i.e. domain) or finding root failed
+  if (shim._moduleRoot === '.') {
+    return
+  }
+
+  const packageInfo = shim.require('./package.json')
+  if (!packageInfo) {
+    return
+  }
+
+  return packageInfo.version
+}

package/lib/transaction/tracer/index.js

@@ -45,16 +45,6 @@ Tracer.prototype.wrapFunctionFirst = wrapFunctionFirst
 Tracer.prototype.wrapSyncFunction = wrapSyncFunction
 Tracer.prototype.wrapCallback = wrapCallback
 
-Object.defineProperty(Tracer.prototype, 'segment', {
-  get: function segmentGetter() {
-    return this._contextManager.getContext()
-  },
-  set: function segmentSetter(segment) {
-    this._contextManager.setContext(segment)
-    return segment
-  }
-})
-
 function getTransaction() {
   const currentSegment = this._contextManager.getContext()
   if (currentSegment && currentSegment.transaction && currentSegment.transaction.isActive()) {
@@ -69,6 +59,7 @@ function getSegment() {
   return this._contextManager.getContext()
 }
 
+// TODO: Remove/replace external uses to tracer.getSpanContext()
 function getSpanContext() {
   const currentSegment = this.getSegment()
   return currentSegment && currentSegment.getSpanContext()

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: '/2016-09-02/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.6.0",
+  "version": "8.8.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",
@@ -148,23 +148,24 @@
     "update-cross-agent-tests": "./bin/update-cats.sh",
     "versioned-tests": "./bin/run-versioned-tests.sh",
     "update-changelog-version": "node ./bin/update-changelog-version",
+    "checkout-external-versioned": "node ./test/versioned-external/checkout-external-tests.js",
     "versioned": "npm run versioned:npm7",
-    "versioned:major": "npm run prepare-test && VERSIONED_MODE=--major NPM7=1 time ./bin/run-versioned-tests.sh",
-    "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",
+    "versioned:major": "npm run checkout-external-versioned && npm run prepare-test && VERSIONED_MODE=--major NPM7=1 time ./bin/run-versioned-tests.sh",
+    "versioned:npm6": "npm run checkout-external-versioned && npm run prepare-test && time ./bin/run-versioned-tests.sh",
+    "versioned:npm7": "npm run checkout-external-versioned && npm run prepare-test && NPM7=1 time ./bin/run-versioned-tests.sh",
     "prepare": "husky install"
   },
   "bin": {
     "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.0",
+    "@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",
@@ -172,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",