newrelic 8.2.0 → 8.5.1

package/lib/config/index.js

@@ -29,7 +29,6 @@ const mergeServerConfig = new MergeServerConfig()
 const AZURE_APP_NAME = 'APP_POOL_ID'
 const DEFAULT_MAX_PAYLOAD_SIZE_IN_BYTES = 1000000
 const DEFAULT_CONFIG_PATH = require.resolve('./default')
-const SPAN_EVENT_LIMIT = 1000
 const BASE_CONFIG_PATH = require.resolve('../../newrelic')
 const HAS_ARBITRARY_KEYS = new Set(['ignore_messages', 'expected_messages', 'labels'])
 
@@ -62,7 +61,7 @@ function isTruthular(setting) {
     return false
   }
 
-  var normalized = setting.toString().toLowerCase()
+  const normalized = setting.toString().toLowerCase()
   switch (normalized) {
     case 'false':
     case 'f':
@@ -183,7 +182,7 @@ function Config(config) {
         analytic_event_data: this.transaction_events.max_samples_stored,
         custom_event_data: this.custom_insights_events.max_samples_stored,
         error_event_data: this.error_collector.max_event_samples_stored,
-        span_event_data: SPAN_EVENT_LIMIT
+        span_event_data: this.span_events.max_samples_stored
       }
     }
   }
@@ -246,11 +245,13 @@ Config.prototype.onConnect = function onConnect(json, recursion) {
     this._fromServer(json, key)
   }, this)
 
