newrelic 13.5.0 → 13.6.1

package/NEWS.md

@@ -1,3 +1,50 @@
+### v13.6.1 (2025-10-28)
+
+#### Bug fixes
+
+* Updated middleware wrapper to not wrap handler if it is not a function ([#3469](https://github.com/newrelic/node-newrelic/pull/3469)) ([c702689](https://github.com/newrelic/node-newrelic/commit/c702689a6e73756f6b3ad39706a33874fbd6da73))
+
+#### Documentation
+
+* Updated compatibility report ([#3466](https://github.com/newrelic/node-newrelic/pull/3466)) ([5853657](https://github.com/newrelic/node-newrelic/commit/5853657a63dc75481fc6598c10afd208391f525b))
+
+### v13.6.0 (2025-10-27)
+
+#### Features
+
+* Added instrumentation for http2 client methods ([#3284](https://github.com/newrelic/node-newrelic/pull/3284)) ([bda7aea](https://github.com/newrelic/node-newrelic/commit/bda7aeaac16ce9f54bd28de72aa7465be96cd157))
+
+#### Bug fixes
+
+* Updated `ioredis` instrumentation to handle breakage of errors when using `.pipeline`. ([#3457](https://github.com/newrelic/node-newrelic/pull/3457)) ([49f4d93](https://github.com/newrelic/node-newrelic/commit/49f4d93a59045f35406dfdbd3248dca0652727d6))
+* Updated `openai` `instrumentStream` function to handle empty chunk when `include_usage` is set ([#3427](https://github.com/newrelic/node-newrelic/pull/3427)) ([f804940](https://github.com/newrelic/node-newrelic/commit/f8049405003f0811450f75468e0bddfb1f05ec2b))
+
+#### Code refactoring
+
+* Update `express` instrumentation to subscribe to events emitted ([#3424](https://github.com/newrelic/node-newrelic/pull/3424)) ([bbf3d01](https://github.com/newrelic/node-newrelic/commit/bbf3d010bc402953e53cae5200af6bfb55a6446d))
+* Updated instances in instrumentation of `Array.forEach` for a more performant for...of or for index loop ([#3463](https://github.com/newrelic/node-newrelic/pull/3463)) ([99484ce](https://github.com/newrelic/node-newrelic/commit/99484ce0e7a963fbbc3cbc22f4956ce19e5eecc2))
+* Updated instances of `Array.forEach` for a more performant for...of or for index loop ([#3440](https://github.com/newrelic/node-newrelic/pull/3440)) ([48c37bf](https://github.com/newrelic/node-newrelic/commit/48c37bf7f85291553666d4512ca995b6a5b136a2))
+* Updated token calculation for `aws-bedrock` LLM Events ([#3445](https://github.com/newrelic/node-newrelic/pull/3445)) ([9450181](https://github.com/newrelic/node-newrelic/commit/945018171da713487a0b5b674e68bdbb211e655e))
+* Updated token calculation for `google-genai` LLM Events ([#3431](https://github.com/newrelic/node-newrelic/pull/3431)) ([41d32be](https://github.com/newrelic/node-newrelic/commit/41d32befe1d9c3201b62253a5de76c918d98a025))
+* Updated token calculation for `openai` LLM Events ([#3430](https://github.com/newrelic/node-newrelic/pull/3430)) ([b8678cc](https://github.com/newrelic/node-newrelic/commit/b8678cc92bb986eae7efec4b516f66406307e841))
+
+#### Documentation
+
+* Updated compatibility report ([#3459](https://github.com/newrelic/node-newrelic/pull/3459)) ([f253b97](https://github.com/newrelic/node-newrelic/commit/f253b97c039caa9e9110055d93e0c32e2d6911a8))
+
+#### Miscellaneous chores
+
+* Update release workflows ([#3444](https://github.com/newrelic/node-newrelic/pull/3444)) ([d1ec158](https://github.com/newrelic/node-newrelic/commit/d1ec158f46d034160b665f8b0785c020ba39b820))
+
+#### Tests
+
+* Added a `randomString` helper to agent_helper and use it in ioredis to avoid flappy tests, also updated local instances of random strings in kafka, elasticsearch and opensearch tests ([#3462](https://github.com/newrelic/node-newrelic/pull/3462)) ([4deb6d8](https://github.com/newrelic/node-newrelic/commit/4deb6d80d9daa7fd9d4c077a5cc52f358ed44e61))
+* Fixed conflict between ioredis and ioredis-esm by running `flushdb` instead of `flushall` to avoid index getting removed mid test ([#3464](https://github.com/newrelic/node-newrelic/pull/3464)) ([5e3f0a8](https://github.com/newrelic/node-newrelic/commit/5e3f0a81bfcf8bc8cf04559f29d3a76c1262bcc7))
+* Fixed express async error test to purposely misspell a method to emit a crash ([#3435](https://github.com/newrelic/node-newrelic/pull/3435)) ([ff9f064](https://github.com/newrelic/node-newrelic/commit/ff9f0646c4fc23e367c1e190eb8091423c690103))
+* Moved aws-sdk-v3 common.js requirement of semver ([#3461](https://github.com/newrelic/node-newrelic/pull/3461)) ([6a380ef](https://github.com/newrelic/node-newrelic/commit/6a380ef580268be131417587a2dda5adf3545e68))
+* Pinned Next.js tests to <16.0.0 ([#3446](https://github.com/newrelic/node-newrelic/pull/3446)) ([10787a1](https://github.com/newrelic/node-newrelic/commit/10787a1f4e325b7321173ee5b2fab0809af5e8d1))
+* Updated minimum tested version of `@langchain/core` to 1.0.0 ([#3437](https://github.com/newrelic/node-newrelic/pull/3437)) ([b61f67a](https://github.com/newrelic/node-newrelic/commit/b61f67a4c6d59f0b2a49e0de93a6d38e56d214fd))
+
 ### v13.5.0 (2025-10-14)
 
 #### Code refactoring
@@ -7960,3 +8007,7 @@ Special thanks to Ryan Copley (@RyanCopley) for the contribution.
 
 
 
+
+
+
+

package/api.js

@@ -1813,16 +1813,16 @@ API.prototype.setUserID = function setUserID(id) {
  */
 function _filterAttributes(attributes, name) {
   const filteredAttributes = Object.create(null)
-  Object.keys(attributes).forEach((attributeKey) => {
+  for (const attributeKey of Object.keys(attributes)) {
     if (!isValidType(attributes[attributeKey])) {
       logger.info(
         `Omitting attribute ${attributeKey} from ${name} call, type must ` +
           'be boolean, number, or string'
       )
-      return
+      continue
     }
     filteredAttributes[attributeKey] = attributes[attributeKey]
-  })
+  }
   return filteredAttributes
 }
 

package/lib/agent.js

@@ -444,7 +444,7 @@ Agent.prototype._scheduleHarvests = function _scheduleHarvests(shouldImmediately
 
   const agent = this
 
-  // For data collection that streams immediately, dont delay capture/sending until
+  // For data collection that streams immediately, don't delay capture/sending until
   // the harvest of everything else has completed.
   agent.startStreaming()
 
@@ -564,7 +564,7 @@ Agent.prototype._resetCustomEvents = function resetCustomEvents() {
  * @fires Agent#harvestFinished
  */
 Agent.prototype.harvestSync = function harvestSync() {
-  logger.trace('Peparing to harvest.')
+  logger.trace('Preparing to harvest.')
 
   if (!this.collector.isConnected()) {
     throw new Error('Sync harvest not connected/enabled!')

package/lib/aggregators/log-aggregator.js

@@ -81,9 +81,9 @@ class LogAggregator extends EventAggregator {
   }
 
   addBatch(logs, priority) {
-    logs.forEach((logLine) => {
+    for (const logLine of logs) {
       super.add(logLine, priority)
-    })
+    }
   }
 
   reconfigure(config) {

package/lib/collector/api.js

@@ -63,15 +63,15 @@ const AGENT_RUN_BEHAVIOR = CollectorResponse.AGENT_RUN_BEHAVIOR
 function dumpErrors(errors, name) {
   let index = 1
 
-  errors.forEach(function forEachError(error) {
+  for (const error of errors) {
     logger.trace(error, 'Error %s during %s:', index++, name)
 
     if (error.laterErrors) {
-      error.laterErrors.forEach(function forEachLaterError(laterError) {
+      for (const laterError of error.laterErrors) {
         logger.trace(laterError, 'Error %s during %s:', index++, name)
-      })
+      }
     }
-  })
+  }
 }
 
 /**
@@ -421,9 +421,9 @@ CollectorAPI.prototype._onConnect = function _onConnect(callback, error, res) {
 
   // Log "Reporting to..." message from connect response.
   if (config.messages) {
-    config.messages.forEach((element) => {
+    for (const element of config.messages) {
       logger.info(element.message)
-    })
+    }
   }
 
   // Store request headers for future collector requests if they're present

package/lib/collector/remote-method.js

@@ -260,7 +260,7 @@ RemoteMethod.prototype._safeRequest = function _safeRequest(options) {
     level = 'info'
   }
 
-  // check if trace is enabled or audit log(aka info in this case) before attemping
+  // check if trace is enabled or audit log(aka info in this case) before attempting
   // to get the body length or parse the path with redacted key
   if (logger.traceEnabled() || level === 'info') {
     const logBody = Buffer.isBuffer(options.body) ? 'Buffer ' + options.body.length : options.body

package/lib/config/attribute-filter.js

@@ -70,12 +70,12 @@ function AttributeFilter(config) {
   this._rules.global = Object.create(null)
 
   // And all the destination rules.
-  DESTINATION_DETAILS.forEach(function forEachDestination(dest) {
+  for (const dest of DESTINATION_DETAILS) {
     config.on(dest.name + '.attributes.enabled', updater)
     config.on(dest.name + '.attributes.include', updater)
     config.on(dest.name + '.attributes.exclude', updater)
     this._rules[dest.name] = Object.create(null)
-  }, this)
+  }
 
   // Now pull in all the rules.
   this.update()
@@ -184,10 +184,10 @@ AttributeFilter.prototype.update = function update() {
   this._cachedCount = 0
 
   // And all the destination rules.
-  DESTINATION_DETAILS.forEach(function forEachDestination(dest) {
+  for (const dest of DESTINATION_DETAILS) {
     const name = dest.name
     if (!this.config[name].attributes.enabled) {
-      return
+      continue
     }
 
     this._enabledDestinations |= dest.id
@@ -196,7 +196,7 @@ AttributeFilter.prototype.update = function update() {
     )
     this._rules[name].exclude = _importRules(this.config[name].attributes.exclude)
     this._cache[name] = Object.create(null)
-  }, this)
+  }
 }
 
 /**
@@ -291,13 +291,13 @@ function _importRules(rules) {
   }
   const exactRules = []
   const wildcardRules = []
-  rules.forEach(function separateRules(rule) {
+  for (const rule of rules) {
     if (rule[rule.length - 1] === '*') {
       wildcardRules.push(rule)
     } else {
       exactRules.push(rule)
     }
-  })
+  }
 
   if (exactRules.length) {
     out.exact = new RegExp('^' + _convertRulesToRegex(exactRules) + '$')

package/lib/config/default.js

@@ -323,7 +323,7 @@ defaultConfig.definition = () => {
        */
       diagnostics: {
         formatter: boolean,
-        deafult: false
+        default: false
       }
     },
     audit_log: {
@@ -1145,7 +1145,7 @@ defaultConfig.definition = () => {
       /**
        * Controls whether the agent will generate spans for in-process actions.
        * When disabled, this will only create spans for entry and exit spans.
-       * entry spans - initial actions for web servers and messsage queue consumption.
+       * entry spans - initial actions for web servers and message queue consumption.
        * exit spans - all outgoing calls to external services(external and database calls)
        */
       in_process_spans: {
@@ -1399,7 +1399,7 @@ defaultConfig.definition = () => {
     /**
      * Obfuscates URL parameters
      * for outgoing and incoming requests
-     * for distrubuted tracing attributes - both transaction and span attributes
+     * for distributed tracing attributes - both transaction and span attributes
      * for transaction trace transaction details
      */
     url_obfuscation: {
@@ -1429,7 +1429,7 @@ defaultConfig.definition = () => {
 
         /**
          * A string containing a replacement value for URL parameters
-         * can contain refferences to capture groups in the pattern
+         * can contain references to capture groups in the pattern
          */
         replacement: {
           default: ''
@@ -1499,7 +1499,7 @@ defaultConfig.definition = () => {
       },
 
       /**
-       * Unique test identifier when runnning IAST with CI/CD
+       * Unique test identifier when running IAST with CI/CD
        */
       iast_test_identifier: '',
 

package/lib/config/hsm.js

@@ -71,7 +71,7 @@ const REDACT_BEFORE_SEND = new Set([
   'certificates' // should be public but in case user mistake and also these are huge
 ])
 
-// process.domain needs to be stripped befeore sending
+// process.domain needs to be stripped before sending
 const REMOVE_BEFORE_SEND = new Set(['domain'])
 
 exports.HIGH_SECURITY_SETTINGS = HIGH_SECURITY_SETTINGS

package/lib/config/index.js

@@ -277,9 +277,9 @@ Config.prototype.onConnect = function onConnect(json, recursion) {
     return
   }
 
-  Object.keys(json).forEach(function updateProp(key) {
+  for (const key of Object.keys(json)) {
     this._fromServer(json, key)
-  }, this)
+  }
 
   this._warnDeprecations()
 
@@ -652,11 +652,11 @@ Config.prototype._alwaysUpdateIfChanged = function _alwaysUpdateIfChanged(json,
   const value = json[key]
   if (value != null && this[key] !== value) {
     if (Array.isArray(value) && Array.isArray(this[key])) {
-      value.forEach(function pushIfNew(element) {
+      for (const element of value) {
         if (this[key].indexOf(element) === -1) {
           this[key].push(element)
         }
-      }, this)
+      }
     } else {
       this[key] = value
     }
@@ -703,7 +703,7 @@ function _validateThenUpdateStatusCodes(remote, local, remoteKey, localKey) {
   }
 
   let valid = true
-  valueToTest.forEach(function validateArray(thingToTest) {
+  for (const thingToTest of valueToTest) {
     if (!(typeof thingToTest === 'string' || typeof thingToTest === 'number')) {
       logger.warn(
         'Saw SSC (ignore|expect)_status_code that is not a number or string,' +
@@ -712,7 +712,7 @@ function _validateThenUpdateStatusCodes(remote, local, remoteKey, localKey) {
       )
       valid = false
     }
-  })
+  }
   if (!valid) {
     return
   }
@@ -747,7 +747,7 @@ function _validateThenUpdateErrorClasses(remote, local, remoteKey, localKey) {
   }
 
   let valid = true
-  Object.keys(valueToTest).forEach(function validateArray(key) {
+  for (const key of Object.keys(valueToTest)) {
     const thingToTest = valueToTest[key]
     if (typeof thingToTest !== 'string') {
       logger.warn(
@@ -756,7 +756,7 @@ function _validateThenUpdateErrorClasses(remote, local, remoteKey, localKey) {
       )
       valid = false
     }
-  })
+  }
   if (!valid) {
     return
   }
@@ -801,13 +801,13 @@ function _validateThenUpdateErrorMessages(remote, local, remoteKey, localKey) {
   }
 
   let valid = true
-  Object.keys(valueToTest).forEach(function validateArray(key) {
+  for (const key of Object.keys(valueToTest)) {
     const arrayToTest = valueToTest[key]
     if (!Array.isArray(arrayToTest)) {
       logger.warn('Saw SSC message array that is not an array, will not merge: %s', arrayToTest)
       valid = false
     }
-  })
+  }
   if (!valid) {
     return
   }
@@ -1058,15 +1058,15 @@ Config.prototype._fromPassed = function _fromPassed(external, internal, arbitrar
     internal = this
   }
 
-  Object.keys(external).forEach(function overwrite(key) {
+  for (const key of Object.keys(external)) {
     // if it's not in the defaults, it doesn't exist
     if (!arbitrary && !(key in internal)) {
-      return
+      continue
     }
 
     if (key === 'ssl' && !isTruthular(external.ssl)) {
       logger.warn(SSL_WARNING)
-      return
+      continue
     }
 
     let node = null
@@ -1074,7 +1074,7 @@ Config.prototype._fromPassed = function _fromPassed(external, internal, arbitrar
       node = external[key]
     } catch {
       logger.warn('Error thrown on access of user config for key: %s', key)
-      return
+      continue
     }
 
     if (typeof node === 'object' && !Array.isArray(node) && !(node instanceof RegExp)) {
@@ -1084,7 +1084,7 @@ Config.prototype._fromPassed = function _fromPassed(external, internal, arbitrar
     } else {
       internal[key] = node
     }
-  }, this)
+  }
 }
 
 /**
@@ -1117,12 +1117,12 @@ Config.prototype._fromSpecial = function _fromSpecial() {
 Config.prototype._featureFlagsFromEnv = function _featureFlagsFromEnv() {
   const flags = Object.keys(featureFlag.prerelease).concat(featureFlag.released)
   const config = this
-  flags.forEach(function checkFlag(flag) {
+  for (const flag of flags) {
     const envVal = process.env['NEW_RELIC_FEATURE_FLAG_' + flag.toUpperCase()]
     if (envVal) {
       config.feature_flag[flag] = isTruthular(envVal)
     }
-  })
+  }
 }
 
 /**
@@ -1341,7 +1341,7 @@ Config.prototype._serverlessDT = function _serverlessDT() {
  */
 Config.prototype._preventServerlessDT = function _preventServerlessDT() {
   // Don't allow DT config settings to be set if serverless_mode is disabled
-  SERVERLESS_DT_KEYS.forEach((key) => {
+  for (const key of SERVERLESS_DT_KEYS) {
     if (this[key]) {
       logger.warn(
         key +
@@ -1350,7 +1350,7 @@ Config.prototype._preventServerlessDT = function _preventServerlessDT() {
       )
       this[key] = null
     }
-  })
+  }
 }
 
 /**
@@ -1502,7 +1502,9 @@ Config.prototype._applyHighSecurity = function _applyHighSecurity() {
   this.attributes.exclude.push('request.parameters.*')
 
   function checkNode(base, target, settings) {
-    Object.keys(settings).forEach(checkKey.bind(null, base, target, settings))
+    for (const key of Object.keys(settings)) {
+      checkKey(base, target, settings, key)
+    }
   }
 
   function checkKey(base, target, settings, key) {
@@ -1531,7 +1533,7 @@ Config.prototype._applyHighSecurity = function _applyHighSecurity() {
  * @param {Array} keys keys from a LASP policy
  * @returns {CollectorResponse} creates CollectorResponse with either preserve or shutdown
  */
-function _laspReponse(keys) {
+function _laspResponse(keys) {
   if (keys.length) {
     logger.error('The agent received one or more unexpected security policies and will shut down.')
     return CollectorResponse.fatal(null)
@@ -1617,18 +1619,18 @@ Config.prototype.applyLasp = function applyLasp(agent, policies) {
   const keys = Object.keys(policies)
 
   if (!this.security_policies_token) {
-    return _laspReponse(keys)
+    return _laspResponse(keys)
   }
 
   const { finalPolicies, missingRequired } = this._buildLaspPolicy(agent, policies)
 
   const missingLASP = []
-  Object.keys(LASP_MAP).forEach(function checkPolicy(name) {
+  for (const name of Object.keys(LASP_MAP)) {
     if (!policies[name]) {
       // agent is expecting a policy that was not sent from server -- fail
       missingLASP.push(name)
     }
-  })
+  }
 
   let fatalMessage = null
   if (missingLASP.length) {
@@ -1655,14 +1657,14 @@ Config.prototype.applyLasp = function applyLasp(agent, policies) {
 }
 
 Config.prototype.validateFlags = function validateFlags() {
-  Object.keys(this.feature_flag).forEach(function forEachFlag(key) {
+  for (const key of Object.keys(this.feature_flag)) {
     if (featureFlag.released.indexOf(key) > -1) {
       logger.warn('Feature flag %s has been released', key)
     }
     if (featureFlag.unreleased.indexOf(key) > -1) {
       logger.warn('Feature flag %s has been deprecated', key)
     }
-  })
+  }
 }
 
 function redactValue(value) {

package/lib/config/merge-server-config.js

@@ -32,28 +32,28 @@ class MergeServerConfig {
   }
 
   updateArray(value, local, localKey) {
-    value.forEach((element) => {
+    for (const element of value) {
       if (local[localKey].indexOf(element) === -1) {
         local[localKey].push(element)
       }
-    })
+    }
   }
 
   updateObject(value, local, localKey) {
     // go through each key of the object and update it
-    Object.keys(value).forEach((element) => {
+    for (const element of Object.keys(value)) {
       if (Array.isArray(local[localKey][element]) && Array.isArray(value[element])) {
         // if both key-values are arrays, push the remote value onto the local array
-        value[element].forEach((elementValue) => {
+        for (const elementValue of value[element]) {
           if (local[localKey][element].indexOf(elementValue) === -1) {
             local[localKey][element].push(elementValue)
           }
-        })
+        }
       } else {
         // otherwise, replace the local value with the server value
         local[localKey][element] = value[element]
       }
-    })
+    }
   }
 }
 

package/lib/core-instrumentation.js

@@ -32,6 +32,10 @@ module.exports = {
     type: InstrumentationDescriptor.TYPE_TRANSACTION,
     file: 'http.js'
   },
+  http2: {
+    type: InstrumentationDescriptor.TYPE_TRANSACTION,
+    file: 'http2.js'
+  },
   inspector: {
     type: InstrumentationDescriptor.TYPE_GENERIC,
     file: 'inspector.js'

package/lib/db/query-parsers/elasticsearch.js

@@ -72,18 +72,19 @@ function parsePath(pathString, method) {
       operation = 'index.create'
       return { collection, operation }
     }
-    path.forEach((segment, idx) => {
+    for (let idx = 0; idx < path.length; idx++) {
+      const segment = path[idx]
       const prev = idx - 1
-      let opname
       if (segment === '_search') {
         collection = path?.[prev] || defaultCollection
         operation = 'search'
       } else if (segment[0] === '_') {
-        opname = segment.substring(1)
+        const opname = segment.substring(1)
         collection = path?.[prev] || defaultCollection
         operation = `${opname}.${suffix}`
       }
-    })
+    }
+
     if (!operation && !collection) {
       // likely creating an index--no underscore segments
       collection = path?.[1] || defaultCollection

package/lib/db/query-parsers/sql.js

@@ -40,7 +40,7 @@ module.exports = function parseSql(sql) {
       try {
         logger.trace('parseSQL got an a non-string sql that looks like: %s', stringify(sql))
       } catch (err) {
-        logger.debug(err, 'Unabler to stringify SQL')
+        logger.debug(err, 'Unable to stringify SQL')
       }
     }
     return {

package/lib/environment.js

@@ -240,7 +240,7 @@ function getGlobalPackages() {
  */
 function flattenVersions(packages) {
   const info = Object.create(null)
-  packages.forEach((pair) => {
+  for (const pair of packages) {
     const p = pair[0]
     const v = pair[1]
 
@@ -251,7 +251,7 @@ function flattenVersions(packages) {
     } else {
       info[p] = [v]
     }
-  })
+  }
 
   return Object.keys(info)
     .map((key) => [key, info[key].join(', ')])
@@ -277,7 +277,7 @@ function flattenVersions(packages) {
 function remapConfigSettings() {
   if (process.config && process.config.variables) {
     const variables = process.config.variables
-    Object.keys(variables).forEach((key) => {
+    for (const key of Object.keys(variables)) {
       if (remapping[key]) {
         let value = variables[key]
 
@@ -290,7 +290,7 @@ function remapConfigSettings() {
 
         addSetting(remapping[key], value)
       }
-    })
+    }
 
     addMissingProcessVars()
   }
@@ -334,10 +334,10 @@ async function getOtherPackages() {
     2
   )
 
-  otherPackages.forEach((pkg) => {
+  for (const pkg of otherPackages) {
     other.packages.push.apply(other.packages, pkg.packages)
     other.dependencies.push.apply(other.dependencies, pkg.dependencies)
-  })
+  }
 
   _log('Done getting other packages')
   return other
@@ -442,21 +442,21 @@ function refreshSyncOnly() {
   settings = Object.create(null)
   // add persisted settings
   if (framework.length) {
-    framework.forEach(function addFrameworks(fw) {
+    for (const fw of framework) {
       addSetting('Framework', fw)
-    })
+    }
   }
 
   if (dispatcher.length) {
-    dispatcher.forEach(function addDispatchers(d) {
+    for (const d of dispatcher) {
       addSetting('Dispatcher', d)
-    })
+    }
   }
 
   if (dispatcherVersion.length) {
-    dispatcher.forEach(function addDispatchers(d) {
+    for (const d of dispatcher) {
       addSetting(DISPATCHER_VERSION, d)
-    })
+    }
   }
 
   gatherEnv()
@@ -498,11 +498,11 @@ async function getJSON() {
   }
 
   const items = []
-  Object.keys(settings).forEach(function settingKeysForEach(key) {
-    settings[key].forEach(function settingsValuesForEach(setting) {
+  for (const [key, value] of Object.entries(settings)) {
+    for (const setting of value) {
       items.push([key, setting])
-    })
-  })
+    }
+  }
   _log('JSON got')
   return items
 }

package/lib/errors/index.js

@@ -58,7 +58,7 @@ class Exception {
  * because everything's an object in JS. I'm not entirely sure why we do this, but
  * weird enough to make note of
  *
- * @param {Transaction} transaction  The agent transaction, coming from the instrumentatation
+ * @param {Transaction} transaction  The agent transaction, coming from the instrumentation
  * @param {Exception}   exception    An custom Exception object with the error and other information
  * @param {object}      config       The configuration to use when creating the object
  * @returns {Array} an Array of Error information, [0] -> placeholder,