newrelic 9.6.0 → 9.7.0

package/lib/transaction/index.js

@@ -5,6 +5,8 @@
 
 'use strict'
 
+/* eslint sonarjs/cognitive-complexity: ["error", 29] -- TODO: https://issues.newrelic.com/browse/NEWRELIC-5252 */
+
 const errorHelper = require('../errors/helper')
 const hashes = require('../util/hashes')
 const logger = require('../logger').child({ component: 'transaction' })
@@ -18,6 +20,9 @@ const url = require('url')
 const urltils = require('../util/urltils')
 const TraceContext = require('./tracecontext').TraceContext
 const Logs = require('./logs')
+const DT_ACCEPT_PAYLOAD_EXCEPTION_METRIC = 'DistributedTrace/AcceptPayload/Exception'
+const DT_ACCEPT_PAYLOAD_PARSE_EXCEPTION_METRIC = 'DistributedTrace/AcceptPayload/ParseException'
+const REQUEST_PARAMS_PATH = 'request.parameters.'
 
 /*
  *
@@ -425,7 +430,7 @@ function finalizeNameFromUri(requestURL, statusCode) {
     this.nameState.forEachParams(function forEachRouteParams(params) {
       for (const key in params) {
         if (props.hasOwn(params, key)) {
-          this.trace.attributes.addAttribute(DESTS.NONE, 'request.parameters.' + key, params[key])
+          this.trace.attributes.addAttribute(DESTS.NONE, REQUEST_PARAMS_PATH + key, params[key])
 
           const segment = this.agent.tracer.getSegment()
 
@@ -435,7 +440,7 @@ function finalizeNameFromUri(requestURL, statusCode) {
               key
             )
           } else {
-            segment.attributes.addAttribute(DESTS.NONE, 'request.parameters.' + key, params[key])
+            segment.attributes.addAttribute(DESTS.NONE, REQUEST_PARAMS_PATH + key, params[key])
           }
         }
       }
@@ -484,7 +489,7 @@ Transaction.prototype._markAsWeb = function _markAsWeb(rawURL) {
   const params = urltils.parseParameters(rawURL)
   for (const key in params) {
     if (props.hasOwn(params, key)) {
-      this.trace.attributes.addAttribute(DESTS.NONE, 'request.parameters.' + key, params[key])
+      this.trace.attributes.addAttribute(DESTS.NONE, REQUEST_PARAMS_PATH + key, params[key])
 
       const segment = this.agent.tracer.getSegment()
 
@@ -494,7 +499,7 @@ Transaction.prototype._markAsWeb = function _markAsWeb(rawURL) {
           key
         )
       } else {
-        segment.attributes.addAttribute(DESTS.NONE, 'request.parameters.' + key, params[key])
+        segment.attributes.addAttribute(DESTS.NONE, REQUEST_PARAMS_PATH + key, params[key])
       }
     }
   }
@@ -1058,7 +1063,7 @@ function _acceptDistributedTracePayload(payload, transport) {
       trustedAccount
     )
 
-    this.agent.recordSupportability('DistributedTrace/AcceptPayload/Exception')
+    this.agent.recordSupportability(DT_ACCEPT_PAYLOAD_EXCEPTION_METRIC)
     return
   }
 
@@ -1075,14 +1080,14 @@ function _acceptDistributedTracePayload(payload, transport) {
     if (!parsed.d) {
       logger.warn('Received a distributed trace payload with no data field', this.id)
     }
-    this.agent.recordSupportability('DistributedTrace/AcceptPayload/ParseException')
+    this.agent.recordSupportability(DT_ACCEPT_PAYLOAD_PARSE_EXCEPTION_METRIC)
     return
   }
 
   const majorVersion = parsed.v && typeof parsed.v[0] === 'number' && parsed.v[0]
   if (majorVersion == null) {
     logger.warn('Invalid distributed trace payload, not accepting')
-    this.agent.recordSupportability('DistributedTrace/AcceptPayload/Exception')
+    this.agent.recordSupportability(DT_ACCEPT_PAYLOAD_EXCEPTION_METRIC)
   }
   if (majorVersion > 0) {
     // TODO: Add DistributedTracePayload class?
@@ -1094,7 +1099,7 @@ function _acceptDistributedTracePayload(payload, transport) {
 
   if (!data) {
     logger.warn('No distributed trace data received, not accepting payload')
-    this.agent.recordSupportability('DistributedTrace/AcceptPayload/Exception')
+    this.agent.recordSupportability(DT_ACCEPT_PAYLOAD_EXCEPTION_METRIC)
     return
   }
 
@@ -1103,7 +1108,7 @@ function _acceptDistributedTracePayload(payload, transport) {
   })
   // Either parentSpanId or parentId are required.
   if (!requiredKeysExist || (data.tx == null && data.id == null)) {
-    this.agent.recordSupportability('DistributedTrace/AcceptPayload/ParseException')
+    this.agent.recordSupportability(DT_ACCEPT_PAYLOAD_PARSE_EXCEPTION_METRIC)
     return
   }
 
@@ -1157,7 +1162,7 @@ Transaction.prototype._getParsedPayload = function _getParsedPayload(payload) {
         payload = Buffer.from(payload, 'base64').toString('utf-8')
       } catch (err) {
         logger.warn(err, 'Got unparseable distributed trace payload in transaction %s', this.id)
-        this.agent.recordSupportability('DistributedTrace/AcceptPayload/ParseException')
+        this.agent.recordSupportability(DT_ACCEPT_PAYLOAD_PARSE_EXCEPTION_METRIC)
         return null
       }
     }
@@ -1165,7 +1170,7 @@ Transaction.prototype._getParsedPayload = function _getParsedPayload(payload) {
       parsed = JSON.parse(payload)
     } catch (err) {
       logger.warn(err, 'Failed to parse distributed trace payload in transaction %s', this.id)
-      this.agent.recordSupportability('DistributedTrace/AcceptPayload/ParseException')
+      this.agent.recordSupportability(DT_ACCEPT_PAYLOAD_PARSE_EXCEPTION_METRIC)
       return null
     }
   }
@@ -1300,24 +1305,20 @@ Transaction.prototype.addRequestParameters = addRequestParameters
  * 'request.parameters.{key}'. These attributes will only be created
  * when 'request.parameters.*' is included in the attribute config.
  *
- * @param {object.<string, string>} requestParameters
+ * @param {Object<string, string>} requestParameters
  */
 function addRequestParameters(requestParameters) {
   for (const key in requestParameters) {
     if (props.hasOwn(requestParameters, key)) {
       this.trace.attributes.addAttribute(
         DESTS.NONE,
-        'request.parameters.' + key,
+        REQUEST_PARAMS_PATH + key,
         requestParameters[key]
       )
 
       const segment = this.baseSegment
 
-      segment.attributes.addAttribute(
-        DESTS.NONE,
-        'request.parameters.' + key,
-        requestParameters[key]
-      )
+      segment.attributes.addAttribute(DESTS.NONE, REQUEST_PARAMS_PATH + key, requestParameters[key])
     }
   }
 }

