newrelic 12.8.2 → 12.10.0

package/lib/attributes.js

@@ -22,7 +22,7 @@ class Attributes {
    * @param {string} scope
    *  The scope of the attributes this will collect. Must be `transaction` or
    *  `segment`.
-   * @param {number} [limit=Infinity]
+   * @param {number} [limit]
    *  The maximum number of attributes to retrieve for each destination.
    */
   constructor(scope, limit = Infinity) {
@@ -64,9 +64,9 @@ class Attributes {
    */
   get(dest) {
     const attrs = Object.create(null)
-    // eslint-disable-next-line guard-for-in
     for (const key in this.attributes) {
       const attr = this.attributes[key]
+      // eslint-disable-next-line sonarjs/bitwise-operators
       if (!(attr.destinations & dest)) {
         continue
       }
@@ -104,7 +104,7 @@ class Attributes {
    * @param {DESTINATIONS}  destinations  - The default destinations for this key.
    * @param {string}        key           - The attribute name.
    * @param {string}        value         - The attribute value.
-   * @param {boolean} [truncateExempt=false] - Flag marking value exempt from truncation
+   * @param {boolean} [truncateExempt] - Flag marking value exempt from truncation
    */
   addAttribute(destinations, key, value, truncateExempt = false) {
     if (this.attributeCount + 1 > this.limit) {
@@ -180,6 +180,6 @@ function makeFilter(scope) {
 }
 
 module.exports = {
-  Attributes: Attributes,
-  MAXIMUM_CUSTOM_ATTRIBUTES: MAXIMUM_CUSTOM_ATTRIBUTES
+  Attributes,
+  MAXIMUM_CUSTOM_ATTRIBUTES
 }

package/lib/collector/api.js

@@ -5,7 +5,6 @@
 
 'use strict'
 
-const http = require('http')
 const CollectorResponse = require('./response')
 const facts = require('./facts')
 const logger = require('../logger').child({ component: 'collector_api' })
@@ -341,7 +340,7 @@ CollectorAPI.prototype._handlePreConnectResponse = function _handlePreConnectRes
 
       const [host, port] = parts
       const newEndpoint = {
-        host: host,
+        host,
         port: port || DEFAULT_PORT
       }
 
@@ -614,7 +613,6 @@ CollectorAPI.prototype._handleResponseCode = _handleResponseCode
 function _handleResponseCode(response, endpoint, cb) {
   const code = response.status
 
-  /* eslint-disable padded-blocks */
   if (SUCCESS.has(code)) {
     // The request was a success!
     setImmediate(cb, null, CollectorResponse.success(response.payload))

package/lib/collector/facts.js

@@ -37,7 +37,7 @@ async function facts(agent, callback, { logger = defaultLogger } = {}) {
       metadata_version: 5,
       logical_processors: systemInfo.logicalProcessors || null,
       total_ram_mib: systemInfo.memory || null,
-      hostname: hostname
+      hostname
     },
     pid: process.pid,
     host: hostname,
@@ -45,7 +45,7 @@ async function facts(agent, callback, { logger = defaultLogger } = {}) {
     language: 'nodejs',
     app_name: agent.config.applications(),
     agent_version: agent.version,
-    environment: environment,
+    environment,
     settings: agent.config.publicSettings(),
     high_security: agent.config.high_security,
     labels: agent.config.parsedLabels,

package/lib/collector/http-agents.js

@@ -27,7 +27,7 @@ exports.keepAliveAgent = function keepAliveAgent(config) {
   // always return the same agent instance, which
   // ensures all requests share the same http
   // connection
-  if (null !== agentKeepAlive) {
+  if (agentKeepAlive !== null) {
     return agentKeepAlive
   }
 
@@ -48,7 +48,7 @@ exports.keepAliveAgent = function keepAliveAgent(config) {
  * @param config
  */
 exports.proxyAgent = function proxyAgent(config) {
-  if (null !== agentProxyWithKeepAlive) {
+  if (agentProxyWithKeepAlive !== null) {
     return agentProxyWithKeepAlive
   }
   const proxyUrl = proxyOptions(config)

package/lib/collector/remote-method.js

@@ -92,7 +92,7 @@ RemoteMethod.prototype._reportDataUsage = function reportDataUsage(sent, receive
  * you're doing it wrong.
  *
  * @param {object}   payload           Serializable payload.
- * @param {object}   [nrHeaders=null]  NR request headers from connect response.
+ * @param {object}   [nrHeaders]  NR request headers from connect response.
  * @param {Function} callback          What to do next. Gets passed any error.
  */
 RemoteMethod.prototype.invoke = function invoke(payload, nrHeaders, callback) {
@@ -359,7 +359,7 @@ RemoteMethod.prototype._path = function _path({ redactLicenseKey } = {}) {
 
   return url.format({
     pathname: RAW_METHOD_PATH,
-    query: query
+    query
   })
 }
 
@@ -374,9 +374,9 @@ RemoteMethod.prototype._headers = function _headers(options) {
 
   const headers = {
     // select the virtual host on the server end
-    'Host': this.endpoint.host,
+    Host: this.endpoint.host,
     'User-Agent': agent,
-    'Connection': 'Keep-Alive',
+    Connection: 'Keep-Alive',
     'Content-Length': byteLength(options.body),
     'Content-Type': 'application/json'
   }

package/lib/config/attribute-filter.js

@@ -347,7 +347,7 @@ function _convertRulesToRegex(rules) {
         // 'fizz.bang' => ['fizz', 'bang']
         // '*' => ['\\*']
         return rule
-          .replace(/([.*+?|\\^$()\[\]])/g, function cleaner(m) {
+          .replace(/([.*+?|\\^$()[\]])/g, function cleaner(m) {
             return '\\' + m
           })
           .split('.')

package/lib/config/default.js

@@ -33,7 +33,7 @@ defaultConfig.definition = () => ({
    */
   app_name: {
     formatter(val) {
-      return val.split(/;|,/).map((k) => k.trim())
+      return val.split(/[;,]/).map((k) => k.trim())
     },
     default: []
   },
@@ -1589,7 +1589,7 @@ function buildConfig(definition, config, paths = [], objectKeys = 1) {
     if (type === 'string') {
       assignConfigValue({ config: conf, key, value, paths })
     } else if (type === 'object') {
-      if (value.hasOwnProperty('default')) {
+      if (Object.prototype.hasOwnProperty.call(value, 'default')) {
         assignConfigValue({ config: conf, key, value: value.default, paths })
       } else {
         // add the current leaf node key to the paths and recurse through function again

package/lib/config/harvest-config-validator.js

@@ -24,6 +24,6 @@ function isValidHarvestValue(value) {
 }
 
 module.exports = {
-  isValidHarvestConfig: isValidHarvestConfig,
-  isValidHarvestValue: isValidHarvestValue
+  isValidHarvestConfig,
+  isValidHarvestValue
 }

package/lib/config/index.js

@@ -45,7 +45,9 @@ let logger = null // Lazy-loaded in `initialize`.
 let _configInstance = null
 
 const getConfigFileNames = () =>
-  [process.env.NEW_RELIC_CONFIG_FILENAME, 'newrelic.js', 'newrelic.cjs'].filter(Boolean)
+  [process.env.NEW_RELIC_CONFIG_FILENAME, 'newrelic.js', 'newrelic.cjs', 'newrelic.mjs'].filter(
+    Boolean
+  )
 
 const getConfigFileLocations = () =>
   [
@@ -591,7 +593,7 @@ Config.prototype._fromServer = function _fromServer(params, key) {
     case 'rum.load_episodes_file':
     // Ensure the most secure setting is applied to the settings below
     // when enabling them.
-    case 'attributes.include_enabled':
+    case 'attributes.include_enabled': // eslint-disable-line no-fallthrough
     case 'strip_exception_messages.enabled':
     case 'transaction_tracer.record_sql':
       this.logUnsupported(params, key)
@@ -693,7 +695,7 @@ function _validateThenUpdateStatusCodes(remote, local, remoteKey, localKey) {
 
   let valid = true
   valueToTest.forEach(function validateArray(thingToTest) {
-    if (!('string' === typeof thingToTest || 'number' === typeof thingToTest)) {
+    if (!(typeof thingToTest === 'string' || typeof thingToTest === 'number')) {
       logger.warn(
         'Saw SSC (ignore|expect)_status_code that is not a number or string,' +
           'will not merge: %s',
@@ -738,7 +740,7 @@ function _validateThenUpdateErrorClasses(remote, local, remoteKey, localKey) {
   let valid = true
   Object.keys(valueToTest).forEach(function validateArray(key) {
     const thingToTest = valueToTest[key]
-    if ('string' !== typeof thingToTest) {
+    if (typeof thingToTest !== 'string') {
       logger.warn(
         'Saw SSC (ignore|expect)_class that is not a string, will not merge: %s',
         thingToTest
@@ -781,7 +783,7 @@ function _validateThenUpdateErrorMessages(remote, local, remoteKey, localKey) {
     return
   }
 
-  if ('object' !== typeof valueToTest) {
+  if (typeof valueToTest !== 'object') {
     logger.warn(
       'Saw SSC (ignore|expect)_message that is primitive/scaler, will not merge: %s',
       valueToTest
@@ -984,7 +986,7 @@ function getHostnameSafe() {
       _hostname = os.hostname()
     }
     return _hostname
-  } catch (e) {
+  } catch {
     const addresses = this.getIPAddresses()
 
     if (this.process_host.ipv_preference === '6' && addresses.ipv6) {
@@ -1052,7 +1054,7 @@ Config.prototype._fromPassed = function _fromPassed(external, internal, arbitrar
     let node = null
     try {
       node = external[key]
-    } catch (err) {
+    } catch {
       logger.warn('Error thrown on access of user config for key: %s', key)
       return
     }
@@ -1158,7 +1160,7 @@ Config.prototype._fromEnvironment = function _fromEnvironment(
       const envVar = deriveEnvVar(key, paths)
       setFromEnv({ config, key, envVar, paths })
     } else if (type === 'object') {
-      if (value.hasOwnProperty('env')) {
+      if (Object.prototype.hasOwnProperty.call(value, 'env')) {
         setFromEnv({
           config,
           key,
@@ -1166,7 +1168,7 @@ Config.prototype._fromEnvironment = function _fromEnvironment(
           paths,
           formatter: value.formatter
         })
-      } else if (value.hasOwnProperty('default')) {
+      } else if (Object.prototype.hasOwnProperty.call(value, 'default')) {
         const envVar = deriveEnvVar(key, paths)
         setFromEnv({ config, key, envVar, formatter: value.formatter, paths })
       } else {
@@ -1657,7 +1659,7 @@ Config.prototype.publicSettings = function publicSettings() {
   let settings = Object.create(null)
 
   for (const key in this) {
-    if (this.hasOwnProperty(key) && !REMOVE_BEFORE_SEND.has(key)) {
+    if (Object.prototype.hasOwnProperty.call(this, key) && !REMOVE_BEFORE_SEND.has(key)) {
       if (HSM.REDACT_BEFORE_SEND.has(key)) {
         const value = this[key]
         settings[key] = redactValue(value)
@@ -1823,10 +1825,8 @@ function getOrCreateInstance() {
     try {
       _configInstance = initialize()
     } catch (err) {
-      /* eslint-disable no-console */
       console.error('New Relic for Node.js is disabled due to an error:')
       console.error(err.stack)
-      /* eslint-enable no-console */
 
       // Config construction has potential to throw due to invalid settings.
       // This allows the agent to return a stub api without crashing the process.

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

@@ -8,7 +8,6 @@
 const { isSimpleObject } = require('../util/objects')
 
 class MergeServerConfig {
-  // eslint-disable-next-line max-params
   updateNestedIfChanged(config, remote, local, remoteKey, localKey, logger) {
     const value = remote[remoteKey]
 
@@ -46,7 +45,7 @@ class MergeServerConfig {
       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) => {
-          if (-1 === local[localKey][element].indexOf(elementValue)) {
+          if (local[localKey][element].indexOf(elementValue) === -1) {
             local[localKey][element].push(elementValue)
           }
         })

package/lib/custom-events/custom-event-aggregator.js

@@ -12,7 +12,6 @@ class CustomEventAggregator extends EventAggregator {
   constructor(opts, agent) {
     opts = opts || {}
     opts.method = opts.method || 'custom_event_data'
-    opts.metricNames = opts.metricNames
 
     super(opts, agent)
   }

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

@@ -9,6 +9,7 @@ const logger = require('../../logger').child({ component: 'sql_query_parser' })
 const StatementMatcher = require('../statement-matcher')
 const stringify = require('json-stringify-safe')
 
+/* eslint-disable no-useless-escape, sonarjs/slow-regex, sonarjs/duplicates-in-character-class */
 const OPERATIONS = [
   new StatementMatcher(
     'select',
@@ -22,6 +23,7 @@ const OPERATIONS = [
   new StatementMatcher('delete', /^[^\S]*?delete[^\S]+?from[^\S]+([^\s\n\r,(;]+)/gim)
 ]
 const COMMENT_PATTERN = /\/\\*.*?\\*\//g
+/* eslint-enable no-useless-escape, sonarjs/slow-regex, sonarjs/duplicates-in-character-class */
 
 // This must be called synchronously after the initial db call for backtraces to
 // work correctly

package/lib/db/slow-query.js

@@ -23,6 +23,7 @@ function SlowQuery(segment, type, query, trace) {
 
 function normalizedHash(value) {
   // We leverage the last 15 hex digits which will fit in a signed long
+  // eslint-disable-next-line sonarjs/hashing
   return parseInt(crypto.createHash('sha1').update(value).digest('hex').slice(-15), 16)
 }
 

package/lib/db/statement-matcher.js

@@ -6,6 +6,7 @@
 'use strict'
 
 //               (       `  database` .     `    table ` )
+// eslint-disable-next-line sonarjs/slow-regex
 const CLEANER = /^\(?(?:([`'"]?)(.*?)\1\.)?([`'"]?)(.*?)\3\)?$/
 
 function StatementMatcher(operation, operationPattern) {
@@ -42,8 +43,8 @@ StatementMatcher.prototype.getParsedStatement = function getParsedStatement(sql)
     // be used for datastore attributes.
     return {
       operation: this.operation,
-      database: database,
-      collection: collection,
+      database,
+      collection,
       query: sql
     }
   }

package/lib/db/utils.js

@@ -10,6 +10,10 @@ module.exports.extractDatabaseChangeFromUse = extractDatabaseChangeFromUse
 function extractDatabaseChangeFromUse(sql) {
   // The character ranges for this were pulled from
   // http://dev.mysql.com/doc/refman/5.7/en/identifiers.html
+
+  // Suppressing a warning on this regex because it is not obvious what this
+  // regex does, and we don't want to break anything.
+  // eslint-disable-next-line sonarjs/slow-regex, sonarjs/duplicates-in-character-class
   const match = /^\s*use[^\w`]+([\w$_\u0080-\uFFFF]+|`[^`]+`)[\s;]*$/i.exec(sql)
   return (match && match[1]) || null
 }

package/lib/environment.js

@@ -67,7 +67,7 @@ function clearSetting(name) {
  * the provided root.
  *
  * @param {string}    root          - Path to start listing packages from.
- * @param {Array}     [packages=[]] - Array to append found packages to.
+ * @param {Array}     [packages] - Array to append found packages to.
  */
 async function listPackages(root, packages = []) {
   _log('Listing packages in %s', root)
@@ -496,7 +496,7 @@ async function getJSON() {
   _log('Getting environment JSON')
   try {
     await refresh()
-  } catch (err) {
+  } catch {
     // swallow error
   }
 

package/lib/errors/error-collector.js

@@ -10,7 +10,6 @@ const errorsModule = require('./index')
 const logger = require('../logger').child({ component: 'error_tracer' })
 const urltils = require('../util/urltils')
 const Exception = require('../errors').Exception
-const Transaction = require('../transaction')
 const errorHelper = require('./helper')
 const createError = errorsModule.createError
 const createEvent = errorsModule.createEvent
@@ -312,6 +311,7 @@ class ErrorCollector {
     }
 
     if (this.config.error_collector.capture_events === true) {
+      // eslint-disable-next-line sonarjs/pseudo-random
       const priority = (transaction && transaction.priority) || Math.random()
       const event = createEvent(transaction, errorTrace, exception.timestamp, this.config)
       this.eventAggregator.add(event, priority)
@@ -360,7 +360,7 @@ class ErrorCollector {
    * @param {Transaction} transaction the transaction associated with the trace
    */
   _maybeRecordErrorMetrics(errorTrace, transaction) {
-    const isExpectedError = true === errorTrace[4].intrinsics['error.expected']
+    const isExpectedError = errorTrace[4].intrinsics['error.expected'] === true
 
     if (isExpectedError) {
       this.metrics.getOrCreateMetric(NAMES.ERRORS.EXPECTED).incrementCallCount()

package/lib/errors/error-event-aggregator.js

@@ -36,6 +36,7 @@ class ErrorEventAggregator extends EventAggregator {
 
     return [this.runId, metrics, eventData]
   }
+
   reconfigure(config) {
     super.reconfigure(config)
     if (!this.enabled) {

package/lib/errors/helper.js

@@ -90,9 +90,9 @@ module.exports = {
     }
 
     return {
-      name: name,
-      message: message,
-      type: type
+      name,
+      message,
+      type
     }
   },
 
@@ -119,7 +119,7 @@ module.exports = {
       return false
     }
 
-    return -1 !== config.error_collector.ignore_classes.indexOf(errorInfo.type)
+    return config.error_collector.ignore_classes.indexOf(errorInfo.type) !== -1
   },
 
   shouldIgnoreErrorMessage: function shouldIgnoreErrorMessage(errorInfo, config) {

package/lib/errors/index.js

@@ -16,7 +16,6 @@ const {
   maybeAddDatabaseAttributes
 } = require('../util/attributes')
 const synthetics = require('../synthetics')
-const Transaction = require('../transaction')
 const ERROR_EXPECTED_PATH = 'error.expected'
 
 class Exception {
@@ -121,8 +120,8 @@ function isValidErrorGroupOutput(output) {
 function maybeAddAgentAttributes(attributes, exception) {
   if (exception.errorGroupCallback) {
     const callbackInput = {
-      'error': exception.error,
-      'customAttributes': Object.assign({}, attributes.userAttributes),
+      error: exception.error,
+      customAttributes: Object.assign({}, attributes.userAttributes),
       'request.uri': attributes.agentAttributes['request.uri'],
       'http.statusCode': attributes.agentAttributes['http.statusCode'],
       'http.method': attributes.agentAttributes['request.method'],
@@ -153,6 +152,7 @@ function maybeAddUserAttributes(userAttributes, exception, config) {
     for (const key in customAttributes) {
       if (props.hasOwn(customAttributes, key)) {
         const dest = config.attributeFilter.filterTransaction(DESTINATIONS.ERROR_EVENT, key)
+        // eslint-disable-next-line sonarjs/bitwise-operators
         if (dest & DESTINATIONS.ERROR_EVENT) {
           userAttributes[key] = customAttributes[key]
         }
@@ -208,7 +208,6 @@ function createEvent(transaction, error, timestamp, config) {
   return [intrinsicAttributes, userAttributes, agentAttributes]
 }
 
-// eslint-disable-next-line max-params
 function _getErrorEventIntrinsicAttrs(transaction, errorClass, message, expected, timestamp, conf) {
   // the server expects seconds instead of milliseconds
   if (timestamp) {
@@ -216,10 +215,10 @@ function _getErrorEventIntrinsicAttrs(transaction, errorClass, message, expected
   }
 
   const attributes = {
-    'type': 'TransactionError',
+    type: 'TransactionError',
     'error.class': errorClass,
     'error.message': conf.high_security ? '' : message,
-    'timestamp': timestamp,
+    timestamp,
     'error.expected': expected
   }
 

package/lib/grpc/connection.js

@@ -43,7 +43,7 @@ class GrpcConnection extends EventEmitter {
    *
    * @param {object} infiniteTracingConfig config item config.infinite_tracing
    * @param {MetricAggregator} metrics metric aggregator, for supportability metrics
-   * @param {number} [reconnectDelayMs=15000] number of milliseconds to wait before reconnecting
+   * @param {number} [reconnectDelayMs] number of milliseconds to wait before reconnecting
    * for error states that require a reconnect delay.
    */
   constructor(infiniteTracingConfig, metrics, reconnectDelayMs = DEFAULT_RECONNECT_DELAY_MS) {

package/lib/header-attributes.js

@@ -17,42 +17,42 @@ const COLLECTED_REQUEST_HEADERS = [
 ]
 
 const HEADER_ATTR_NAMES = {
-  'accept': 'accept',
+  accept: 'accept',
   'accept-charset': 'acceptCharset',
   'accept-encoding': 'acceptEncoding',
   'access-control-allow-headers': 'accessControlAllowHeaders',
   'access-control-allow-methods': 'accessControlAllowMethods',
   'access-control-allow-origin': 'accessControlAllowOrigin',
-  'age': 'age',
-  'allow': 'allow',
-  'authorization': 'authorization',
+  age: 'age',
+  allow: 'allow',
+  authorization: 'authorization',
   'cache-control': 'cacheControl',
-  'connection': 'connection',
-  'cookie': 'cookie',
+  connection: 'connection',
+  cookie: 'cookie',
   'content-encoding': 'contentEncoding',
   'content-length': 'contentLength',
   'content-type': 'contentType',
-  'date': 'date',
-  'etag': 'eTag',
-  'expect': 'expect',
-  'expires': 'expires',
-  'forwarded': 'forwarded',
-  'host': 'host',
+  date: 'date',
+  etag: 'eTag',
+  expect: 'expect',
+  expires: 'expires',
+  forwarded: 'forwarded',
+  host: 'host',
   'if-match': 'ifMatch',
   'if-modified-since': 'ifModifiedSince',
   'last-modified': 'lastModified',
-  'location': 'location',
-  'newrelic': 'newrelic',
-  'origin': 'origin',
+  location: 'location',
+  newrelic: 'newrelic',
+  origin: 'origin',
   'proxy-authorization': 'proxyAuthorization',
-  'referer': 'referer',
-  'refresh': 'refresh',
-  'server': 'server',
+  referer: 'referer',
+  refresh: 'refresh',
+  server: 'server',
   'set-cookie': 'setCookie',
   'transfer-encoding': 'transferEncoding',
   'user-agent': 'userAgent',
-  'upgrade': 'upgrade',
-  'vary': 'vary',
+  upgrade: 'upgrade',
+  vary: 'vary',
   'x-correlation-id': 'xCorrelationId',
   'x-csrf-token': 'xCsrfToken',
   'x-forwarded-for': 'xForwardedFor',
@@ -95,6 +95,7 @@ function _headerToCamelCase(header) {
   const newHeader = header.charAt(0).toLowerCase() + header.slice(1)
 
   // Converts headers in the form 'header-name' to be in the form 'headerName'
+  // eslint-disable-next-line sonarjs/slow-regex
   return newHeader.replace(/[\W_]+(\w)/g, function capitalize(m, $1) {
     return $1.toUpperCase()
   })

package/lib/instrumentation/@elastic/elasticsearch.js

@@ -108,7 +108,7 @@ function parsePath(pathString, method) {
     const path = pathString.split('/')
     if (method === 'PUT' && path.length === 2) {
       collection = path?.[1] || defaultCollection
-      operation = `index.create`
+      operation = 'index.create'
       return { collection, operation }
     }
     path.forEach((segment, idx) => {
@@ -116,7 +116,7 @@ function parsePath(pathString, method) {
       let opname
       if (segment === '_search') {
         collection = path?.[prev] || defaultCollection
-        operation = `search`
+        operation = 'search'
       } else if (segment[0] === '_') {
         opname = segment.substring(1)
         collection = path?.[prev] || defaultCollection