newrelic 8.3.0 → 8.4.0

package/lib/transaction/trace/segment.js

@@ -137,8 +137,8 @@ TraceSegment.prototype.getSpanId = function getSpanId() {
 TraceSegment.prototype.captureDBInstanceAttributes = captureDBInstanceAttributes
 
 function captureDBInstanceAttributes(host, port, database) {
-  var config = this.transaction.agent.config
-  var dsTracerConf = config.datastore_tracer
+  const config = this.transaction.agent.config
+  const dsTracerConf = config.datastore_tracer
 
   // Add database name if provided and enabled.
   if (database !== false && dsTracerConf.database_name_reporting.enabled) {
@@ -185,7 +185,7 @@ TraceSegment.prototype.probe = function probe(action) {
  * the end).
  */
 TraceSegment.prototype.setNameFromTransaction = function setNameFromTransaction() {
-  var transaction = this.transaction
+  const transaction = this.transaction
 
   // transaction name and transaciton segment name must match
   this.name = transaction.getFullName()
@@ -203,10 +203,10 @@ TraceSegment.prototype.setNameFromTransaction = function setNameFromTransaction(
  * segment's parameters onto the transaction.
  */
 TraceSegment.prototype.markAsWeb = function markAsWeb() {
-  var transaction = this.transaction
+  const transaction = this.transaction
   this.setNameFromTransaction()
 
-  var traceAttrs = transaction.trace.attributes.get(DESTINATIONS.TRANS_TRACE)
+  const traceAttrs = transaction.trace.attributes.get(DESTINATIONS.TRANS_TRACE)
   Object.keys(traceAttrs).forEach((key) => {
     if (!this.attributes.has(key)) {
       this.addAttribute(key, traceAttrs[key])
@@ -262,9 +262,9 @@ TraceSegment.prototype.finalize = function finalize() {
  * in time.
  */
 TraceSegment.prototype._updateRootTimer = function _updateRootTimer() {
-  var root = this.transaction.trace.root
+  const root = this.transaction.trace.root
   if (this.timer.endsAfter(root.timer)) {
-    var newDuration = this.timer.start + this.getDurationInMillis() - root.timer.start
+    const newDuration = this.timer.start + this.getDurationInMillis() - root.timer.start
     root.overwriteDurationInMillis(newDuration)
   }
 }
@@ -290,8 +290,8 @@ TraceSegment.prototype.add = function add(childName, recorder) {
     return this
   }
   logger.trace('Adding segment %s to %s in %s', childName, this.name, this.transaction.id)
-  var segment = new TraceSegment(this.transaction, childName, recorder)
-  var config = this.transaction.agent.config
+  const segment = new TraceSegment(this.transaction, childName, recorder)
+  const config = this.transaction.agent.config
 
   if (this.transaction.trace.segmentsSeen++ >= config.max_trace_segments) {
     segment._collect = false
@@ -350,8 +350,8 @@ function getExclusiveDurationInMillis() {
 }
 
 TraceSegment.prototype.getChildren = function getChildren() {
-  var children = []
-  for (var i = 0, len = this.children.length; i < len; ++i) {
+  const children = []
+  for (let i = 0, len = this.children.length; i < len; ++i) {
     if (!this.children[i].ignore) {
       children.push(this.children[i])
     }
@@ -360,8 +360,8 @@ TraceSegment.prototype.getChildren = function getChildren() {
 }
 
 TraceSegment.prototype.getCollectedChildren = function getCollectedChildren() {
-  var children = []
-  for (var i = 0, len = this.children.length; i < len; ++i) {
+  const children = []
+  for (let i = 0, len = this.children.length; i < len; ++i) {
     if (this.children[i]._collect && !this.children[i].ignore) {
       children.push(this.children[i])
     }
@@ -388,11 +388,11 @@ TraceSegment.prototype._getChildPairs = function _getChildPairs(end) {
     end = Infinity
   }
 
-  var children = this.getChildren()
-  var childPairs = []
+  let children = this.getChildren()
+  const childPairs = []
   while (children.length) {
-    var child = children.pop()
-    var pair = child.timer.toRange()
+    const child = children.pop()
+    const pair = child.timer.toRange()
 
     if (pair[0] >= end) {
       continue
@@ -460,7 +460,7 @@ TraceSegment.prototype.toJSON = function toJSON() {
       // push the children and the parent's children array into the stack.
       // to preserve the chronological order of the children, push them
       // onto the stack backwards (so the first one created is on top).
-      for (var i = segmentChildren.length - 1; i >= 0; --i) {
+      for (let i = segmentChildren.length - 1; i >= 0; --i) {
         segmentsToProcess.push({
           segment: segmentChildren[i],
           destination: childArray

package/lib/transaction/tracecontext.js

@@ -375,7 +375,7 @@ class TraceContext {
    * instrinsics on any relevant New Relic tracestate strings found
    */
   _validateAndParseTraceStateHeader(tracestate) {
-    let tsd = {
+    const tsd = {
       entryFound: false,
       entryValid: undefined,
       entryInvalidReason: undefined,

package/lib/transaction/tracer/index.js

@@ -5,14 +5,14 @@
 
 'use strict'
 
-var Transaction = require('../index.js')
-var logger = require('../../logger').child({ component: 'tracer' })
+const Transaction = require('../index.js')
+const logger = require('../../logger').child({ component: 'tracer' })
 
 /*
  * CONSTANTS
  */
-var ORIGINAL = '__NR_original'
-var SEGMENT = '__NR_segment'
+const ORIGINAL = '__NR_original'
+const SEGMENT = '__NR_segment'
 
 module.exports = Tracer
 
@@ -73,7 +73,7 @@ function getSpanContext() {
 }
 
 function createSegment(name, recorder, _parent) {
-  var parent = _parent || this.segment
+  const parent = _parent || this.segment
   if (!parent || !parent.transaction.isActive()) {
     logger.trace(
       {
@@ -93,7 +93,7 @@ function addSegment(name, recorder, parent, full, task) {
     throw new Error('task must be a function')
   }
 
-  var segment = this.createSegment(name, recorder, parent)
+  const segment = this.createSegment(name, recorder, parent)
 
   return this.bindFunction(task, segment, full)(segment)
 }
@@ -104,14 +104,14 @@ function transactionProxy(handler) {
     return handler
   }
 
-  var tracer = this
-  var wrapped = function wrapTransactionInvocation() {
+  const tracer = this
+  const wrapped = function wrapTransactionInvocation() {
     if (!tracer.agent.canCollectData()) {
       return handler.apply(this, arguments)
     }
 
     // don't nest transactions, reuse existing ones
-    var segment = tracer.segment
+    const segment = tracer.segment
     if (segment) {
       if (segment.transaction.traceStacks) {
         segment.probe('!!! Nested transaction creation !!!')
@@ -127,7 +127,7 @@ function transactionProxy(handler) {
       tracer.agent.recordSupportability('Nodejs/Transactions/Nested')
       return handler.apply(this, arguments)
     }
-    var transaction = new Transaction(tracer.agent)
+    const transaction = new Transaction(tracer.agent)
     return tracer.bindFunction(handler, transaction.trace.root, true).apply(this, arguments)
   }
 
@@ -157,17 +157,17 @@ function transactionNestProxy(type, handler) {
     return handler
   }
 
-  var tracer = this
-  var wrapped = function wrapTransactionInvocation() {
+  const tracer = this
+  const wrapped = function wrapTransactionInvocation() {
     if (!tracer.agent.canCollectData()) {
       return handler.apply(this, arguments)
     }
 
     // don't nest transactions, reuse existing ones
-    var transaction = tracer.getTransaction()
-    var segment = tracer.segment
+    let transaction = tracer.getTransaction()
+    let segment = tracer.segment
 
-    var createNew = false
+    let createNew = false
 
     if (!transaction || transaction.type !== type) {
       createNew = true
@@ -201,7 +201,7 @@ function _makeWrapped(tracer, handler, active, full) {
   return wrapped
 
   function wrapped() {
-    var prev = tracer.segment
+    const prev = tracer.segment
     tracer.segment = active
     if (active && full) {
       active.start()
@@ -238,7 +238,7 @@ function bindEmitter(emitter, segment) {
     return emitter
   }
 
-  var emit = getOriginal(emitter.emit)
+  const emit = getOriginal(emitter.emit)
   emitter.emit = this.bindFunction(emit, segment)
 
   return emitter
@@ -260,10 +260,10 @@ function argSlice(args) {
    *  inlining.
    *
    */
-  var length = args.length
-  var array = new Array(length)
+  const length = args.length
+  const array = new Array(length)
 
-  for (var i = 0; i < length; i++) {
+  for (let i = 0; i < length; i++) {
     array[i] = args[i]
   }
 
@@ -276,7 +276,7 @@ function wrapFunctionNoSegment(original, name, wrapper) {
   }
 
   logger.trace('Wrapping function %s (no segment)', name || original.name || 'anonymous')
-  var tracer = this
+  const tracer = this
 
   return wrappedFunction
 
@@ -284,11 +284,11 @@ function wrapFunctionNoSegment(original, name, wrapper) {
     if (!tracer.getTransaction()) {
       return original.apply(this, arguments)
     }
-    var args = tracer.slice(arguments)
+    let args = tracer.slice(arguments)
 
     if (wrapper === undefined) {
-      var last = args.length - 1
-      var cb = args[last]
+      const last = args.length - 1
+      const cb = args[last]
       if (typeof cb === 'function') {
         args[last] = tracer.bindFunction(cb)
       }
@@ -305,7 +305,7 @@ function wrapFunctionFirstNoSegment(original, name) {
   }
 
   logger.trace('Wrapping function %s (no segment)', name || original.name || 'anonymous')
-  var tracer = this
+  const tracer = this
 
   return wrappedFunction
 
@@ -313,8 +313,8 @@ function wrapFunctionFirstNoSegment(original, name) {
     if (!tracer.getTransaction()) {
       return original.apply(this, arguments)
     }
-    var args = tracer.slice(arguments)
-    var cb = args[0]
+    const args = tracer.slice(arguments)
+    const cb = args[0]
     if (typeof cb === 'function') {
       args[0] = tracer.bindFunction(cb)
     }
@@ -329,25 +329,25 @@ function wrapFunctionLast(name, recorder, original) {
   }
 
   logger.trace('Wrapping %s as a callback-last function', name)
-  var tracer = this
+  const tracer = this
 
   return wrappedFunction
 
   function wrappedFunction() {
-    var transaction = tracer.getTransaction()
+    const transaction = tracer.getTransaction()
     if (!transaction) {
       logger.trace('Not creating segment "%s" because no transaction was active', name)
       return original.apply(this, arguments)
     }
 
     logger.trace('Creating "%s" segment for transaction %s.', name, transaction.id)
-    var args = tracer.slice(arguments)
-    var last = args.length - 1
-    var cb = args[last]
+    const args = tracer.slice(arguments)
+    const last = args.length - 1
+    const cb = args[last]
     if (typeof cb !== 'function') {
       return original.apply(this, arguments)
     }
-    var child = tracer.createSegment(name, recorder)
+    const child = tracer.createSegment(name, recorder)
     args[last] = tracer.wrapCallback(cb, child, wrappedCallback)
     child.start()
     return tracer.bindFunction(original, child).apply(this, args)
@@ -367,24 +367,24 @@ function wrapFunctionFirst(name, recorder, original) {
   }
 
   logger.trace('Wrapping %s as a callback-first function', name)
-  var tracer = this
+  const tracer = this
 
   return wrappedFunction
 
   function wrappedFunction() {
-    var transaction = tracer.getTransaction()
+    const transaction = tracer.getTransaction()
     if (!transaction) {
       logger.trace('Not creating segment "%s" because no transaction was active', name)
       return original.apply(this, arguments)
     }
 
     logger.trace('Creating "%s" segment for transaction %s.', name, transaction.id)
-    var args = tracer.slice(arguments)
-    var cb = args[0]
+    const args = tracer.slice(arguments)
+    const cb = args[0]
     if (typeof cb !== 'function') {
       return original.apply(this, arguments)
     }
-    var child = tracer.createSegment(name, recorder)
+    const child = tracer.createSegment(name, recorder)
     args[0] = tracer.wrapCallback(cb, child, wrappedCallback)
     child.start()
     return tracer.bindFunction(original, child).apply(this, args)
@@ -392,7 +392,7 @@ function wrapFunctionFirst(name, recorder, original) {
     function wrappedCallback() {
       logger.trace('Ending "%s" segment for transaction %s.', name, transaction.id)
       child.touch()
-      var result = cb.apply(this, arguments)
+      const result = cb.apply(this, arguments)
       return result
     }
   }
@@ -406,12 +406,12 @@ function wrapFunction(name, recorder, original, wrapper, resp) {
 
   logger.trace('Wrapping %s using a custom wrapper', name)
 
-  var tracer = this
+  const tracer = this
 
   return wrappedFunction
 
   function wrappedFunction() {
-    var transaction = tracer.getTransaction()
+    const transaction = tracer.getTransaction()
     if (!transaction) {
       logger.trace('Not creating segment "%s" because no transaction was active', name)
       return original.apply(this, arguments)
@@ -419,10 +419,10 @@ function wrapFunction(name, recorder, original, wrapper, resp) {
 
     logger.trace('Creating "%s" segment for transaction %s.', name, transaction.id)
 
-    var child = tracer.createSegment(name, recorder)
-    var args = wrapper.call(this, child, tracer.slice(arguments), bind)
+    const child = tracer.createSegment(name, recorder)
+    const args = wrapper.call(this, child, tracer.slice(arguments), bind)
     child.start()
-    var result = tracer.bindFunction(original, child).apply(this, args)
+    let result = tracer.bindFunction(original, child).apply(this, args)
     if (resp) {
       result = resp.call(this, child, result, bind)
     }
@@ -449,18 +449,18 @@ function wrapSyncFunction(name, recorder, original) {
 
   logger.trace('Wrapping "%s" as a synchronous function', name)
 
-  var tracer = this
+  const tracer = this
 
   return wrappedFunction
 
   function wrappedFunction() {
-    var transaction = tracer.getTransaction()
+    const transaction = tracer.getTransaction()
     if (!transaction) {
       logger.trace('Not creating segment "%s" because no transaction was active', name)
       return original.apply(this, arguments)
     }
     logger.trace('Creating "%s" sync segment for transaction %s.', name, transaction.id)
-    var child = tracer.createSegment(name, recorder)
+    const child = tracer.createSegment(name, recorder)
     if (child) {
       child.async = false
     }
@@ -469,7 +469,7 @@ function wrapSyncFunction(name, recorder, original) {
 }
 
 function wrapCallback(original, segment, wrapped) {
-  var tracer = this
+  const tracer = this
 
   if (typeof original !== 'function') {
     return original
@@ -483,7 +483,11 @@ function wrapCallback(original, segment, wrapped) {
         wrapped[ORIGINAL] = original
       }
 
-      var child = tracer.createSegment('Callback: ' + (original.name || 'anonymous'), null, segment)
+      const child = tracer.createSegment(
+        'Callback: ' + (original.name || 'anonymous'),
+        null,
+        segment
+      )
 
       if (child) {
         child.async = false

package/lib/uninstrumented.js

@@ -5,20 +5,20 @@
 
 'use strict'
 
-var path = require('path')
-var logger = require('./logger')
-var NAMES = require('./metrics/names')
-var properties = require('./util/properties')
+const path = require('path')
+const logger = require('./logger')
+const NAMES = require('./metrics/names')
+const properties = require('./util/properties')
 const shimmer = require('./shimmer')
 
 // Static variable holding map of un-instrumented modules for use in the future
-var uninstrumented = Object.create(null)
+const uninstrumented = Object.create(null)
 
 // Log a helpful message about un-instrumented modules
 function logUninstrumented() {
   const modules = Object.keys(uninstrumented)
   if (modules.length > 0) {
-    var message =
+    let message =
       'The newrelic module must be the first module required.\n' +
       'The following modules were required before newrelic and are not being ' +
       'instrumented:'
@@ -57,7 +57,7 @@ function check() {
   // and mysql2 work.
   instrumentations.push('pg.js', 'mysql2')
 
-  for (var filename in require.cache) {
+  for (const filename in require.cache) {
     if (!properties.hasOwn(require.cache, filename)) {
       continue
     }

package/lib/util/arity.js

@@ -5,14 +5,14 @@
 
 'use strict'
 
-var hasOwnProperty = require('./properties').hasOwn
+const hasOwnProperty = require('./properties').hasOwn
 
 // Starting in what we believe to be Node v4 you can set the name and length of
 // a function as properties. This is more ideal than wrapping a function.
 exports.fixArity = fixArity
 
 function fixArity(original, wrapper) {
-  var toDefine = {
+  const toDefine = {
     name: { value: original.name },
     length: { value: original.length }
   }

package/lib/util/byte-limit.js

@@ -48,16 +48,16 @@ function truncate(val, limit) {
   // Our limitation is on byte length, and the string could contain multi-byte
   // characters. Doing a byte-substring could chop a character in half. Instead
   // we do a binary search over the byte length of the substrings.
-  var substrLen = val.length
-  var delta = Math.ceil(substrLen / 2)
-  var cmpVal = compareLength(val.substring(0, substrLen), limit)
+  let substrLen = val.length
+  let delta = Math.ceil(substrLen / 2)
+  let cmpVal = compareLength(val.substring(0, substrLen), limit)
 
   // Continue the binary search till:
   // 1) The string is the desired length (i.e. cmpVal = 0) OR
   // 2) The desired string must split a character to achieve the desired byte length
   //    In this case, we should cut the character that would be split.
   //    (i.e. delta > 1 character OR the string is larger than the limit)
-  var substr
+  let substr
   while (cmpVal && (cmpVal > 0 || delta > 1)) {
     substrLen = cmpVal < 0 ? substrLen + delta : substrLen - delta
     substr = val.substring(0, substrLen)