newrelic 9.5.0 → 9.7.0

package/lib/instrumentation/mysql/mysql.js

@@ -7,6 +7,7 @@
 
 const dbutils = require('../../db/utils')
 const properties = require('../../util/properties')
+const symbols = require('../../symbols')
 
 exports.callbackInitialize = function callbackInitialize(shim, mysql) {
   shim.setDatastore(shim.MYSQL)
@@ -17,7 +18,7 @@ exports.callbackInitialize = function callbackInitialize(shim, mysql) {
     shim.logger.debug('Wrapping Connection#query')
     if (wrapQueryable(shim, connection, false)) {
       const connProto = Object.getPrototypeOf(connection)
-      shim.setInternalProperty(connProto, '__NR_storeDatabase', true)
+      connProto[symbols.storeDatabase] = true
       shim.unwrap(mysql, 'createConnection')
     }
   }
@@ -133,7 +134,7 @@ function wrapQueryable(shim, queryable, isPoolQuery) {
     describe = describePoolQuery
   } else {
     describe = describeQuery
-    shim.setInternalProperty(proto, '__NR_databaseName', null)
+    proto[symbols.databaseName] = null
   }
 
   shim.recordQuery(proto, 'query', describe)
@@ -214,7 +215,7 @@ function getInstanceParameters(shim, queryable, query) {
   const parameters = { host: null, port_path_or_id: null, database_name: null }
   let conf = queryable.config
   conf = (conf && conf.connectionConfig) || conf
-  let databaseName = queryable.__NR_databaseName || null
+  let databaseName = queryable[symbols.databaseName] || null
   if (conf) {
     parameters.database_name = databaseName = databaseName || conf.database
 
@@ -235,10 +236,10 @@ function getInstanceParameters(shim, queryable, query) {
 }
 
 function storeDatabaseName(shim, queryable, query) {
-  if (queryable.__NR_storeDatabase) {
+  if (queryable[symbols.storeDatabase]) {
     const databaseName = dbutils.extractDatabaseChangeFromUse(query)
     if (databaseName) {
-      shim.setInternalProperty(queryable, '__NR_databaseName', databaseName)
+      queryable[symbols.databaseName] = databaseName
     }
   }
 }

package/lib/instrumentation/nr-winston-transport.js

@@ -36,7 +36,7 @@ class NrTransport extends TransportStream {
    */
   log(logLine, callback) {
     const metadata = this.agent.getLinkingMetadata()
-    const formattedLine = reformatLogLine(logLine, metadata, this.agent)
+    const formattedLine = reformatLogLine(logLine, metadata)
     this.agent.logs.add(formattedLine)
     callback()
   }
@@ -52,10 +52,9 @@ module.exports = NrTransport
  *
  * @param {object} logLine log line
  * @param {object} metadata linking metadata
- * @param {object} agent NR agent
  * @returns {object} copy of log line with NR linking metadata
  */
-function reformatLogLine(logLine, metadata, agent) {
+function reformatLogLine(logLine, metadata) {
   // Add the metadata to a copy of the logLine
   const formattedLine = Object.assign({}, logLine, metadata)
 
@@ -63,7 +62,7 @@ function reformatLogLine(logLine, metadata, agent) {
     reformatError(formattedLine)
   }
 
-  reformatTimestamp(formattedLine, agent)
+  reformatTimestamp(formattedLine)
 
   return formattedLine
 }

package/lib/instrumentation/promise.js

@@ -5,9 +5,13 @@
 
 'use strict'
 
+/* eslint sonarjs/cognitive-complexity: ["error", 101] -- TODO: https://issues.newrelic.com/browse/NEWRELIC-5252 */
+
 const util = require('util')
 const properties = require('../util/properties')
 const shimmer = require('../shimmer')
+const symbols = require('../symbols')
+const ANONYMOUS = '<anonymous>'
 
 /**
  * @namespace Library.Spec
@@ -143,7 +147,7 @@ module.exports = function initialize(agent, library, spec) {
       cnstrctArgs.unshift(Promise) // `unshift` === `push_front`
       promise = new (Promise.bind.apply(Promise, cnstrctArgs))()
     } else {
-      const segmentName = 'Promise ' + (executor.name || '<anonymous>')
+      const segmentName = 'Promise ' + (executor.name || ANONYMOUS)
       const context = {
         promise: null,
         self: null,
@@ -213,13 +217,13 @@ module.exports = function initialize(agent, library, spec) {
         self: null,
         args: null
       }
-      if (!this.__NR_context) {
-        const segmentName = 'Promise ' + executor.name || '<anonymous>'
+      if (!this[symbols.context]) {
+        const segmentName = 'Promise ' + executor.name || ANONYMOUS
         const segment = _createSegment(segmentName)
         Contextualizer.link(null, this, segment, spec.useFinally)
       }
       const args = [].slice.call(arguments)
-      args[0] = wrapExecutorContext(context, this.__NR_context.getSegment())
+      args[0] = wrapExecutorContext(context)
       const ret = caller.apply(this, args)
 
       // Bluebird catches executor errors and auto-rejects when it catches them,
@@ -256,8 +260,8 @@ module.exports = function initialize(agent, library, spec) {
   function wrapResolver(context, fn) {
     return function wrappedResolveReject(val) {
       const promise = context.promise
-      if (promise && promise.__NR_context) {
-        promise.__NR_context.getSegment().touch()
+      if (promise && promise[symbols.context]) {
+        promise[symbols.context].getSegment().touch()
       }
       fn(val)
     }
@@ -333,15 +337,15 @@ module.exports = function initialize(agent, library, spec) {
         }
 
         return function __NR_wrappedThenHandler() {
-          if (!next || !next.__NR_context) {
+          if (!next || !next[symbols.context]) {
             return fn.apply(this, arguments)
           }
 
-          let promSegment = next.__NR_context.getSegment()
-          const segmentName = segmentNamePrefix + (fn.name || '<anonymous>')
+          let promSegment = next[symbols.context].getSegment()
+          const segmentName = segmentNamePrefix + (fn.name || ANONYMOUS)
           const segment = _createSegment(segmentName, promSegment)
           if (segment && segment !== promSegment) {
-            next.__NR_context.setSegment(segment)
+            next[symbols.context].setSegment(segment)
             promSegment = segment
           }
 
@@ -350,7 +354,7 @@ module.exports = function initialize(agent, library, spec) {
             ret = agent.tracer.bindFunction(fn, promSegment, true).apply(this, arguments)
           } finally {
             if (ret && typeof ret.then === 'function') {
-              ret = next.__NR_context.continue(ret)
+              ret = next[symbols.context].continue(ret)
             }
           }
           return ret
@@ -453,9 +457,9 @@ function Contextualizer(idx, context, useFinally) {
 module.exports.Contextualizer = Contextualizer
 
 Contextualizer.link = function link(prev, next, segment, useFinally) {
-  let ctxlzr = prev && prev.__NR_context
+  let ctxlzr = prev && prev[symbols.context]
   if (ctxlzr && !ctxlzr.isActive()) {
-    ctxlzr = prev.__NR_context = null
+    ctxlzr = prev[symbols.context] = null
   }
 
   if (ctxlzr) {
@@ -497,17 +501,17 @@ Contextualizer.link = function link(prev, next, segment, useFinally) {
     const idx = ctxlzr.child === false ? ctxlzr.context.branch() : ctxlzr.idx
 
     // Create a new context for this next promise.
-    next.__NR_context = new Contextualizer(idx, ctxlzr.context, ctxlzr.useFinally)
-    next.__NR_context.parentIdx = ctxlzr.idx
+    next[symbols.context] = new Contextualizer(idx, ctxlzr.context, ctxlzr.useFinally)
+    next[symbols.context].parentIdx = ctxlzr.idx
 
     // If this was our first child, remember it in case we have a 2nd.
     if (ctxlzr.child === null) {
-      ctxlzr.child = next.__NR_context
+      ctxlzr.child = next[symbols.context]
     }
   } else if (segment) {
     // This next promise is the root of a chain. Either there was no previous
     // promise or the promise was created out of context.
-    next.__NR_context = new Contextualizer(0, new Context(segment), useFinally)
+    next[symbols.context] = new Contextualizer(0, new Context(segment), useFinally)
   }
 }
 
@@ -538,7 +542,7 @@ Contextualizer.prototype.toJSON = function toJSON() {
 
 Contextualizer.prototype.continue = function continueContext(prom) {
   const self = this
-  const nextContext = prom.__NR_context
+  const nextContext = prom[symbols.context]
   if (!nextContext) {
     return prom
   }

package/lib/instrumentation/redis.js

@@ -5,6 +5,8 @@
 
 'use strict'
 
+/* eslint sonarjs/cognitive-complexity: ["error", 52] -- TODO: https://issues.newrelic.com/browse/NEWRELIC-5252 */
+
 const hasOwnProperty = require('../util/properties').hasOwn
 const stringify = require('json-stringify-safe')
 

package/lib/instrumentation/undici.js

@@ -5,15 +5,14 @@
 
 'use strict'
 
+/* eslint sonarjs/cognitive-complexity: ["error", 53] -- TODO: https://issues.newrelic.com/browse/NEWRELIC-5252 */
+
 const cat = require('../util/cat')
 const recordExternal = require('../metrics/recorders/http_external')
 const logger = require('../logger').child({ component: 'undici' })
 const NAMES = require('../metrics/names')
 const NEWRELIC_SYNTHETICS_HEADER = 'x-newrelic-synthetics'
-const SYMBOLS = {
-  SEGMENT: Symbol('__NR_segment'),
-  PARENT_SEGMENT: Symbol('__NR_parent_segment')
-}
+const symbols = require('../symbols')
 const { executionAsyncResource } = require('async_hooks')
 
 let diagnosticsChannel = null
@@ -52,11 +51,11 @@ module.exports = function addUndiciChannels(agent, undici, modName, shim) {
     if (agent.config.feature_flag.undici_async_tracking) {
       const resource = executionAsyncResource()
 
-      if (!resource[SYMBOLS.PARENT_SEGMENT]) {
+      if (!resource[symbols.parentSegment]) {
         const parent = shim.getSegment()
-        resource[SYMBOLS.PARENT_SEGMENT] = parent
+        resource[symbols.parentSegment] = parent
       }
-      return resource[SYMBOLS.PARENT_SEGMENT]
+      return resource[symbols.parentSegment]
     }
     return shim.getSegment()
   }
@@ -71,7 +70,7 @@ module.exports = function addUndiciChannels(agent, undici, modName, shim) {
    */
   diagnosticsChannel.channel('undici:request:create').subscribe(({ request }) => {
     const parent = getParentSegment()
-    request[SYMBOLS.PARENT_SEGMENT] = parent
+    request[symbols.parentSegment] = parent
     if (!parent || (parent && parent.opaque)) {
       logger.trace(
         'Not capturing data for outbound request (%s) because parent segment opaque (%s)',
@@ -114,7 +113,7 @@ module.exports = function addUndiciChannels(agent, undici, modName, shim) {
    * @param {TLSSocket | net.Socket} socket active socket connection
    */
   diagnosticsChannel.channel('undici:client:sendHeaders').subscribe(({ request, socket }) => {
-    const parentSegment = request[SYMBOLS.PARENT_SEGMENT]
+    const parentSegment = request[symbols.parentSegment]
     if (!parentSegment || (parentSegment && parentSegment.opaque)) {
       return
     }
@@ -143,7 +142,7 @@ module.exports = function addUndiciChannels(agent, undici, modName, shim) {
         segment.addSpanAttribute(`request.parameters.${key}`, value)
       })
       segment.addAttribute('procedure', request.method || 'GET')
-      request[SYMBOLS.SEGMENT] = segment
+      request[symbols.segment] = segment
     }
   })
 
@@ -157,7 +156,7 @@ module.exports = function addUndiciChannels(agent, undici, modName, shim) {
    * @param {object} params.response { statusCode, headers, statusText }
    */
   diagnosticsChannel.channel('undici:request:headers').subscribe(({ request, response }) => {
-    const activeSegment = request[SYMBOLS.SEGMENT]
+    const activeSegment = request[symbols.segment]
     if (!activeSegment) {
       return
     }
@@ -211,8 +210,8 @@ module.exports = function addUndiciChannels(agent, undici, modName, shim) {
    * @param {Error} error
    */
   function endAndRestoreSegment(ctx, error) {
-    const activeSegment = ctx[SYMBOLS.SEGMENT]
-    const parentSegment = ctx[SYMBOLS.PARENT_SEGMENT]
+    const activeSegment = ctx[symbols.segment]
+    const parentSegment = ctx[symbols.parentSegment]
     if (activeSegment) {
       activeSegment.end()
 
@@ -238,5 +237,3 @@ module.exports = function addUndiciChannels(agent, undici, modName, shim) {
     shim.agent.errors.add(tx, error)
   }
 }
-
-module.exports.SYMBOLS = SYMBOLS

package/lib/instrumentations.js

@@ -36,7 +36,7 @@ module.exports = function instrumentations() {
     'restify': { type: MODULE_TYPE.WEB_FRAMEWORK },
     'superagent': { module: '@newrelic/superagent' },
     'undici': { type: MODULE_TYPE.TRANSACTION },
-    'vision': { type: MODULE_TYPE.WEB_FRAMEWORK },
+    '@hapi/vision': { type: MODULE_TYPE.WEB_FRAMEWORK },
     'when': { type: null },
     'winston': { type: MODULE_TYPE.GENERIC }
   }

package/lib/metrics/mapper.js

@@ -67,9 +67,8 @@ MetricMapper.prototype.load = function load(raw) {
 }
 
 /**
- * @param {String} name  The metric name.
- * @param {String} scope The scope for the metric, if set.
- *
+ * @param {string} name  The metric name.
+ * @param {string} scope The scope for the metric, if set.
  * @returns {object} Either a metric spec based on the parameters, or the
  *                   server-sent ID.
  */

package/lib/metrics/metric-aggregator.js

@@ -43,9 +43,7 @@ class MetricAggregator extends Aggregator {
     const beginSeconds = this._metrics.started * FROM_MILLIS
     const endSeconds = Date.now() * FROM_MILLIS
 
-    const payload = [this.runId, beginSeconds, endSeconds, this._metrics.toJSON()]
-
-    return payload
+    return [this.runId, beginSeconds, endSeconds, this._metrics.toJSON()]
   }
 
   _getMergeData() {

package/lib/metrics/names.js

@@ -10,6 +10,10 @@ const NODEJS = {
 }
 
 const ALL = 'all'
+const POSTGRES_LITERAL = 'Postgres'
+const CASSANDRA_LITERAL = 'Cassandra'
+const EXPRESS_LITERAL = 'Expressjs'
+const OTHER_TRANSACTION_MESSAGE = 'OtherTransaction/Message'
 
 const SUPPORTABILITY = {
   PREFIX: 'Supportability/',
@@ -133,24 +137,24 @@ const REDIS = {
 }
 
 const POSTGRES = {
-  PREFIX: 'Postgres',
-  STATEMENT: DB.STATEMENT + '/Postgres/',
-  OPERATION: DB.OPERATION + '/Postgres/',
-  INSTANCE: DB.INSTANCE + '/Postgres/'
+  PREFIX: POSTGRES_LITERAL,
+  STATEMENT: DB.STATEMENT + `/${POSTGRES_LITERAL}/`,
+  OPERATION: DB.OPERATION + `/${POSTGRES_LITERAL}/`,
+  INSTANCE: DB.INSTANCE + `/${POSTGRES_LITERAL}/`
 }
 
 const CASSANDRA = {
-  PREFIX: 'Cassandra',
-  OPERATION: DB.OPERATION + '/Cassandra/',
-  STATEMENT: DB.STATEMENT + '/Cassandra/',
-  INSTANCE: DB.INSTANCE + '/Cassandra/',
-  ALL: DB.PREFIX + 'Cassandra/' + ALL
+  PREFIX: CASSANDRA_LITERAL,
+  OPERATION: DB.OPERATION + `/${CASSANDRA_LITERAL}/`,
+  STATEMENT: DB.STATEMENT + `/${CASSANDRA_LITERAL}/`,
+  INSTANCE: DB.INSTANCE + `/${CASSANDRA_LITERAL}/`,
+  ALL: DB.PREFIX + `${CASSANDRA_LITERAL}/` + ALL
 }
 
 const EXPRESS = {
-  PREFIX: 'Expressjs/',
-  MIDDLEWARE: MIDDLEWARE.PREFIX + 'Expressjs/',
-  ERROR_HANDLER: MIDDLEWARE.PREFIX + 'Expressjs/'
+  PREFIX: `${EXPRESS_LITERAL}/`,
+  MIDDLEWARE: MIDDLEWARE.PREFIX + `${EXPRESS_LITERAL}/`,
+  ERROR_HANDLER: MIDDLEWARE.PREFIX + `${EXPRESS_LITERAL}/`
 }
 
 const RESTIFY = {
@@ -216,12 +220,12 @@ const OTHER_TRANSACTION = {
   PREFIX: 'OtherTransaction',
   RESPONSE_TIME: 'OtherTransaction',
   TOTAL_TIME: 'OtherTransactionTotalTime',
-  MESSAGE: 'OtherTransaction/Message'
+  MESSAGE: OTHER_TRANSACTION_MESSAGE
 }
 
 const MESSAGE_TRANSACTION = {
-  PREFIX: 'OtherTransaction/Message',
-  RESPONSE_TIME: 'OtherTransaction/Message',
+  PREFIX: OTHER_TRANSACTION_MESSAGE,
+  RESPONSE_TIME: OTHER_TRANSACTION_MESSAGE,
   TOTAL_TIME: 'OtherTransactionTotalTime/Message'
 }
 

package/lib/metrics/normalizer/rule.js

@@ -9,6 +9,8 @@ const logger = require('../../logger').child({ component: 'normalizer_rule' })
 
 /**
  * JavaScript just has to do things slightly differently.
+ *
+ * @param input
  */
 const replaceReplacer = function replaceReplacer(input) {
   return input.replace(/\\/g, '$')
@@ -20,7 +22,7 @@ const replaceReplacer = function replaceReplacer(input) {
  * fairly straightforward mapping of the concepts in metric normalization
  * rules into an object form.
  *
- * @param {Object} json A JavaScript object literal parsed out from the JSON
+ * @param {object} json A JavaScript object literal parsed out from the JSON
  *                      from the collector.
  */
 function NormalizerRule(json) {
@@ -74,8 +76,7 @@ NormalizerRule.prototype.getSegments = function getSegments(input) {
  * Does not set {NormalizerRule#matched}.
  *
  * @param {string} input - URL to match.
- *
- * @return {bool} - True if this rule matches the given input, otherwise false.
+ * @returns {bool} - True if this rule matches the given input, otherwise false.
  */
 NormalizerRule.prototype.matches = function matches(input) {
   const segments = this.getSegments(input)
@@ -106,8 +107,7 @@ NormalizerRule.prototype.matches = function matches(input) {
  * XXX `RegExp#lastIndex` to `0`.
  *
  * @param {string} input - URL to normalize.
- *
- * @return {string?} - The normalized url, or `null` if this is an ignore rule
+ * @returns {string?} - The normalized url, or `null` if this is an ignore rule
  *  that matched this url.
  */
 NormalizerRule.prototype.apply = function apply(input) {
@@ -150,8 +150,7 @@ NormalizerRule.prototype.toJSON = function toJSON() {
  *
  * @param {RegExp} re     - The regular expression to add flags to.
  * @param {string} flags  - The flags to add to the regex.
- *
- * @return {RegExp} - A regular expression with all the given flags added.
+ * @returns {RegExp} - A regular expression with all the given flags added.
  */
 function _addRegExpFlags(re, flags) {
   let foundMissing = false

package/lib/metrics/normalizer/tx_segment.js

@@ -5,6 +5,8 @@
 
 'use strict'
 
+/* eslint sonarjs/cognitive-complexity: ["error", 17] -- TODO: https://issues.newrelic.com/browse/NEWRELIC-5252 */
+
 const logger = require('../../logger').child({ component: 'tx_segment_normalizer' })
 
 module.exports = TxSegmentNormalizer
@@ -29,8 +31,7 @@ function TxSegmentNormalizer() {
  *  6. Join together the modified segments with slashes, and re-prepend the prefix.
  *
  * @param {string} path - The transaction metric path to normalize.
- *
- * @return {NormalizationResults} - The results of normalizing the given path.
+ * @returns {NormalizationResults} - The results of normalizing the given path.
  */
 TxSegmentNormalizer.prototype.normalize = function normalize(path) {
   let currentTerm

package/lib/metrics/normalizer.js

@@ -5,6 +5,8 @@
 
 'use strict'
 
+/* eslint sonarjs/cognitive-complexity: ["error", 24] -- TODO: https://issues.newrelic.com/browse/NEWRELIC-5252 */
+
 const EventEmitter = require('events').EventEmitter
 const util = require('util')
 const logger = require('../logger').child({ component: 'metric_normalizer' })
@@ -41,6 +43,7 @@ function plain(normalized, path) {
  * @param {object} config The agent's configuration blob, which has a parameter
  *                        that indicates whether to enforce the normalization
  *                        backstop.
+ * @param type
  */
 function MetricNormalizer(config, type) {
   if (!config) {
@@ -68,8 +71,7 @@ util.inherits(MetricNormalizer, EventEmitter)
 // -------------------------------------------------------------------------- //
 
 /**
- * @typedef {Object} NormalizationResults
- *
+ * @typedef {object} NormalizationResults
  * @property {bool}   matched - True if a rule was found that matched.
  * @property {bool}   ignore  - True if the given input should be ignored.
  * @property {string} value   - The normalized input value.
@@ -83,6 +85,7 @@ util.inherits(MetricNormalizer, EventEmitter)
  *
  * @param object json The de-serialized JSON response sent on collector
  *                    connection.
+ * @param json
  */
 MetricNormalizer.prototype.load = function load(json) {
   if (json) {
@@ -196,7 +199,6 @@ MetricNormalizer.prototype.addSimple = function addSimple(pattern, name) {
  * Turn a (scrubbed) URL path into partial metric name.
  *
  * @param {string} path - The URL path to turn into a name.
- *
  * @returns {NormalizationResults} - The results of normalization.
  */
 MetricNormalizer.prototype.normalize = function normalize(path) {

package/lib/parse-proc-cpuinfo.js

@@ -6,10 +6,15 @@
 'use strict'
 
 const logger = require('./logger.js').child({ component: 'proc-cpuinfo' })
+const PHYSICAL_ID = 'physical id'
+const CPU_CORES = 'cpu cores'
+const PROCESSOR = 'processor'
+const CORE_ID = 'core id'
+
 module.exports = parseProcCPUInfo
 
 function parseProcCPUInfo(data) {
-  const relevantAttributes = ['processor', 'physical id', 'cpu cores', 'core id']
+  const relevantAttributes = [PROCESSOR, PHYSICAL_ID, CPU_CORES, CORE_ID]
 
   let processorStats = {
     logical: null,
@@ -102,12 +107,12 @@ function countProcessorStats(processors) {
   for (let i = 0; i < processors.length; i++) {
     const processor = processors[i]
     if (
-      processor['physical id'] &&
-      processor['cpu cores'] &&
-      phys.indexOf(processor['physical id']) === -1
+      processor[PHYSICAL_ID] &&
+      processor[CPU_CORES] &&
+      phys.indexOf(processor[PHYSICAL_ID]) === -1
     ) {
-      phys.push(processor['physical id'])
-      cores.push(processor['cpu cores'])
+      phys.push(processor[PHYSICAL_ID])
+      cores.push(processor[CPU_CORES])
     }
   }
 

package/lib/serverless/api-gateway.js

@@ -38,8 +38,7 @@ class LambdaProxyWebResponse {
 /**
  * Determines if Lambda event appears to be a valid Lambda Proxy event.
  *
- * @param {Object} event The event to inspect.
- *
+ * @param {object} event The event to inspect.
  * @returns {boolean} Whether the given object contains fields necessary
  *                    to create a web transaction.
  */
@@ -50,8 +49,8 @@ function isLambdaProxyEvent(event) {
 /**
  * Determines if Lambda event appears to be a valid Lambda Proxy response.
  *
- * @param {Object} event The response to inspect.
- *
+ * @param {object} event The response to inspect.
+ * @param response
  * @returns {boolean} Whether the given object contains fields necessary
  *                    to create a web transaction.
  */

package/lib/serverless/aws-lambda.js

@@ -5,6 +5,8 @@
 
 'use strict'
 
+/* eslint sonarjs/cognitive-complexity: ["error", 29] -- TODO: https://issues.newrelic.com/browse/NEWRELIC-5252 */
+
 const apiGateway = require('./api-gateway')
 const headerAttributes = require('../header-attributes')
 const get = require('../util/get')
@@ -348,12 +350,10 @@ function setWebRequest(shim, transaction, request) {
 }
 
 function lowercaseObjectKeys(original) {
-  const lowercaseObject = Object.keys(original).reduce((destination, key) => {
+  return Object.keys(original).reduce((destination, key) => {
     destination[key.toLowerCase()] = original[key]
     return destination
   }, {})
-
-  return lowercaseObject
 }
 
 function endTransaction(transaction, enderIndex) {

package/lib/shim/conglomerate-shim.js

@@ -22,7 +22,7 @@ const SHIM_CLASSES = {
  * A shim for wrapping all-in-one modules which implement multiple services.
  *
  * @private
- * @extends Shim
+ * @augments Shim
  */
 class ConglomerateShim extends Shim {
   constructor(agent, moduleName, resolvedName) {
@@ -56,8 +56,7 @@ class ConglomerateShim extends Shim {
    *
    * @param {MODULE_TYPE} type  - The type of shim to construct.
    * @param {string} submodule  - The name of the submodule this will instrument.
-   *
-   * @return {Shim} A new shim of the given type.
+   * @returns {Shim} A new shim of the given type.
    */
   makeSpecializedShim(type, submodule) {
     const ShimClass = SHIM_CLASSES[type]

package/lib/shim/constants.js

@@ -12,7 +12,7 @@
  * @readonly
  * @enum {string}
  */
-const MODULE_TYPE = {
+exports.MODULE_TYPE = {
   /** Utility/generic module, such as pooling libraries. */
   GENERIC: 'generic',
 
@@ -34,18 +34,3 @@ const MODULE_TYPE = {
   /** Web server framework module, such as Express or Restify. */
   WEB_FRAMEWORK: 'web-framework'
 }
-
-/**
- * Enumeration of symbols used by shims.
- *
- * @memberof Shim.prototype
- * @readonly
- * @enum {Symbol}
- */
-const SYMBOLS = {
-  /** Indicates distributed tracing should be disabled for a single request. */
-  DISABLE_DT: Symbol('Disable distributed tracing')
-}
-
-exports.MODULE_TYPE = MODULE_TYPE
-exports.SYMBOLS = SYMBOLS