newrelic 7.5.2 → 8.3.0

package/lib/transaction/tracecontext.js

@@ -5,7 +5,7 @@
 
 'use strict'
 
-const logger = require('../logger').child({component: 'TraceContext'})
+const logger = require('../logger').child({ component: 'TraceContext' })
 const hashes = require('../util/hashes')
 
 const TRACE_CONTEXT_PARENT_HEADER = 'traceparent'
@@ -89,8 +89,8 @@ class TraceContext {
     if (!accountId || !appId || !trustedAccountKey) {
       logger.debug(
         'Unable to create tracestate header due to missing required fields ' +
-        '(account_id: %s, primary_application_id: %s, trusted_account_key: %s) in transaction %s' +
-        'This may occur if a trace is created prior to the agent fully starting.',
+          '(account_id: %s, primary_application_id: %s, trusted_account_key: %s) in transaction %s' +
+          'This may occur if a trace is created prior to the agent fully starting.',
         accountId,
         appId,
         trustedAccountKey,
@@ -122,7 +122,8 @@ class TraceContext {
     const priority = this.transaction.priority ? this.transaction.priority.toFixed(6) : ''
     const timestamp = Date.now()
 
-    const nrTraceState = `${trustedAccountKey}@nr=${version}-${parentType}-${accountId}` +
+    const nrTraceState =
+      `${trustedAccountKey}@nr=${version}-${parentType}-${accountId}` +
       `-${appId}-${spanId}-${transactionId}-${sampled}-${priority}-${timestamp}`
 
     if (this._traceStateRaw) {
@@ -220,15 +221,9 @@ class TraceContext {
       traceContextData.traceId = parsedParent.traceId
       traceContextData.parentSpanId = parsedParent.parentId
     } else {
-      logger.trace(
-        'Invalid traceparent for transaction %s: %s',
-        this.transaction.id,
-        traceparent
-      )
+      logger.trace('Invalid traceparent for transaction %s: %s', this.transaction.id, traceparent)
 
-      this.transaction.agent.recordSupportability(
-        'TraceContext/TraceParent/Parse/Exception'
-      )
+      this.transaction.agent.recordSupportability('TraceContext/TraceParent/Parse/Exception')
       // From the W3C spec: If the vendor failed to parse traceparent, it MUST NOT
       // attempt to parse tracestate
       return traceContextData
@@ -246,10 +241,7 @@ class TraceContext {
     const parsedState = this._validateAndParseTraceStateHeader(tracestate)
 
     if (!parsedState.traceStateValid) {
-      logger.trace('Invalid tracestate for transaction %s: %s',
-        this.transaction.id,
-        tracestate
-      )
+      logger.trace('Invalid tracestate for transaction %s: %s', this.transaction.id, tracestate)
 
       this.transaction.agent.recordSupportability('TraceContext/TraceState/Parse/Exception')
       return traceContextData
@@ -261,10 +253,7 @@ class TraceContext {
     // These need to be kept to be added to root span events as an attribute
     this.tracingVendors = parsedState.vendors
 
-    if (
-      parsedState.intrinsics &&
-      parsedState.intrinsics.version !== NR_TRACESTATE_VERSION
-    ) {
+    if (parsedState.intrinsics && parsedState.intrinsics.version !== NR_TRACESTATE_VERSION) {
       logger.trace(
         'Incoming tracestate version: %s, agent tracestate version: %s',
         parsedState.intrinsics.version,
@@ -282,20 +271,19 @@ class TraceContext {
       traceContextData.transactionId = parsedState.intrinsics.transactionId
       traceContextData.sampled = parsedState.intrinsics.sampled
       traceContextData.priority = parsedState.intrinsics.priority
-      traceContextData.transportDuration =
-        Math.max(0, (Date.now() - parsedState.intrinsics.timestamp) / 1000)
+      traceContextData.transportDuration = Math.max(
+        0,
+        (Date.now() - parsedState.intrinsics.timestamp) / 1000
+      )
 
       this.trustedParentId = parsedState.intrinsics.spanId
       this._traceStateRaw = parsedState.newTraceState
 
       this.transaction.agent.recordSupportability('TraceContext/Accept/Success')
     } else if (parsedState.entryFound) {
-      logger.error('Invalid tracestate for transaction %s: %s',
-        this.transaction.id, tracestate)
+      logger.error('Invalid tracestate for transaction %s: %s', this.transaction.id, tracestate)
 
-      this.transaction.agent.recordSupportability(
-        'TraceContext/TraceState/InvalidNrEntry'
-      )
+      this.transaction.agent.recordSupportability('TraceContext/TraceState/InvalidNrEntry')
     }
 
     return traceContextData
@@ -405,8 +393,8 @@ class TraceContext {
     if (!hasTrustKey) {
       logger.debug(
         'Unable to accept any New Relic tracestate list members. ' +
-        'Missing trusted_account_key. ' +
-        'This may occur if a trace is received prior to the agent fully starting.'
+          'Missing trusted_account_key. ' +
+          'This may occur if a trace is received prior to the agent fully starting.'
       )
 
       this.transaction.agent.recordSupportability('TraceContext/TraceState/Accept/Exception')
@@ -429,14 +417,15 @@ class TraceContext {
         if (listMemberParts.length !== 2) {
           tsd.traceStateValid = false
           logger.debug('Unable to parse tracestate list members.')
-          this.transaction.agent
-            .recordSupportability('TraceContext/TraceState/Parse/Exception/ListMember')
+          this.transaction.agent.recordSupportability(
+            'TraceContext/TraceState/Parse/Exception/ListMember'
+          )
 
           return tsd
         }
 
         const [vendorKey, vendorValue] = listMemberParts
-        if (hasTrustKey && (vendorKey === expectedNrKey)) {
+        if (hasTrustKey && vendorKey === expectedNrKey) {
           // Matching members do not get added to vendors.
           // We'll replace the first valid entry and drop the rest
           // (which would be invalid members if they exist).
@@ -510,18 +499,17 @@ class TraceContext {
     const intrinsics = this._parseIntrinsics(nrTracestateValue)
 
     // Functions that return true when the field is invalid
-    const isNull = v => v == null
+    const isNull = (v) => v == null
     const intrinsicInvalidations = {
-      version: isNaN,     // required, int
+      version: isNaN, // required, int
       parentType: isNull, // required, str
-      accountId: isNull,  // required, str
-      appId: isNull,      // required, str
-      sampled:  v => v == null ? false : isNaN(v), // not required, int
-      priority: v => v == null ? false : isNaN(v), // not required, float
-      timestamp: isNaN    // required, int
+      accountId: isNull, // required, str
+      appId: isNull, // required, str
+      sampled: (v) => (v == null ? false : isNaN(v)), // not required, int
+      priority: (v) => (v == null ? false : isNaN(v)), // not required, float
+      timestamp: isNaN // required, int
     }
 
-
     // If a field is found invalid, flag the entry as not valid
     intrinsics.entryValid = true
     for (const key of Object.keys(intrinsicInvalidations)) {
@@ -538,7 +526,9 @@ class TraceContext {
     }
 
     intrinsics.parentType = PARENT_TYPES[intrinsics.parentType]
-    if (!intrinsics.parentType) intrinsics.entryValid = false
+    if (!intrinsics.parentType) {
+      intrinsics.entryValid = false
+    }
 
     return intrinsics
   }
@@ -554,10 +544,10 @@ class TraceContext {
       parentType: parseInt,
 
       // these two can be null, don't try to parse a null
-      sampled: v => v == null ? v : parseInt(v, 10),
-      priority: v => v == null ? v : parseFloat(v),
+      sampled: (v) => (v == null ? v : parseInt(v, 10)),
+      priority: (v) => (v == null ? v : parseFloat(v)),
 
-      timestamp: parseInt,
+      timestamp: parseInt
     }
 
     for (const key of Object.keys(intrinsicConversions)) {
@@ -575,7 +565,9 @@ class TraceContext {
 
     // convert empty strings to null
     splitValues.forEach((value, i) => {
-      if (value === '') splitValues[i] = null
+      if (value === '') {
+        splitValues[i] = null
+      }
     })
 
     const intrinsics = {

package/lib/transaction/tracer/index.js

@@ -6,7 +6,7 @@
 'use strict'
 
 var Transaction = require('../index.js')
-var logger = require('../../logger').child({component: 'tracer'})
+var logger = require('../../logger').child({ component: 'tracer' })
 
 /*
  * CONSTANTS
@@ -14,11 +14,12 @@ var logger = require('../../logger').child({component: 'tracer'})
 var ORIGINAL = '__NR_original'
 var SEGMENT = '__NR_segment'
 
-
 module.exports = Tracer
 
 function Tracer(agent) {
-  if (!agent) throw new Error("Must be initialized with an agent.")
+  if (!agent) {
+    throw new Error('Must be initialized with an agent.')
+  }
 
   this.agent = agent
   this._segment = null
@@ -51,7 +52,7 @@ Object.defineProperty(Tracer.prototype, 'segment', {
   set: function segmentSetter(segment) {
     this._segment && this._segment.probe('Segment removed from tracer')
     segment && segment.probe('Set tracer.segment')
-    return this._segment = segment
+    return (this._segment = segment)
   }
 })
 
@@ -74,10 +75,14 @@ function getSpanContext() {
 function createSegment(name, recorder, _parent) {
   var parent = _parent || this.segment
   if (!parent || !parent.transaction.isActive()) {
-    logger.trace({
-      hasParent: !!parent,
-      transactionActive: (parent && parent.transaction.isActive())
-    }, 'Not creating segment %s, no parent or active transaction available.', name)
+    logger.trace(
+      {
+        hasParent: !!parent,
+        transactionActive: parent && parent.transaction.isActive()
+      },
+      'Not creating segment %s, no parent or active transaction available.',
+      name
+    )
     return null
   }
   return parent.add(name, recorder)
@@ -95,7 +100,9 @@ function addSegment(name, recorder, parent, full, task) {
 
 function transactionProxy(handler) {
   // if there's no handler, there's nothing to proxy.
-  if (typeof handler !== 'function') return handler
+  if (typeof handler !== 'function') {
+    return handler
+  }
 
   var tracer = this
   var wrapped = function wrapTransactionInvocation() {
@@ -110,16 +117,18 @@ function transactionProxy(handler) {
         segment.probe('!!! Nested transaction creation !!!')
         segment.transaction.traceFlag = true // Will log the stacks when it ends.
       }
-      logger.warn({
-        transaction: {id: segment.transaction.id, name: segment.transaction.getName()},
-        segment: segment.name
-      }, 'Active transaction when creating non-nested transaction')
+      logger.warn(
+        {
+          transaction: { id: segment.transaction.id, name: segment.transaction.getName() },
+          segment: segment.name
+        },
+        'Active transaction when creating non-nested transaction'
+      )
       tracer.agent.recordSupportability('Nodejs/Transactions/Nested')
       return handler.apply(this, arguments)
     }
     var transaction = new Transaction(tracer.agent)
-    return tracer.bindFunction(handler, transaction.trace.root, true)
-      .apply(this, arguments)
+    return tracer.bindFunction(handler, transaction.trace.root, true).apply(this, arguments)
   }
 
   wrapped[ORIGINAL] = handler
@@ -127,7 +136,6 @@ function transactionProxy(handler) {
   return wrapped
 }
 
-
 /**
  * Use transactionNestProxy to wrap a closure that is a top-level handler that
  * is meant to start transactions. This wraps the first half of asynchronous
@@ -145,7 +153,9 @@ function transactionNestProxy(type, handler) {
     type = undefined
   }
   // if there's no handler, there's nothing to proxy.
-  if (typeof handler !== 'function') return handler
+  if (typeof handler !== 'function') {
+    return handler
+  }
 
   var tracer = this
   var wrapped = function wrapTransactionInvocation() {
@@ -193,11 +203,13 @@ function _makeWrapped(tracer, handler, active, full) {
   function wrapped() {
     var prev = tracer.segment
     tracer.segment = active
-    if (active && full) active.start()
+    if (active && full) {
+      active.start()
+    }
     try {
       return handler.apply(this, arguments)
     } catch (err) {
-      logger.trace(err, "Error from wrapped function:")
+      logger.trace(err, 'Error from wrapped function:')
 
       if (prev === null && process.domain != null) {
         process.domain.__NR_transactionSegment = tracer.segment
@@ -205,7 +217,9 @@ function _makeWrapped(tracer, handler, active, full) {
 
       throw err // Re-throwing application error, this is not an agent error.
     } finally {
-      if (active && full) active.touch()
+      if (active && full) {
+        active.touch()
+      }
       tracer.segment = prev
     }
   }
@@ -257,7 +271,9 @@ function argSlice(args) {
 }
 
 function wrapFunctionNoSegment(original, name, wrapper) {
-  if (typeof original !== 'function') return original
+  if (typeof original !== 'function') {
+    return original
+  }
 
   logger.trace('Wrapping function %s (no segment)', name || original.name || 'anonymous')
   var tracer = this
@@ -265,7 +281,9 @@ function wrapFunctionNoSegment(original, name, wrapper) {
   return wrappedFunction
 
   function wrappedFunction() {
-    if (!tracer.getTransaction()) return original.apply(this, arguments)
+    if (!tracer.getTransaction()) {
+      return original.apply(this, arguments)
+    }
     var args = tracer.slice(arguments)
 
     if (wrapper === undefined) {
@@ -282,7 +300,9 @@ function wrapFunctionNoSegment(original, name, wrapper) {
 }
 
 function wrapFunctionFirstNoSegment(original, name) {
-  if (typeof original !== 'function') return original
+  if (typeof original !== 'function') {
+    return original
+  }
 
   logger.trace('Wrapping function %s (no segment)', name || original.name || 'anonymous')
   var tracer = this
@@ -290,7 +310,9 @@ function wrapFunctionFirstNoSegment(original, name) {
   return wrappedFunction
 
   function wrappedFunction() {
-    if (!tracer.getTransaction()) return original.apply(this, arguments)
+    if (!tracer.getTransaction()) {
+      return original.apply(this, arguments)
+    }
     var args = tracer.slice(arguments)
     var cb = args[0]
     if (typeof cb === 'function') {
@@ -322,7 +344,9 @@ function wrapFunctionLast(name, recorder, original) {
     var args = tracer.slice(arguments)
     var last = args.length - 1
     var cb = args[last]
-    if (typeof cb !== 'function') return original.apply(this, arguments)
+    if (typeof cb !== 'function') {
+      return original.apply(this, arguments)
+    }
     var child = tracer.createSegment(name, recorder)
     args[last] = tracer.wrapCallback(cb, child, wrappedCallback)
     child.start()
@@ -357,7 +381,9 @@ function wrapFunctionFirst(name, recorder, original) {
     logger.trace('Creating "%s" segment for transaction %s.', name, transaction.id)
     var args = tracer.slice(arguments)
     var cb = args[0]
-    if (typeof cb !== 'function') return original.apply(this, arguments)
+    if (typeof cb !== 'function') {
+      return original.apply(this, arguments)
+    }
     var child = tracer.createSegment(name, recorder)
     args[0] = tracer.wrapCallback(cb, child, wrappedCallback)
     child.start()
@@ -397,11 +423,15 @@ function wrapFunction(name, recorder, original, wrapper, resp) {
     var args = wrapper.call(this, child, tracer.slice(arguments), bind)
     child.start()
     var result = tracer.bindFunction(original, child).apply(this, args)
-    if (resp) result = resp.call(this, child, result, bind)
+    if (resp) {
+      result = resp.call(this, child, result, bind)
+    }
     return result
 
     function bind(fn) {
-      if (!fn) return fn
+      if (!fn) {
+        return fn
+      }
       return tracer.wrapCallback(fn, child, function nrWrappedHandler() {
         logger.trace('Touching "%s" segment for transaction %s.', name, transaction.id)
         child.touch()
@@ -431,7 +461,9 @@ function wrapSyncFunction(name, recorder, original) {
     }
     logger.trace('Creating "%s" sync segment for transaction %s.', name, transaction.id)
     var child = tracer.createSegment(name, recorder)
-    if (child) child.async = false
+    if (child) {
+      child.async = false
+    }
     return tracer.bindFunction(original, child, true).apply(this, arguments)
   }
 }
@@ -439,24 +471,27 @@ function wrapSyncFunction(name, recorder, original) {
 function wrapCallback(original, segment, wrapped) {
   var tracer = this
 
-  if (typeof original !== 'function') return original
+  if (typeof original !== 'function') {
+    return original
+  }
 
-  logger.trace(
-    'Wrapping callback for "%s" segment',
-    segment ? segment.name : 'unknown'
-  )
+  logger.trace('Wrapping callback for "%s" segment', segment ? segment.name : 'unknown')
 
-  return tracer.bindFunction(function wrappedCallback() {
-    if (wrapped) wrapped[ORIGINAL] = original
+  return tracer.bindFunction(
+    function wrappedCallback() {
+      if (wrapped) {
+        wrapped[ORIGINAL] = original
+      }
 
-    var child = tracer.createSegment(
-      'Callback: ' + (original.name || 'anonymous'),
-      null,
-      segment
-    )
+      var child = tracer.createSegment('Callback: ' + (original.name || 'anonymous'), null, segment)
 
-    if (child) child.async = false
+      if (child) {
+        child.async = false
+      }
 
-    return tracer.bindFunction(wrapped || original, child, true).apply(this, arguments)
-  }, segment, false)
+      return tracer.bindFunction(wrapped || original, child, true).apply(this, arguments)
+    },
+    segment,
+    false
+  )
 }

package/lib/transaction/transaction-event-aggregator.js

@@ -6,7 +6,7 @@
 'use strict'
 
 const async = require('async')
-const logger = require('../logger').child({component: 'transaction-event-aggregator'})
+const logger = require('../logger').child({ component: 'transaction-event-aggregator' })
 const EventAggregator = require('../aggregators/event-aggregator')
 
 const NAMES = require('../metrics/names')
@@ -80,7 +80,6 @@ class TransactionEventAggregator extends EventAggregator {
     const firstHalfEventData = firstHalfRawEvents.map(this._rawEventsToValues)
     const firstPayload = [this.runId, firstMetrics, firstHalfEventData]
 
-
     const secondHalfRawEvents = events
     const secondMetrics = {
       reservoir_size: data.limit - limit,
@@ -89,10 +88,9 @@ class TransactionEventAggregator extends EventAggregator {
     const secondHalfEventData = secondHalfRawEvents.map(this._rawEventsToValues)
     const secondPayload = [this.runId, secondMetrics, secondHalfEventData]
 
-
     const eventPayloadPairs = [
       { rawData: firstHalfRawEvents, payload: firstPayload },
-      { rawData: secondHalfRawEvents, payload: secondPayload}
+      { rawData: secondHalfRawEvents, payload: secondPayload }
     ]
 
     return eventPayloadPairs
@@ -106,38 +104,38 @@ class TransactionEventAggregator extends EventAggregator {
     const self = this
 
     // Send payloads one at a time
-    async.eachOfSeries(eventPayloadPairs, (payloadPair, index, asyncCallback) => {
-      logger.debug(
-        'Sending payload %d of %d to %s',
-        index + 1,
-        eventPayloadPairs.length,
-        self.method
-      )
-
-      self._sendSplitPayload(payloadPair.rawData, payloadPair.payload, (error) => {
-        if (error) {
-          logger.warn(error, 'An error occurred sending payload')
-        }
-
-        logger.trace(
-          'Finished sending payload %d of %d to %s',
+    async.eachOfSeries(
+      eventPayloadPairs,
+      (payloadPair, index, asyncCallback) => {
+        logger.debug(
+          'Sending payload %d of %d to %s',
           index + 1,
           eventPayloadPairs.length,
           self.method
         )
 
-        // don't pass on error, allow next payload to attempt to send
-        asyncCallback()
-      })
-    }, function afterAllPayloadsSent() {
-      logger.debug(
-        'Finished sending %d payloads to %s',
-        eventPayloadPairs.length,
-        self.method
-      )
-
-      sendCallback()
-    })
+        self._sendSplitPayload(payloadPair.rawData, payloadPair.payload, (error) => {
+          if (error) {
+            logger.warn(error, 'An error occurred sending payload')
+          }
+
+          logger.trace(
+            'Finished sending payload %d of %d to %s',
+            index + 1,
+            eventPayloadPairs.length,
+            self.method
+          )
+
+          // don't pass on error, allow next payload to attempt to send
+          asyncCallback()
+        })
+      },
+      function afterAllPayloadsSent() {
+        logger.debug('Finished sending %d payloads to %s', eventPayloadPairs.length, self.method)
+
+        sendCallback()
+      }
+    )
   }
 
   _sendSplitPayload(rawData, payload, callback) {

package/lib/uninstrumented.js

@@ -24,8 +24,7 @@ function logUninstrumented() {
       'instrumented:'
 
     modules.forEach(function buildMessage(module) {
-      message += '\n\t' + uninstrumented[module].name
-        + ': ' + uninstrumented[module].filename
+      message += '\n\t' + uninstrumented[module].name + ': ' + uninstrumented[module].filename
     })
 
     logger.warn(message)
@@ -42,9 +41,9 @@ function createMetrics(metrics) {
   }
 
   modules.forEach(function addMetrics(module) {
-    metrics.getOrCreateMetric(
-      NAMES.SUPPORTABILITY.UNINSTRUMENTED + '/' + uninstrumented[module].name
-    ).incrementCallCount()
+    metrics
+      .getOrCreateMetric(NAMES.SUPPORTABILITY.UNINSTRUMENTED + '/' + uninstrumented[module].name)
+      .incrementCallCount()
   })
 }
 

package/lib/util/attribute-types.js

@@ -5,11 +5,7 @@
 
 'use strict'
 
-const VALID_ATTR_TYPES = new Set([
-  'string',
-  'number',
-  'boolean'
-])
+const VALID_ATTR_TYPES = new Set(['string', 'number', 'boolean'])
 
 /**
  * Checks incoming attribute value against valid types:

package/lib/util/byte-limit.js

@@ -45,7 +45,6 @@ function truncate(val, limit) {
     return val
   }
 
-
   // 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.

package/lib/util/cat.js

@@ -6,7 +6,7 @@
 'use strict'
 
 const hashes = require('./hashes')
-const logger = require('../logger').child({component: 'cat'})
+const logger = require('../logger').child({ component: 'cat' })
 
 module.exports.handleCatHeaders = handleCatHeaders
 module.exports.parsedHeadersToTrans = parsedHeadersToTrans
@@ -14,23 +14,15 @@ module.exports.parsedHeadersToTrans = parsedHeadersToTrans
 function handleCatHeaders(incomingCatId, obfTransaction, encKey, transaction) {
   var parsedCatId = null
   if (incomingCatId) {
-    parsedCatId = hashes.deobfuscateNameUsingKey(
-      incomingCatId,
-      encKey
-    )
+    parsedCatId = hashes.deobfuscateNameUsingKey(incomingCatId, encKey)
   }
 
   var externalTrans = null
   if (obfTransaction) {
     try {
-      externalTrans = JSON.parse(
-        hashes.deobfuscateNameUsingKey(obfTransaction, encKey)
-      )
+      externalTrans = JSON.parse(hashes.deobfuscateNameUsingKey(obfTransaction, encKey))
     } catch (e) {
-      logger.trace(
-        'Got an unparsable CAT header x-newrelic-transaction: %s',
-        obfTransaction
-      )
+      logger.trace('Got an unparsable CAT header x-newrelic-transaction: %s', obfTransaction)
     }
   }
 
@@ -59,5 +51,5 @@ function parsedHeadersToTrans(parsedCatId, externalTrans, transaction) {
 }
 
 function _isValidReferringHash(hash) {
-  return (typeof hash === 'string')
+  return typeof hash === 'string'
 }

package/lib/util/codec.js

@@ -23,8 +23,10 @@ module.exports = {
    */
   encode: function encode(data, callback) {
     try {
-      zlib.deflate(stringify(data), function cb_deflate(err, raw) {
-        if (err) return callback(err)
+      zlib.deflate(stringify(data), function cbDeflate(err, raw) {
+        if (err) {
+          return callback(err)
+        }
 
         return callback(null, raw.toString('base64'))
       })
@@ -47,8 +49,10 @@ module.exports = {
    *  decoding, and the second parameter is the decoded data object.
    */
   decode: function decode(encoded, callback) {
-    zlib.inflate(Buffer.from(encoded, 'base64'), function cb_inflate(err, raw) {
-      if (err) return callback(err)
+    zlib.inflate(Buffer.from(encoded, 'base64'), function cbInflate(err, raw) {
+      if (err) {
+        return callback(err)
+      }
 
       let json
       try {