package/lib/transaction/name-state.js

@@ -29,7 +29,11 @@ const STATUS_CODE_NAMES = {
 /**
  * Manages transaction names using a stack of paths.
  *
- * @constructor
+ * @param prefix
+ * @param verb
+ * @param delimiter
+ * @param path
+ * @class
  */
 function NameState(prefix, verb, delimiter, path) {
   this.reset()
@@ -67,6 +71,8 @@ NameState.prototype.markPath = function markPath() {
 
 /**
  * Sets the metric prefix (i.e. Expressjs).
+ *
+ * @param prefix
  */
 NameState.prototype.setPrefix = function setPrefix(prefix) {
   if (this._frozen) {
@@ -82,6 +88,8 @@ NameState.prototype.setPrefix = function setPrefix(prefix) {
 
 /**
  * Sets the HTTP verb (i.e. GET/POST/PUT)
+ *
+ * @param verb
  */
 NameState.prototype.setVerb = function setVerb(verb) {
   if (!this._frozen) {
@@ -91,6 +99,8 @@ NameState.prototype.setVerb = function setVerb(verb) {
 
 /**
  * Sets the delimiter character used to separate the http verb from the path.
+ *
+ * @param delimiter
  */
 NameState.prototype.setDelimiter = function setDelimiter(delimiter) {
   if (!this._frozen) {
@@ -104,6 +114,9 @@ NameState.prototype.isEmpty = function isEmpty() {
 
 /**
  * Pushes a new path element onto the naming stack.
+ *
+ * @param path
+ * @param params
  */
 NameState.prototype.appendPath = function appendPath(path, params) {
   if (!this._frozen && path != null) {
@@ -120,6 +133,9 @@ NameState.prototype.appendPath = function appendPath(path, params) {
 /**
  * Pushes a new path element onto the naming stack if the stack is
  * empty.
+ *
+ * @param path
+ * @param params
  */
 NameState.prototype.appendPathIfEmpty = function appendPathIfEmpty(path, params) {
   if (!this._frozen && this.isEmpty()) {
@@ -244,7 +260,6 @@ function _getName(nameState, path) {
  * @param {Array}    arr  - Array to search.
  * @param {Function} pred - Predicate function that returns `true` on matches.
  * @param {*}        ctx  - The `this` arg for `pred`.
- *
  * @returns {number} - This index of the last matching item, or `-1`.
  */
 function _findLastIndex(arr, pred, ctx) {

package/lib/transaction/trace/aggregator.js

@@ -272,10 +272,8 @@ class TransactionTraceAggregator extends TraceAggregator {
      *    is less than the response time in the map, it is skipped.
      */
     let slowerThanCaptured = true
-    if (hasMetGuarantee) {
-      if (this.requestTimes[name]) {
-        slowerThanCaptured = this.requestTimes[name] < duration
-      }
+    if (hasMetGuarantee && this.requestTimes[name]) {
+      slowerThanCaptured = this.requestTimes[name] < duration
     }
     if (!slowerThanCaptured) {
       return false
@@ -285,17 +283,11 @@ class TransactionTraceAggregator extends TraceAggregator {
      * Ensure this name is either already in the request time map
      * or that the map still hasn't hit capacity.
      */
-    if (
+    return !(
       hasMetGuarantee &&
       !this.requestTimes[name] &&
       Object.keys(this.requestTimes).length >= this.capacity
-    ) {
-      return false
-    }
-
-    /* 4. The transaction is held as the slowest transaction.
-     */
-    return true
+    )
   }
 }
 

package/lib/transaction/trace/index.js

@@ -5,6 +5,8 @@
 
 'use strict'
 
+/* eslint sonarjs/cognitive-complexity: ["error", 19] -- TODO: https://issues.newrelic.com/browse/NEWRELIC-5252 */
+
 const codec = require('../../util/codec')
 const Segment = require('./segment')
 const { Attributes, MAXIMUM_CUSTOM_ATTRIBUTES } = require('../../attributes')
@@ -139,6 +141,7 @@ function DTTraceNode(segment, parentId, isRoot = false) {
  * Add a child to the list of segments.
  *
  * @param {string} childName Name for the new segment.
+ * @param callback
  * @returns {Segment} Newly-created Segment.
  */
 Trace.prototype.add = function add(childName, callback) {
@@ -159,7 +162,7 @@ function setDurationInMillis(duration, startTimeInMillis) {
 }
 
 /**
- * @return {integer} The amount of time the trace took, in milliseconds.
+ * @returns {integer} The amount of time the trace took, in milliseconds.
  */
 Trace.prototype.getDurationInMillis = function getDurationInMillis() {
   return this.root.getDurationInMillis()
@@ -188,7 +191,7 @@ Trace.prototype.addCustomAttribute = function addCustomAttribute(key, value) {
  * The duration of the transaction trace tree that only this level accounts
  * for.
  *
- * @return {integer} The amount of time the trace took, minus any child
+ * @returns {integer} The amount of time the trace took, minus any child
  *                   traces, in milliseconds.
  */
 Trace.prototype.getExclusiveDurationInMillis = function getExclusiveDurationInMillis() {
@@ -199,7 +202,7 @@ Trace.prototype.getExclusiveDurationInMillis = function getExclusiveDurationInMi
  * The duration of all segments in a transaction trace.  The root is not
  * accounted for, since it doesn't represent a unit of work.
  *
- * @return {integer} The sum of durations for all segments in a trace in
+ * @returns {integer} The sum of durations for all segments in a trace in
  *                   milliseconds
  */
 Trace.prototype.getTotalTimeDurationInMillis = function getTotalTimeDurationInMillis() {
@@ -287,8 +290,8 @@ Trace.prototype.generateJSONSync = function generateJSONSync() {
 /**
  * Generates the payload used in a trace harvest.
  *
+ * @param data
  * @private
- *
  * @returns {Array} The formatted payload.
  */
 Trace.prototype._generatePayload = function _generatePayload(data) {
@@ -336,7 +339,6 @@ Trace.prototype._getRequestUri = function _getRequestUri() {
  * Serializes the trace into the expected JSON format to be sent.
  *
  * @private
- *
  * @returns {Array} Serialized trace data.
  */
 Trace.prototype._serializeTrace = function _serializeTrace() {

package/lib/transaction/trace/segment.js

@@ -26,21 +26,18 @@ const ATTRIBUTE_SCOPE = 'segment'
 /**
  * Initializes the segment and binds the recorder to itself, if provided.
  *
- * @constructor
+ * @class
  * @classdesc
  * TraceSegments are inserted to track instrumented function calls. Each one is
  * bound to a transaction, given a name (used only internally to the framework
  * for now), and has one or more children (that are also part of the same
  * transaction), as well as an associated timer.
- *
  * @param {Transaction} transaction
  *  The transaction to which this segment will be bound.
- *
  * @param {string} name
  *  Human-readable name for this segment (e.g. 'http', 'net', 'express',
  *  'mysql', etc).
- *
- * @param {?function} recorder
+ * @param {?Function} recorder
  *  Callback that takes a segment and a scope name as attributes (intended to be
  *  used to record metrics related to the segment).
  */
@@ -126,10 +123,8 @@ TraceSegment.prototype.getSpanId = function getSpanId() {
  * @param {string} host
  *  The name of the host of the database. This will be normalized if the string
  *  represents localhost.
- *
  * @param {string|number} port
  *  The database's port, path to unix socket, or id.
- *
  * @param {string|number|bool} database
  *  The name or ID of the database that was connected to. Or `false` if there is
  *  no database name (i.e. Redis has no databases, only hosts).
@@ -282,6 +277,7 @@ TraceSegment.prototype._isEnded = function _isEnded() {
  * Add a new segment to a scope implicitly bounded by this segment.
  *
  * @param {string} childName New human-readable name for the segment.
+ * @param recorder
  * @returns {TraceSegment} New nested TraceSegment.
  */
 TraceSegment.prototype.add = function add(childName, recorder) {
@@ -308,7 +304,7 @@ TraceSegment.prototype.add = function add(childName, recorder) {
 /**
  * Set the duration of the segment explicitly.
  *
- * @param {Number} duration Duration in milliseconds.
+ * @param {number} duration Duration in milliseconds.
  */
 TraceSegment.prototype.setDurationInMillis = setDurationInMillis
 
@@ -335,7 +331,7 @@ function _setExclusiveDurationInMillis(duration) {
  * The duration of the transaction trace tree that only this level accounts
  * for.
  *
- * @return {integer} The amount of time the trace took, minus any child
+ * @returns {integer} The amount of time the trace took, minus any child
  *                   segments, in milliseconds.
  */
 TraceSegment.prototype.getExclusiveDurationInMillis = getExclusiveDurationInMillis
@@ -372,10 +368,9 @@ TraceSegment.prototype.getCollectedChildren = function getCollectedChildren() {
 /**
  * Enumerate the timings of this segment's descendants.
  *
- * @param {Number} end The end of this segment, to keep the calculated
+ * @param {number} end The end of this segment, to keep the calculated
  *                     duration from exceeding the duration of the
  *                     parent. Defaults to Infinity.
- *
  * @returns {Array} Unsorted list of [start, end] pairs, with no pair
  *                  having an end greater than the passed in end time.
  */

package/lib/transaction/tracecontext.js

@@ -5,6 +5,8 @@
 
 'use strict'
 
+/* eslint sonarjs/cognitive-complexity: ["error", 20] -- TODO: https://issues.newrelic.com/browse/NEWRELIC-5252 */
+
 const logger = require('../logger').child({ component: 'TraceContext' })
 const hashes = require('../util/hashes')
 
@@ -32,6 +34,7 @@ const FLAGS = {
 class TraceContext {
   /**
    * Create a TraceContext object
+   *
    * @param {Transaction} transaction - a transaction object to attach to.
    */
   constructor(transaction) {
@@ -135,6 +138,7 @@ class TraceContext {
 
   /**
    * Takes a headers object and modifies it in place by adding Trace Context headers
+   *
    * @param {object} headers - Headers for an HTTP request
    */
   addTraceContextHeaders(headers) {
@@ -175,7 +179,7 @@ class TraceContext {
    *
    * @param {string} traceparent - W3C traceparent header from an HTTP request
    * @param {string} tracestate - W3C tracestate header from an HTTP request
-   * @returns {Object} returns an Object with the traceparent data and validation info
+   * @returns {object} returns an Object with the traceparent data and validation info
    */
   acceptTraceContextPayload(traceparent, tracestate) {
     const traceContextData = {
@@ -294,7 +298,7 @@ class TraceContext {
    * parsed out if valid.
    *
    * @param {string} traceparent - a W3C traceparent header string
-   * @returns {Object} returns an Object with the traceparent data and validation info
+   * @returns {object} returns an Object with the traceparent data and validation info
    */
   _validateAndParseTraceParentHeader(traceparent) {
     const traceParentInfo = {
@@ -363,7 +367,7 @@ class TraceContext {
    * @property {Intrinsics} intrinsics - All the parts of the New Relic tracestate string
    * parsed and split out into an object
    * @property {string} newTraceState - The raw tracestate without the New Relic entry
-   * @property {array} vendors - All the vendor strings found in the tracestate
+   * @property {Array} vendors - All the vendor strings found in the tracestate
    */
 
   /**
@@ -535,6 +539,8 @@ class TraceContext {
 
   /**
    * Parses intrinsics of a New Relic tracestate entry's value
+   *
+   * @param nrTracestateValue
    */
   _parseIntrinsics(nrTracestateValue) {
     const intrinsics = this._extractTraceStateIntrinsics(nrTracestateValue)
@@ -570,7 +576,7 @@ class TraceContext {
       }
     })
 
-    const intrinsics = {
+    return {
       version: splitValues[0],
       parentType: splitValues[1],
       accountId: splitValues[2],
@@ -581,8 +587,6 @@ class TraceContext {
       priority: splitValues[7],
       timestamp: splitValues[8]
     }
-
-    return intrinsics
   }
 }
 

package/lib/transaction/tracer/index.js

@@ -8,6 +8,9 @@
 const Transaction = require('../index.js')
 const logger = require('../../logger').child({ component: 'tracer' })
 const symbols = require('../../symbols')
+const INACTIVE_TRANSACTION_MESSAGE = 'Not creating segment "%s" because no transaction was active'
+const SKIP_WRAPPING_FUNCTION_MESSAGE = 'Not wrapping "%s" because it was not a function'
+const CREATE_SEGMENT_MESSAGE = 'Creating "%s" segment for transaction %s.'
 
 module.exports = Tracer
 
@@ -311,7 +314,7 @@ function wrapFunctionFirstNoSegment(original, name) {
 
 function wrapFunctionLast(name, recorder, original) {
   if (typeof original !== 'function') {
-    logger.trace('Not wrapping "%s" because it was not a function', name)
+    logger.trace(SKIP_WRAPPING_FUNCTION_MESSAGE, name)
     return original
   }
 
@@ -323,11 +326,11 @@ function wrapFunctionLast(name, recorder, original) {
   function wrappedFunction() {
     const transaction = tracer.getTransaction()
     if (!transaction) {
-      logger.trace('Not creating segment "%s" because no transaction was active', name)
+      logger.trace(INACTIVE_TRANSACTION_MESSAGE, name)
       return original.apply(this, arguments)
     }
 
-    logger.trace('Creating "%s" segment for transaction %s.', name, transaction.id)
+    logger.trace(CREATE_SEGMENT_MESSAGE, name, transaction.id)
     const args = tracer.slice(arguments)
     const last = args.length - 1
     const cb = args[last]
@@ -335,21 +338,19 @@ function wrapFunctionLast(name, recorder, original) {
       return original.apply(this, arguments)
     }
     const child = tracer.createSegment(name, recorder)
-    args[last] = tracer.wrapCallback(cb, child, wrappedCallback)
-    child.start()
-    return tracer.bindFunction(original, child).apply(this, args)
-
-    function wrappedCallback() {
+    args[last] = tracer.wrapCallback(cb, child, function wrappedCallback() {
       logger.trace('Ending "%s" segment for transaction %s.', name, transaction.id)
       child.touch()
       return cb.apply(this, arguments)
-    }
+    })
+    child.start()
+    return tracer.bindFunction(original, child).apply(this, args)
   }
 }
 
 function wrapFunctionFirst(name, recorder, original) {
   if (typeof original !== 'function') {
-    logger.trace('Not wrapping "%s" because it was not a function', name)
+    logger.trace(SKIP_WRAPPING_FUNCTION_MESSAGE, name)
     return original
   }
 
@@ -361,33 +362,30 @@ function wrapFunctionFirst(name, recorder, original) {
   function wrappedFunction() {
     const transaction = tracer.getTransaction()
     if (!transaction) {
-      logger.trace('Not creating segment "%s" because no transaction was active', name)
+      logger.trace(INACTIVE_TRANSACTION_MESSAGE, name)
       return original.apply(this, arguments)
     }
 
-    logger.trace('Creating "%s" segment for transaction %s.', name, transaction.id)
+    logger.trace(CREATE_SEGMENT_MESSAGE, name, transaction.id)
     const args = tracer.slice(arguments)
     const cb = args[0]
     if (typeof cb !== 'function') {
       return original.apply(this, arguments)
     }
     const child = tracer.createSegment(name, recorder)
-    args[0] = tracer.wrapCallback(cb, child, wrappedCallback)
-    child.start()
-    return tracer.bindFunction(original, child).apply(this, args)
-
-    function wrappedCallback() {
+    args[0] = tracer.wrapCallback(cb, child, function wrappedCallback() {
       logger.trace('Ending "%s" segment for transaction %s.', name, transaction.id)
       child.touch()
-      const result = cb.apply(this, arguments)
-      return result
-    }
+      return cb.apply(this, arguments)
+    })
+    child.start()
+    return tracer.bindFunction(original, child).apply(this, args)
   }
 }
 
 function wrapFunction(name, recorder, original, wrapper, resp) {
   if (typeof original !== 'function' || !wrapper) {
-    logger.trace('Not wrapping "%s" because it was not a function', name)
+    logger.trace(SKIP_WRAPPING_FUNCTION_MESSAGE, name)
     return original
   }
 
@@ -400,11 +398,11 @@ function wrapFunction(name, recorder, original, wrapper, resp) {
   function wrappedFunction() {
     const transaction = tracer.getTransaction()
     if (!transaction) {
-      logger.trace('Not creating segment "%s" because no transaction was active', name)
+      logger.trace(INACTIVE_TRANSACTION_MESSAGE, name)
       return original.apply(this, arguments)
     }
 
-    logger.trace('Creating "%s" segment for transaction %s.', name, transaction.id)
+    logger.trace(CREATE_SEGMENT_MESSAGE, name, transaction.id)
 
     const child = tracer.createSegment(name, recorder)
     const args = wrapper.call(this, child, tracer.slice(arguments), bind)
@@ -430,7 +428,7 @@ function wrapFunction(name, recorder, original, wrapper, resp) {
 
 function wrapSyncFunction(name, recorder, original) {
   if (typeof original !== 'function') {
-    logger.trace('Not wrapping "%s" because it was not a function', name)
+    logger.trace(SKIP_WRAPPING_FUNCTION_MESSAGE, name)
     return original
   }
 
@@ -443,7 +441,7 @@ function wrapSyncFunction(name, recorder, original) {
   function wrappedFunction() {
     const transaction = tracer.getTransaction()
     if (!transaction) {
-      logger.trace('Not creating segment "%s" because no transaction was active', name)
+      logger.trace(INACTIVE_TRANSACTION_MESSAGE, name)
       return original.apply(this, arguments)
     }
     logger.trace('Creating "%s" sync segment for transaction %s.', name, transaction.id)

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

@@ -87,12 +87,10 @@ class TransactionEventAggregator extends EventAggregator {
     const secondHalfEventData = secondHalfRawEvents.map(this._rawEventsToValues)
     const secondPayload = [this.runId, secondMetrics, secondHalfEventData]
 
-    const eventPayloadPairs = [
+    return [
       { rawData: firstHalfRawEvents, payload: firstPayload },
       { rawData: secondHalfRawEvents, payload: secondPayload }
     ]
-
-    return eventPayloadPairs
   }
 
   _rawEventsToValues(rawEvent) {

package/lib/util/attribute-types.js

@@ -12,8 +12,7 @@ const VALID_ATTR_TYPES = new Set(['string', 'number', 'boolean'])
  * string, number, & boolean.
  *
  * @param {*} val
- *
- * @return {boolean}
+ * @returns {boolean}
  */
 function isValidType(val) {
   return VALID_ATTR_TYPES.has(typeof val)

package/lib/util/byte-limit.js

@@ -32,11 +32,9 @@ function compareLength(str, limit) {
  * Trims a string value to given byte limit, if necessary.
  *
  * @private
- *
  * @param {string} val - The value to truncate to given byte limit.
  * @param {number} limit - The byte limit
- *
- * @return {string} The truncated value.
+ * @returns {string} The truncated value.
  */
 function truncate(val, limit) {
   // First truncation handles the simple case of only one-byte characters.