newrelic 9.5.0 → 9.7.0

package/lib/shim/webframework-shim.js

@@ -5,6 +5,8 @@
 
 'use strict'
 
+/* eslint sonarjs/cognitive-complexity: ["error", 69] -- TODO: https://issues.newrelic.com/browse/NEWRELIC-5252 */
+
 const genericRecorder = require('../metrics/recorders/generic')
 const logger = require('../logger.js').child({ component: 'WebFrameworkShim' })
 const metrics = require('../metrics/names')
@@ -13,6 +15,7 @@ const Shim = require('./shim')
 const specs = require('./specs')
 const urltils = require('../util/urltils')
 const util = require('util')
+const symbols = require('../symbols')
 
 /**
  * An enumeration of well-known web frameworks so that new instrumentations can
@@ -54,13 +57,6 @@ const MIDDLEWARE_TYPE_NAMES = {
   ROUTER: 'ROUTER'
 }
 
-/**
- * Name of the key used to store transaction information on `req` and `res`.
- *
- * @private
- */
-const TRANSACTION_INFO_KEY = '__NR_transactionInfo'
-
 /**
  * Constructs a shim associated with the given agent instance, specialized for
  * instrumenting web frameworks.
@@ -1036,7 +1032,7 @@ function _makeNextBinder(nextDetails, txInfo) {
  */
 function _getTransactionInfo(shim, req) {
   try {
-    return req[TRANSACTION_INFO_KEY] || null
+    return req[symbols.transactionInfo] || null
   } catch (e) {
     shim.logger.debug(e, 'Failed to fetch transaction info from req')
     return null

package/lib/shimmer.js

@@ -14,6 +14,7 @@ const properties = require('./util/properties')
 const shims = require('./shim')
 
 const NAMES = require('./metrics/names')
+const symbols = require('./symbols')
 
 const MODULE_TYPE = shims.constants.MODULE_TYPE
 
@@ -97,7 +98,7 @@ const shimmer = (module.exports = {
    * @returns {bool} True if `fn` exists and has an attached original, else false.
    */
   isWrapped: function isWrapped(fn) {
-    return !!(fn && fn.__NR_original)
+    return !!(fn && fn[symbols.original])
   },
 
   /**
@@ -118,7 +119,8 @@ const shimmer = (module.exports = {
    */
   wrapMethod: function wrapMethod(nodule, noduleName, methods, wrapper) {
     if (!methods) {
-      return logger.warn(new Error(), 'Must include a method name to wrap. Called from:')
+      logger.warn(new Error(), 'Must include a method name to wrap. Called from:')
+      return
     }
 
     if (!noduleName) {
@@ -132,29 +134,33 @@ const shimmer = (module.exports = {
       const fqmn = noduleName + '.' + method
 
       if (!nodule) {
-        return logger.debug("Can't wrap %s from nonexistent object.", fqmn)
+        logger.debug("Can't wrap %s from nonexistent object.", fqmn)
+        return
       }
 
       if (!wrapper) {
-        return logger.debug("Can't wrap %s without a wrapper generator.", fqmn)
+        logger.debug("Can't wrap %s without a wrapper generator.", fqmn)
+        return
       }
 
       const original = nodule[method]
 
       if (!original) {
-        return logger.trace('%s not defined, so not wrapping.', fqmn)
+        logger.trace('%s not defined, so not wrapping.', fqmn)
+        return
       }
-      if (original.__NR_unwrap) {
-        return logger.debug('%s already wrapped by agent.', fqmn)
+      if (original[symbols.unwrap]) {
+        logger.debug('%s already wrapped by agent.', fqmn)
+        return
       }
 
       const wrapped = wrapper(original, method)
       Object.keys(original).forEach((key) => {
         wrapped[key] = original[key]
       })
-      wrapped.__NR_original = original
+      wrapped[symbols.original] = original
       // eslint-disable-next-line camelcase
-      wrapped.__NR_unwrap = function __NR_unwrap() {
+      wrapped[symbols.unwrap] = function unwrap() {
         nodule[method] = original
         logger.trace('Removed instrumentation from %s.', fqmn)
       }
@@ -221,7 +227,7 @@ const shimmer = (module.exports = {
 
     if (shimmer.debug) {
       instrumented.push({
-        __NR_unwrap: function unwrapDeprecated() {
+        [symbols.unwrap]: function unwrapDeprecated() {
           delete nodule[property]
           nodule[property] = original
         }
@@ -259,16 +265,16 @@ const shimmer = (module.exports = {
     if (!wrapped) {
       return logger.debug('%s not defined, so not unwrapping.', fqmn)
     }
-    if (!wrapped.__NR_unwrap) {
+    if (!wrapped[symbols.unwrap]) {
       return logger.debug("%s isn't unwrappable.", fqmn)
     }
 
-    wrapped.__NR_unwrap()
+    wrapped[symbols.unwrap]()
   },
 
   unwrapAll: function unwrapAll() {
     instrumented.forEach((wrapper) => {
-      wrapper.__NR_unwrap()
+      wrapper[symbols.unwrap]()
     })
     instrumented = []
   },
@@ -472,7 +478,7 @@ const shimmer = (module.exports = {
     // This is to not break the public API
     // previously it would just call instrumentation
     // and not check the result
-    return returnModule ? result : !!result.__NR_instrumented
+    return returnModule ? result : !!result[symbols.instrumented]
   }
 })
 
@@ -481,13 +487,13 @@ function applyDebugState(shim, nodule) {
     shim.enableDebug()
     instrumented.push(shim)
     instrumented.push({
-      __NR_unwrap: function unwrapNodule() {
-        delete nodule.__NR_instrumented_errored
-        delete nodule.__NR_instrumented
-        delete nodule.__NR_shim
+      [symbols.unwrap]: function unwrapNodule() {
+        delete nodule[symbols.instrumentedErrored]
+        delete nodule[symbols.instrumented]
+        delete nodule[symbols.shim]
       }
     })
-    nodule.__NR_shim = shim
+    nodule[symbols.shim] = shim
   }
 }
 
@@ -504,8 +510,8 @@ function applyDebugState(shim, nodule) {
 function instrumentPostLoad(agent, nodule, moduleName, resolvedName) {
   const instrumentation = shimmer.registeredInstrumentations[moduleName]
   if (
-    properties.hasOwn(nodule, '__NR_instrumented') ||
-    properties.hasOwn(nodule, '__NR_instrumented_errored')
+    properties.hasOwn(nodule, symbols.instrumented) ||
+    properties.hasOwn(nodule, symbols.instrumentedErrored)
   ) {
     logger.trace(
       'Already instrumented or failed to instrument %s, skipping redundant instrumentation',
@@ -527,10 +533,10 @@ function instrumentPostLoad(agent, nodule, moduleName, resolvedName) {
   try {
     if (instrumentation.onRequire(shim, nodule, moduleName) !== false) {
       nodule = shim.getExport(nodule)
-      nodule.__NR_instrumented = true
+      nodule[symbols.instrumented] = true
     }
   } catch (instrumentationError) {
-    nodule.__NR_instrumented_errored = true
+    nodule[symbols.instrumentedErrored] = true
     if (instrumentation.onError) {
       try {
         instrumentation.onError(instrumentationError)

package/lib/spans/map-to-streaming-type.js

@@ -42,8 +42,6 @@ function mapToStreamingType(value) {
       [protoTypeString]: value
     }
   }
-
-  return
 }
 
 module.exports = mapToStreamingType

package/lib/spans/span-context.js

@@ -40,6 +40,8 @@ class SpanContext {
    * ends with an ignored error status code.
    *
    * Last error wins.
+   *
+   * @param details
    */
   setError(details) {
     this.hasError = true

package/lib/spans/span-event-aggregator.js

@@ -63,8 +63,8 @@ class SpanEventAggregator extends EventAggregator {
    *
    * @param {TraceSegment}  segment         - The segment to add.
    * @param {string}        [parentId=null] - The GUID of the parent span.
-   *
-   * @return {boolean} True if the segment was added, or false if it was discarded.
+   * @param isRoot
+   * @returns {boolean} True if the segment was added, or false if it was discarded.
    */
   addSegment(segment, parentId, isRoot) {
     // Check if the priority would be accepted before creating the event object.

package/lib/spans/span-event.js

@@ -83,8 +83,8 @@ class SpanEvent {
    *
    * @param {TraceSegment}  segment         - The segment to turn into a span event.
    * @param {?string}       [parentId=null] - The ID of the segment's parent.
-   *
-   * @return {SpanEvent} The constructed event.
+   * @param isRoot
+   * @returns {SpanEvent} The constructed event.
    */
   static fromSegment(segment, parentId = null, isRoot = false) {
     const spanContext = segment.getSpanContext()

package/lib/spans/span-streamer.js

@@ -83,6 +83,8 @@ class SpanStreamer {
    *  Sends the span over the stream. Spans are only sent here if the stream is
    *  in a writable state. If the stream becomes unwritable after sending the
    *  span, a drain event handler is setup to continue writing when possible.
+   *
+   * @param span
    */
   send(span) {
     // false indicates the stream has reached the highWaterMark
@@ -104,6 +106,8 @@ class SpanStreamer {
    *  initially blocked, used to time how long the stream was blocked. If this
    *  is not defined, it is assumed this is being called after a reconnect,
    *  and the metric is not used.
+   *
+   * @param waitDrainStart
    */
   drain(waitDrainStart) {
     // Metric can be used to see how frequently completing drains as well as

package/lib/spans/streaming-span-event-aggregator.js

@@ -60,8 +60,6 @@ class StreamingSpanEventAggregator extends Aggregator {
     }
 
     this.emit(`finished ${this.method} data send.`)
-
-    return
   }
 
   /**
@@ -78,8 +76,8 @@ class StreamingSpanEventAggregator extends Aggregator {
    *
    * @param {TraceSegment}  segment         - The segment to add.
    * @param {string}        [parentId=null] - The GUID of the parent span.
-   *
-   * @return {bool} True if the segment was added, or false if it was discarded.
+   * @param isRoot
+   * @returns {bool} True if the segment was added, or false if it was discarded.
    */
   addSegment(segment, parentId, isRoot) {
     if (!this.started) {

package/lib/spans/streaming-span-event.js

@@ -61,6 +61,7 @@ class StreamingSpanEvent {
 
   /**
    * Add a key/value pair to the Span's custom/user attributes collection.
+   *
    * @param {string} key Name of the attribute to be stored.
    * @param {string|boolean|number} value Value of the attribute to be stored.
    * @param {boolean} [truncateExempt=false] Set to true if attribute should not be truncated.
@@ -75,6 +76,7 @@ class StreamingSpanEvent {
 
   /**
    * Add a key/value pair to the Span's agent attributes collection.
+   *
    * @param {string} key Name of the attribute to be stored.
    * @param {string|boolean|number} value Value of the attribute to be stored.
    * @param {boolean} [truncateExempt=false] Set to true if attribute should not be truncated.
@@ -95,13 +97,12 @@ class StreamingSpanEvent {
 
   toStreamingFormat() {
     // Attributes are pre-formatted.
-    const formatted = {
+    return {
       trace_id: this._traceId,
       intrinsics: this._intrinsicAttributes,
       user_attributes: this._customAttributes,
       agent_attributes: this._agentAttributes
     }
-    return formatted
   }
 
   static fromSegment(segment, parentId = null, isRoot = false) {

package/lib/symbols.js

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2022 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+module.exports = {
+  cache: Symbol('cache'),
+  context: Symbol('context'),
+  databaseName: Symbol('databaseName'),
+  disableDT: Symbol('Disable distributed tracing'), // description for backwards compatibility
+  executorContext: Symbol('executorContext'),
+  instrumented: Symbol('instrumented'),
+  instrumentedErrored: Symbol('instrumentedErrored'),
+  name: Symbol('name'),
+  onceExecuted: Symbol('onceExecuted'),
+  offTheRecord: Symbol('offTheRecord'),
+  original: Symbol('original'),
+  segment: Symbol('segment'),
+  shim: Symbol('shim'),
+  storeDatabase: Symbol('storeDatabase'),
+  transaction: Symbol('transaction'),
+  transactionInfo: Symbol('transactionInfo'),
+  unwrap: Symbol('unwrap')
+}

package/lib/system-info.js

@@ -5,6 +5,8 @@
 
 'use strict'
 
+/* eslint sonarjs/cognitive-complexity: ["error", 29] -- TODO: https://issues.newrelic.com/browse/NEWRELIC-5252 */
+
 const exec = require('child_process').exec
 const readProc = require('./utilization/common').readProc
 const getBootId = require('./utilization/docker-info').getBootId
@@ -21,7 +23,7 @@ function isInteger(i) {
   return i === parseInt(i, 10)
 }
 
-function fetchSystemInfo(agent, callback) {
+function fetchSystemInfo(agent, callback, numTasks = 5) {
   const config = agent.config
   const systemInfo = {
     processorArch: os.arch()
@@ -74,7 +76,6 @@ function fetchSystemInfo(agent, callback) {
   }
 
   let tasksDone = 0
-  const numTasks = 5
   function finishedResponse() {
     if (++tasksDone === numTasks) {
       callback(null, systemInfo)
@@ -174,11 +175,7 @@ module.exports._getMemoryStats = function getMemoryStats(callback) {
 }
 
 function getKernelVersion(callback) {
-  if (platform.match(/darwin/i)) {
-    getSysctlValue(['kern.version'], function getMem(version) {
-      callback(version)
-    })
-  } else if (platform.match(/bsd/i)) {
+  if (platform.match(/darwin/i) || platform.match(/bsd/i)) {
     getSysctlValue(['kern.version'], function getMem(version) {
       callback(version)
     })

package/lib/timer.js

@@ -6,7 +6,7 @@
 'use strict'
 
 /**
-
+ 
  * Explicit enumeration of the states a transaction can be in:
  *
  * PENDING upon instantiation (implicitly, no start time set)
@@ -106,21 +106,21 @@ Timer.prototype.softEnd = function softEnd() {
 }
 
 /**
- * @return {bool} Is this timer currently running?
+ * @returns {bool} Is this timer currently running?
  */
 Timer.prototype.isRunning = function isRunning() {
   return this.state === RUNNING
 }
 
 /**
- * @return {bool} Is this timer still alive?
+ * @returns {bool} Is this timer still alive?
  */
 Timer.prototype.isActive = function isActive() {
   return this.state < STOPPED
 }
 
 /**
- * @return {bool} Has the timer been touched or ended?
+ * @returns {bool} Has the timer been touched or ended?
  */
 Timer.prototype.hasEnd = function hasEnd() {
   return !!this.hrDuration
@@ -192,7 +192,7 @@ Timer.prototype.getDurationInMillis = function getDurationInMillis() {
 /**
  * Get a single object containing the interval this timer was active.
  *
- * @return {Array} 2-tuple of start time in milliseconds, end time in
+ * @returns {Array} 2-tuple of start time in milliseconds, end time in
  *                 milliseconds.
  */
 Timer.prototype.toRange = function toRange() {
@@ -205,7 +205,7 @@ Timer.prototype.toRange = function toRange() {
  * milliseconds since start.
  *
  * @param {Timer} other The point relative to which this timer started.
- * @return {number} The offset in (floating-point) milliseconds.
+ * @returns {number} The offset in (floating-point) milliseconds.
  */
 Timer.prototype.startedRelativeTo = function startedRelativeTo(other) {
   if (this.hrstart && other.hrstart) {
@@ -220,6 +220,8 @@ Timer.prototype.startedRelativeTo = function startedRelativeTo(other) {
 
 /**
  * Returns true if this timer ends after the other.
+ *
+ * @param other
  */
 Timer.prototype.endsAfter = function compare(other) {
   return this.getDurationInMillis() + this.start > other.getDurationInMillis() + other.start

package/lib/transaction/dt-payload.js

@@ -15,7 +15,8 @@ module.exports = class DistributedTracePayload {
    * The class responsible for producing distributed trace payloads.
    * Created by calling {@link TransactionHandle#_createDistributedTracePayload}.
    *
-   * @constructor
+   * @param payload
+   * @class
    */
   constructor(payload) {
     logger.trace('DistributedTracePayload created with %s', payload)
@@ -27,7 +28,7 @@ module.exports = class DistributedTracePayload {
   }
 
   /**
-   * @returns {String} The base64 encoded JSON representation of the
+   * @returns {string} The base64 encoded JSON representation of the
    * distributed trace payload.
    */
   text() {
@@ -38,7 +39,7 @@ module.exports = class DistributedTracePayload {
   /**
    * Construct a payload suitable for HTTP transport.
    *
-   * @returns {String} The base64 encoded JSON representation of the
+   * @returns {string} The base64 encoded JSON representation of the
    * distributed trace payload.
    */
   httpSafe() {

package/lib/transaction/handle.js

@@ -14,7 +14,9 @@ class TransactionHandle {
    * A light representation of a transaction instance, returned by calling
    * {@link API#getTransaction}.
    *
-   * @constructor
+   * @param transaction
+   * @param metrics
+   * @class
    */
   constructor(transaction, metrics) {
     this._transaction = transaction
@@ -54,7 +56,9 @@ class TransactionHandle {
    * Parsing incoming headers for use in a distributed trace.
    * W3C TraceContext format is preferred over the NewRelic DT format.
    * NewRelic DT format will be used if no `traceparent` header is found.
+   *
    * @param @param {string} [transportType='Unknown'] - The transport type that delivered the trace.
+   * @param transportType
    * @param {object} headers - Headers to search for supported formats. Keys must be lowercase.
    */
   acceptDistributedTraceHeaders(transportType, headers) {
@@ -64,7 +68,8 @@ class TransactionHandle {
 
   /**
    * Inserts distributed trace headers into the provided headers map.
-   * @param {Object} headers
+   *
+   * @param {object} headers
    */
   insertDistributedTraceHeaders(headers) {
     incrementApiSupportMetric(this._metrics, 'insertDistributedTraceHeaders')
@@ -74,6 +79,11 @@ class TransactionHandle {
 
 module.exports = TransactionHandle
 
+/**
+ *
+ * @param metrics
+ * @param functionName
+ */
 function incrementApiSupportMetric(metrics, functionName) {
   if (!metrics) {
     logger.warnOnce(

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])
     }
   }
 }