+  this._warnDeprecations()
+
   this.emit('change', this)
 }
 
 Config.prototype._getMostSecure = function getMostSecure(key, currentVal, newVal) {
-  var filter = LASP_MAP[key] && LASP_MAP[key].filter
+  const filter = LASP_MAP[key] && LASP_MAP[key].filter
   if (!this.security_policies_token || !filter) {
     // If we aren't applying something vetted by security policies we
     // just return the new value.
@@ -544,6 +545,13 @@ Config.prototype._fromServer = function _fromServer(params, key) {
       this.logUnsupported(params, key)
       break
 
+    // DT span event harvest config limits
+    case 'span_event_harvest_config':
+      this.span_event_harvest_config = {
+        ...params[key]
+      }
+      break
+
     // These settings are not allowed from the server.
     case 'attributes.enabled':
     case 'attributes.exclude':
@@ -578,7 +586,7 @@ Config.prototype._fromServer = function _fromServer(params, key) {
  * @param {string} key  Value we're looking to set.
  */
 Config.prototype._alwaysUpdateIfChanged = function _alwaysUpdateIfChanged(json, key) {
-  var value = json[key]
+  const value = json[key]
   if (value != null && this[key] !== value) {
     if (Array.isArray(value) && Array.isArray(this[key])) {
       value.forEach(function pushIfNew(element) {
@@ -622,7 +630,7 @@ Config.prototype._updateIfChanged = function _updateIfChanged(json, key) {
  */
 Config.prototype._validateThenUpdateStatusCodes = _validateThenUpdateStatusCodes
 function _validateThenUpdateStatusCodes(remote, local, remoteKey, localKey) {
-  let valueToTest = remote[remoteKey]
+  const valueToTest = remote[remoteKey]
   if (!Array.isArray(valueToTest)) {
     logger.warn(
       'Saw SSC (ignore|expect)_status_codes that is not an array, will not merge: %s',
@@ -666,7 +674,7 @@ function _validateThenUpdateStatusCodes(remote, local, remoteKey, localKey) {
 Config.prototype._validateThenUpdateErrorClasses = _validateThenUpdateErrorClasses
 
 function _validateThenUpdateErrorClasses(remote, local, remoteKey, localKey) {
-  let valueToTest = remote[remoteKey]
+  const valueToTest = remote[remoteKey]
   if (!Array.isArray(valueToTest)) {
     logger.warn(
       'Saw SSC (ignore|expect)_classes that is not an array, will not merge: %s',
@@ -677,7 +685,7 @@ function _validateThenUpdateErrorClasses(remote, local, remoteKey, localKey) {
 
   let valid = true
   Object.keys(valueToTest).forEach(function validateArray(key) {
-    let thingToTest = valueToTest[key]
+    const thingToTest = valueToTest[key]
     if ('string' !== typeof thingToTest) {
       logger.warn(
         'Saw SSC (ignore|expect)_class that is not a string, will not merge: %s',
@@ -710,7 +718,7 @@ function _validateThenUpdateErrorClasses(remote, local, remoteKey, localKey) {
 Config.prototype._validateThenUpdateErrorMessages = _validateThenUpdateErrorMessages
 
 function _validateThenUpdateErrorMessages(remote, local, remoteKey, localKey) {
-  let valueToTest = remote[remoteKey]
+  const valueToTest = remote[remoteKey]
   if (Array.isArray(valueToTest)) {
     logger.warn('Saw SSC (ignore|expect)_message that is an Array, will not merge: %s', valueToTest)
     return
@@ -736,7 +744,7 @@ function _validateThenUpdateErrorMessages(remote, local, remoteKey, localKey) {
 
   let valid = true
   Object.keys(valueToTest).forEach(function validateArray(key) {
-    let arrayToTest = valueToTest[key]
+    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
@@ -787,7 +795,7 @@ function _updateNestedIfChangedRaw(remote, local, remoteKey, localKey) {
  * @param {string} key  Value we're looking to set.
  */
 Config.prototype._emitIfSet = function _emitIfSet(json, key) {
-  var value = json[key]
+  const value = json[key]
   if (value != null) {
     this.emit(key, value)
   }
@@ -801,7 +809,7 @@ Config.prototype._emitIfSet = function _emitIfSet(json, key) {
  * @param {string} key  Value the agent won't set.
  */
 Config.prototype.logDisabled = function logDisabled(json, key) {
-  var value = json[key]
+  const value = json[key]
   if (value != null) {
     logger.debug(
       'Server-side configuration of %s is currently disabled by local configuration. ' +
@@ -820,7 +828,7 @@ Config.prototype.logDisabled = function logDisabled(json, key) {
  * @param {string} key  Value the agent doesn't set.
  */
 Config.prototype.logUnsupported = function logUnsupported(json, key) {
-  var value = json[key]
+  const value = json[key]
   if (value !== null && value !== undefined) {
     logger.debug(
       'Server-side configuration of %s is currently not supported by the ' +
@@ -839,7 +847,7 @@ Config.prototype.logUnsupported = function logUnsupported(json, key) {
  * @param {string} key  Value the agent knows nothing about.
  */
 Config.prototype.logUnknown = function logUnknown(json, key) {
-  var value = json[key]
+  const value = json[key]
   logger.debug('New Relic sent unknown configuration parameter %s with value %s.', key, value)
 }
 
@@ -866,7 +874,7 @@ Config.prototype.clearDisplayHostCache = function clearDisplayHostCache() {
 }
 
 function getDisplayHost() {
-  var _displayHost
+  let _displayHost
   this.getDisplayHost = function getCachedDisplayHost() {
     return _displayHost
   }
@@ -874,8 +882,8 @@ function getDisplayHost() {
     _displayHost = this.getHostnameSafe()
     return _displayHost
   }
-  var stringBuffer = Buffer.from(this.process_host.display_name, 'utf8')
-  var numBytes = stringBuffer.length
+  const stringBuffer = Buffer.from(this.process_host.display_name, 'utf8')
+  const numBytes = stringBuffer.length
 
   if (numBytes > 255) {
     logger.warn('Custom host display name must be less than 255 bytes')
@@ -904,18 +912,18 @@ Config.prototype.clearHostnameCache = function clearHostnameCache() {
 }
 
 Config.prototype.getIPAddresses = function getIPAddresses() {
-  var addresses = Object.create(null)
-  var interfaces = os.networkInterfaces()
+  const addresses = Object.create(null)
+  const interfaces = os.networkInterfaces()
 
-  for (var interfaceKey in interfaces) {
+  for (const interfaceKey in interfaces) {
     if (interfaceKey.match(/^lo/)) {
       continue
     }
 
-    var interfaceDescriptions = interfaces[interfaceKey]
-    for (var i = 0; i < interfaceDescriptions.length; i++) {
-      var description = interfaceDescriptions[i]
-      var family = description.family.toLowerCase()
+    const interfaceDescriptions = interfaces[interfaceKey]
+    for (let i = 0; i < interfaceDescriptions.length; i++) {
+      const description = interfaceDescriptions[i]
+      const family = description.family.toLowerCase()
       addresses[family] = description.address
     }
   }
@@ -923,7 +931,7 @@ Config.prototype.getIPAddresses = function getIPAddresses() {
 }
 
 function getHostnameSafe() {
-  var _hostname
+  let _hostname
   this.getHostnameSafe = function getCachedHostname() {
     return _hostname
   }
@@ -931,7 +939,7 @@ function getHostnameSafe() {
     _hostname = os.hostname()
     return _hostname
   } catch (e) {
-    var addresses = this.getIPAddresses()
+    const addresses = this.getIPAddresses()
 
     if (this.process_host.ipv_preference === '6' && addresses.ipv6) {
       _hostname = addresses.ipv6
@@ -954,7 +962,7 @@ function getHostnameSafe() {
  * Ensure that the apps names are always returned as a list.
  */
 Config.prototype.applications = function applications() {
-  var apps = this.app_name
+  const apps = this.app_name
 
   if (Array.isArray(apps) && apps.length > 0) {
     return apps
@@ -992,8 +1000,9 @@ Config.prototype._fromPassed = function _fromPassed(external, internal, arbitrar
       return
     }
 
+    let node = null
     try {
-      var node = external[key]
+      node = external[key]
     } catch (err) {
       logger.warn('Error thrown on access of user config for key: %s', key)
       return
@@ -1001,7 +1010,7 @@ Config.prototype._fromPassed = function _fromPassed(external, internal, arbitrar
 
     if (typeof node === 'object' && !Array.isArray(node)) {
       // is top level and can have arbitrary keys
-      var allowArbitrary = internal === this || HAS_ARBITRARY_KEYS.has(key)
+      const allowArbitrary = internal === this || HAS_ARBITRARY_KEYS.has(key)
       this._fromPassed(node, internal[key], allowArbitrary)
     } else {
       internal[key] = node
@@ -1018,14 +1027,14 @@ Config.prototype._fromPassed = function _fromPassed(external, internal, arbitrar
  * of configuration.
  */
 Config.prototype._fromSpecial = function _fromSpecial() {
-  var name = this.app_name
+  const name = this.app_name
   if (
     name === null ||
     name === undefined ||
     name === '' ||
     (Array.isArray(name) && name.length === 0)
   ) {
-    var azureName = process.env[AZURE_APP_NAME]
+    const azureName = process.env[AZURE_APP_NAME]
     if (azureName) {
       this.app_name = azureName.split(',')
     }
@@ -1071,14 +1080,14 @@ Config.prototype._fromEnvironment = function _fromEnvironment(metadata, data) {
       return
     }
 
-    var node = metadata[value]
+    const node = metadata[value]
     if (typeof node === 'string') {
-      var setting = process.env[node]
+      const setting = process.env[node]
       if (setting) {
         logger.debug(`${node} environment variable set.`)
 
         if (ENV.LIST_VARS.has(node)) {
-          let split = ENV.LIST_VARS_CUSTOM_DELIMITERS[node] || /,/
+          const split = ENV.LIST_VARS_CUSTOM_DELIMITERS[node] || /,/
           data[value] = setting.split(split).map(function trimVal(k) {
             return k.trim()
           })
@@ -1267,7 +1276,7 @@ Config.prototype._enforceServerless = function _enforceServerless(inputConfig) {
  * based on special properties of configuration values should go here as well.
  */
 Config.prototype._canonicalize = function _canonicalize() {
-  var statusCodes = this.error_collector && this.error_collector.ignore_status_codes
+  const statusCodes = this.error_collector && this.error_collector.ignore_status_codes
   if (statusCodes) {
     this.error_collector.ignore_status_codes = _parseCodes(statusCodes)
   }
@@ -1277,17 +1286,17 @@ Config.prototype._canonicalize = function _canonicalize() {
     this.error_collector.expected_status_codes = _parseCodes(expectedCodes)
   }
 
-  var logAliases = {
+  const logAliases = {
     verbose: 'trace',
     debugging: 'debug',
     warning: 'warn',
     err: 'error'
   }
-  var level = this.logging.level
+  const level = this.logging.level
   this.logging.level = logAliases[level] || level
 
   if (this.host === '') {
-    var region = parseKey(this.license_key)
+    const region = parseKey(this.license_key)
     if (region) {
       this.host = 'collector.' + region + '.nr-data.net'
     } else {
@@ -1312,7 +1321,7 @@ Config.prototype._canonicalize = function _canonicalize() {
 function _parseCodes(codes) {
   // range does not support negative values
   function parseRange(range, parsed) {
-    var split = range.split('-')
+    const split = range.split('-')
     if (split.length !== 2) {
       logger.warn('Failed to parse range %s', range)
       return parsed
@@ -1321,8 +1330,8 @@ function _parseCodes(codes) {
       // catch negative code. ex. -7
       return parsed.push(parseInt(range, 10))
     }
-    var lower = parseInt(split[0], 10)
-    var upper = parseInt(split[1], 10)
+    const lower = parseInt(split[0], 10)
+    const upper = parseInt(split[1], 10)
     if (Number.isNaN(lower) || Number.isNaN(upper)) {
       logger.warn('Range must contain two numbers %s', range)
       return parsed
@@ -1333,21 +1342,21 @@ function _parseCodes(codes) {
       logger.warn('Range must be between 0 and 1000 %s', range)
     } else {
       // success
-      for (var i = lower; i <= upper; i++) {
+      for (let i = lower; i <= upper; i++) {
         parsed.push(i)
       }
     }
     return parsed
   }
 
-  var parsedCodes = []
-  for (var i = 0; i < codes.length; i++) {
-    var code = codes[i]
-    var parsedCode
+  const parsedCodes = []
+  for (let i = 0; i < codes.length; i++) {
+    const code = codes[i]
+
     if (typeof code === 'string' && code.indexOf('-') !== -1) {
       parseRange(code, parsedCodes)
     } else {
-      parsedCode = parseInt(code, 10)
+      const parsedCode = parseInt(code, 10)
       if (!Number.isNaN(parsedCode)) {
         parsedCodes.push(parsedCode)
       } else {
@@ -1363,7 +1372,7 @@ function _parseCodes(codes) {
  * them to be correct.
  */
 Config.prototype._applyHighSecurity = function _applyHighSecurity() {
-  var config = this
+  const config = this
   checkNode('', this, HSM.HIGH_SECURITY_SETTINGS)
   // as a one off, we add a global exclude rule to the list to keep from
   // clobbering user defined rules
@@ -1375,7 +1384,7 @@ Config.prototype._applyHighSecurity = function _applyHighSecurity() {
   }
 
   function checkKey(base, target, settings, key) {
-    var hsValue = settings[key]
+    const hsValue = settings[key]
 
     if (hsValue && typeof hsValue === 'object' && !(hsValue instanceof Array)) {
       if (typeof target[key] !== 'object') {
@@ -1406,8 +1415,8 @@ Config.prototype._applyHighSecurity = function _applyHighSecurity() {
  *  policies as the response payload.
  */
 Config.prototype.applyLasp = function applyLasp(agent, policies) {
-  var config = this
-  var keys = Object.keys(policies)
+  const config = this
+  const keys = Object.keys(policies)
 
   if (!config.security_policies_token) {
     if (keys.length) {
@@ -1419,12 +1428,12 @@ Config.prototype.applyLasp = function applyLasp(agent, policies) {
     return CollectorResponse.success(null)
   }
 
-  var missingLASP = []
-  var missingRequired = []
+  const missingLASP = []
+  const missingRequired = []
 
-  var finalPolicies = keys.reduce(function applyPolicy(obj, name) {
-    var policy = policies[name]
-    var localMapping = LASP_MAP[name]
+  const finalPolicies = keys.reduce(function applyPolicy(obj, name) {
+    const policy = policies[name]
+    const localMapping = LASP_MAP[name]
 
     if (!localMapping) {
       if (!policy.required) {
@@ -1434,22 +1443,22 @@ Config.prototype.applyLasp = function applyLasp(agent, policies) {
       // policy is required but does not exist in agent -- fail
       missingRequired.push(name)
     } else {
-      var splitConfigName = localMapping.path.split('.')
-      var settingBlock = config[splitConfigName[0]]
+      const splitConfigName = localMapping.path.split('.')
+      let settingBlock = config[splitConfigName[0]]
       // pull out the configuration subsection that the option lives in
-      for (var i = 1; i < splitConfigName.length - 1; ++i) {
+      for (let i = 1; i < splitConfigName.length - 1; ++i) {
         settingBlock = settingBlock[splitConfigName[i]]
       }
-      var valueName = splitConfigName[splitConfigName.length - 1]
-      var localVal = settingBlock[valueName]
+      const valueName = splitConfigName[splitConfigName.length - 1]
+      const localVal = settingBlock[valueName]
 
       // Indexes into "allowed values" based on "enabled" setting
       // to retrieve proper mapping.
-      var policyValues = localMapping.allowedValues
-      var policyValue = policyValues[policy.enabled ? 1 : 0]
+      const policyValues = localMapping.allowedValues
+      const policyValue = policyValues[policy.enabled ? 1 : 0]
 
       // get the most secure setting between local config and the policy
-      var finalValue = (settingBlock[valueName] = config._getMostSecure(
+      const finalValue = (settingBlock[valueName] = config._getMostSecure(
         name,
         localVal,
         policyValue
@@ -1534,9 +1543,9 @@ function redactValue(value) {
  * @return Object containing simple key-value pairs of settings
  */
 Config.prototype.publicSettings = function publicSettings() {
-  var settings = Object.create(null)
+  let settings = Object.create(null)
 
-  for (var key in this) {
+  for (const key in this) {
     if (this.hasOwnProperty(key) && !REMOVE_BEFORE_SEND.has(key)) {
       if (HSM.REDACT_BEFORE_SEND.has(key)) {
         const value = this[key]
@@ -1574,6 +1583,19 @@ Config.prototype.getAggregatorConfig = function getAggregatorConfig(method) {
   }
 }
 
+Config.prototype._warnDeprecations = function _warnDeprecations() {
+  // DT overrides CAT so only warn when CAT is actually used.
+  if (this.cross_application_tracer.enabled && !this.distributed_tracing.enabled) {
+    const deprecationWarning = [
+      '[Deprecation Warning]: Cross Application Tracing (CAT) has been deprecated and will be ',
+      'removed in a future major release. CAT has been replaced by Distributed Tracing (DT). ',
+      'Enable DT by setting distributed_tracing: { enabled: true }.'
+    ].join('')
+
+    logger.infoOnce('Deprecation:CAT', deprecationWarning)
+  }
+}
+
 /**
  * Create a configuration, either from a configuration file or the node
  * process's environment.
@@ -1614,7 +1636,7 @@ function initialize(config) {
     return createNewConfigObject(config)
   }
 
-  var filepath = _findConfigFile()
+  const filepath = _findConfigFile()
   if (!filepath) {
     logger.info(
       [
@@ -1630,7 +1652,7 @@ function initialize(config) {
     return createNewConfigObject(config)
   }
 
-  var userConf
+  let userConf
   try {
     userConf = require(filepath).config
   } catch (error) {
@@ -1711,6 +1733,5 @@ Config.initialize = initialize
 Config.getOrCreateInstance = getOrCreateInstance
 Config.getInstance = getInstance
 Config.createInstance = createInstance
-Config.SPAN_EVENT_LIMIT = SPAN_EVENT_LIMIT
 
 module.exports = Config

package/lib/config/lasp.js

@@ -29,9 +29,9 @@ const LASP_MAP = {
     // Tracks the precedent of settings controlled by LASP.
     filter: function mostSecureRecordSQL(first, second) {
       // Ordered from least to most secure
-      var recordSQLSettings = ['obfuscated', 'off']
-      var firstIdx = recordSQLSettings.indexOf(first)
-      var secondIdx = recordSQLSettings.indexOf(second)
+      const recordSQLSettings = ['obfuscated', 'off']
+      const firstIdx = recordSQLSettings.indexOf(first)
+      const secondIdx = recordSQLSettings.indexOf(second)
       if (firstIdx < 0 && secondIdx < 0) {
         // Return the most secure possible
         return recordSQLSettings[recordSQLSettings.length - 1]

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

@@ -8,7 +8,7 @@
 class MergeServerConfig {
   // eslint-disable-next-line max-params
   updateNestedIfChanged(config, remote, local, remoteKey, localKey, logger) {
-    var value = remote[remoteKey]
+    const value = remote[remoteKey]
 
     // if the value hasn't changed, skip this work.
     // currently, this will always treat objects as

package/lib/db/parse-sql.js

@@ -8,18 +8,18 @@
 // TODO: remove in favor of /lib/db/query-parsers/sql.js
 // This module is currently used only in the Oracle instrumentation
 
-var logger = require('../logger').child({ component: 'parse_sql' })
-var StatementMatcher = require('./statement-matcher')
-var ParsedStatement = require('./parsed-statement')
-var stringify = require('json-stringify-safe')
+const logger = require('../logger').child({ component: 'parse_sql' })
+const StatementMatcher = require('./statement-matcher')
+const ParsedStatement = require('./parsed-statement')
+const stringify = require('json-stringify-safe')
 
-var OPERATIONS = [
+const OPERATIONS = [
   new StatementMatcher('select', /^\s*select[\S\s]*from[\s\[]+([^\]\s,)(;]*).*/gi),
   new StatementMatcher('update', /^\s*update\s+([^\s,;]*).*/gi),
   new StatementMatcher('insert', /^\s*insert(?:\s+ignore)?\s+into\s+([^\s(,;]*).*/gi),
   new StatementMatcher('delete', /^\s*delete\s+from\s+([^\s,(;]*).*/gi)
 ]
-var COMMENT_PATTERN = /\/\\*.*?\\*\//
+const COMMENT_PATTERN = /\/\\*.*?\\*\//
 
 // This must be called synchronously after the initial db call for backtraces to
 // work correctly
@@ -44,9 +44,9 @@ module.exports = function parseSql(type, sql) {
 
   sql = sql.replace(COMMENT_PATTERN, '').trim()
 
-  var parsedStatement
+  let parsedStatement
 
-  for (var i = 0, l = OPERATIONS.length; i < l; i++) {
+  for (let i = 0, l = OPERATIONS.length; i < l; i++) {
     parsedStatement = OPERATIONS[i].getParsedStatement(sql)
     if (parsedStatement) {
       return new ParsedStatement(

package/lib/db/parsed-statement.js

@@ -22,12 +22,12 @@ function ParsedStatement(type, operation, collection, raw) {
 }
 
 ParsedStatement.prototype.recordMetrics = function recordMetrics(segment, scope) {
-  var duration = segment.getDurationInMillis()
-  var exclusive = segment.getExclusiveDurationInMillis()
-  var transaction = segment.transaction
-  var type = transaction.isWeb() ? DB.WEB : DB.OTHER
-  var thisTypeSlash = this.type + '/'
-  var operation = DB.OPERATION + '/' + thisTypeSlash + this.operation
+  const duration = segment.getDurationInMillis()
+  const exclusive = segment.getExclusiveDurationInMillis()
+  const transaction = segment.transaction
+  const type = transaction.isWeb() ? DB.WEB : DB.OTHER
+  const thisTypeSlash = this.type + '/'
+  const operation = DB.OPERATION + '/' + thisTypeSlash + this.operation
 
   // Note, an operation metric should _always_ be created even if the action was
   // a statement. This is part of the spec.
@@ -43,8 +43,9 @@ ParsedStatement.prototype.recordMetrics = function recordMetrics(segment, scope)
   // as the scoped metric for transaction breakdowns. Otherwise, skip the
   // 'statement' metric and use the 'operation' metric as the scoped metric for
   // transaction breakdowns.
+  let collection
   if (this.collection) {
-    var collection = DB.STATEMENT + '/' + thisTypeSlash + this.collection + '/' + this.operation
+    collection = DB.STATEMENT + '/' + thisTypeSlash + this.collection + '/' + this.operation
     transaction.measure(collection, null, duration, exclusive)
     if (scope) {
       transaction.measure(collection, scope, duration, exclusive)
@@ -61,7 +62,7 @@ ParsedStatement.prototype.recordMetrics = function recordMetrics(segment, scope)
   // Datastore instance metrics.
   const attributes = segment.attributes.get(DESTINATIONS.TRANS_SEGMENT)
   if (attributes.host && attributes.port_path_or_id) {
-    var instanceName =
+    const instanceName =
       DB.INSTANCE + '/' + thisTypeSlash + attributes.host + '/' + attributes.port_path_or_id
     transaction.measure(instanceName, null, duration, exclusive)
   }

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

@@ -5,11 +5,11 @@
 
 'use strict'
 
-var logger = require('../../logger').child({ component: 'sql_query_parser' })
-var StatementMatcher = require('../statement-matcher')
-var stringify = require('json-stringify-safe')
+const logger = require('../../logger').child({ component: 'sql_query_parser' })
+const StatementMatcher = require('../statement-matcher')
+const stringify = require('json-stringify-safe')
 
-var OPERATIONS = [
+const OPERATIONS = [
   new StatementMatcher(
     'select',
     /^[^\S]*?select\b[\s\S]+?\bfrom[\s\n\r\[\(]+([^\]\s\n\r,)(;]*)/gim
@@ -21,7 +21,7 @@ var OPERATIONS = [
   ),
   new StatementMatcher('delete', /^[^\S]*?delete[^\S]+?from[^\S]+([^\s\n\r,(;]+)/gim)
 ]
-var COMMENT_PATTERN = /\/\\*.*?\\*\//g
+const COMMENT_PATTERN = /\/\\*.*?\\*\//g
 
 // This must be called synchronously after the initial db call for backtraces to
 // work correctly
@@ -50,9 +50,9 @@ module.exports = function parseSql(sql) {
 
   sql = sql.replace(COMMENT_PATTERN, '').trim()
 
-  var parsedStatement
+  let parsedStatement
 
-  for (var i = 0, l = OPERATIONS.length; i < l; i++) {
+  for (let i = 0, l = OPERATIONS.length; i < l; i++) {
     parsedStatement = OPERATIONS[i].getParsedStatement(sql)
     if (parsedStatement) {
       break

package/lib/db/query-sample.js

@@ -5,9 +5,9 @@
 
 'use strict'
 
-var codec = require('../util/codec')
-var Stats = require('../stats')
-var util = require('util')
+const codec = require('../util/codec')
+const Stats = require('../stats')
+const util = require('util')
 
 function QuerySample(tracer, slowQuery) {
   Stats.call(this)
@@ -34,11 +34,11 @@ QuerySample.prototype.merge = function merge(sample) {
 }
 
 QuerySample.prototype.prepareJSON = function prepareJSON(done) {
-  var transaction = this.trace.segment.transaction
-  var sample = this
-  var trace = sample.trace
+  const transaction = this.trace.segment.transaction
+  const sample = this
+  const trace = sample.trace
 
-  var params = sample.getParams()
+  const params = sample.getParams()
 
   if (!this.tracer.config.simple_compression) {
     codec.encode(params, respond)
@@ -81,8 +81,8 @@ function _getJSON(sample, trace, transaction, data) {
 }
 
 QuerySample.prototype.getParams = function getParams() {
-  var segmentAttrs = this.trace.segment.getAttributes()
-  var params = {
+  const segmentAttrs = this.trace.segment.getAttributes()
+  const params = {
     backtrace: this.trace.trace
   }