newrelic 7.5.2 → 8.3.0

package/lib/serverless/aws-lambda.js

@@ -8,7 +8,7 @@
 const apiGateway = require('./api-gateway')
 const headerAttributes = require('../header-attributes')
 const get = require('../util/get')
-const logger = require('../logger').child({component: 'aws-lambda'})
+const logger = require('../logger').child({ component: 'aws-lambda' })
 const recordBackground = require('../metrics/recorders/other')
 const recordWeb = require('../metrics/recorders/http')
 const TransactionShim = require('../shim/transaction-shim')
@@ -106,7 +106,7 @@ class AwsLambda {
       })
     }
 
-    return shim.bindCreateTransaction(wrappedHandler, {type: shim.BG})
+    return shim.bindCreateTransaction(wrappedHandler, { type: shim.BG })
 
     function wrappedHandler() {
       const args = shim.argsToArray.apply(shim, arguments)
@@ -138,17 +138,12 @@ class AwsLambda {
         resultProcessor = getApiGatewayLambdaProxyResultProcessor(transaction)
       }
 
-
       const cbIndex = args.length - 1
 
       // Add transaction ending closure to the list of functions to be called on
       // beforeExit (i.e. in the case that context.{done,fail,succeed} or callback
       // were not called).
-      const txnEnder = endTransaction.bind(
-        null,
-        transaction,
-        transactionEnders.length
-      )
+      const txnEnder = endTransaction.bind(null, transaction, transactionEnders.length)
 
       transactionEnders.push(txnEnder)
 
@@ -171,10 +166,7 @@ class AwsLambda {
       })
 
       const awsAttributes = awsLambda._getAwsAgentAttributes(event, context)
-      transaction.trace.attributes.addAttributes(
-        ATTR_DEST.TRANS_COMMON,
-        awsAttributes
-      )
+      transaction.trace.attributes.addAttributes(ATTR_DEST.TRANS_COMMON, awsAttributes)
 
       shim.agent.setLambdaArn(context.invokedFunctionArn)
 
@@ -201,17 +193,20 @@ class AwsLambda {
     // we need to store the error in uncaughtException
     // otherwise the transaction will end before they are captured
     function lambdaInterceptPromise(prom, resultProcessor, cb) {
-      return prom.then(function onThen(arg) {
-        if (resultProcessor) {
-          resultProcessor(arg)
+      return prom.then(
+        function onThen(arg) {
+          if (resultProcessor) {
+            resultProcessor(arg)
+          }
+          cb()
+          return arg
+        },
+        function onCatch(err) {
+          uncaughtException = err
+          cb()
+          throw err // This is not our error, just rethrowing the promise rejection.
         }
-        cb()
-        return arg
-      }, function onCatch(err) {
-        uncaughtException = err
-        cb()
-        throw err // This is not our error, just rethrowing the promise rejection.
-      })
+      )
     }
 
     function wrapCallbackAndCaptureError(transaction, txnEnder, cb, processResult) {
@@ -285,8 +280,11 @@ function setEventSourceAttributes(event, attributes) {
   } else if (event.records && event.deliveryStreamArn) {
     // Kinesis Firehose
     attributes[EVENT_SOURCE_ARN_KEY] = event.deliveryStreamArn
-  } else if (event.requestContext && event.requestContext.elb &&
-    event.requestContext.elb.targetGroupArn) {
+  } else if (
+    event.requestContext &&
+    event.requestContext.elb &&
+    event.requestContext.elb.targetGroupArn
+  ) {
     attributes[EVENT_SOURCE_ARN_KEY] = event.requestContext.elb.targetGroupArn
   } else if (event.resources && event.resources[0]) {
     attributes[EVENT_SOURCE_ARN_KEY] = event.resources[0]
@@ -319,10 +317,7 @@ function setWebRequest(shim, transaction, request) {
     request.method
   )
 
-  segment.addSpanAttribute(
-    'request.method',
-    request.method
-  )
+  segment.addSpanAttribute('request.method', request.method)
 
   transaction.port = request.url.port
 
@@ -335,10 +330,7 @@ function setWebRequest(shim, transaction, request) {
     request.url.path
   )
 
-  segment.addSpanAttribute(
-    'request.uri',
-    request.url.path
-  )
+  segment.addSpanAttribute('request.uri', request.url.path)
 
   headerAttributes.collectRequestHeaders(request.headers, transaction)
 
@@ -351,11 +343,10 @@ function setWebRequest(shim, transaction, request) {
 }
 
 function lowercaseObjectKeys(original) {
-  const lowercaseObject = Object.keys(original)
-    .reduce((destination, key) => {
-      destination[key.toLowerCase()] = original[key]
-      return destination
-    }, {})
+  const lowercaseObject = Object.keys(original).reduce((destination, key) => {
+    destination[key.toLowerCase()] = original[key]
+    return destination
+  }, {})
 
   return lowercaseObject
 }

package/lib/shim/conglomerate-shim.js

@@ -5,10 +5,10 @@
 
 'use strict'
 
-const logger = require('../logger').child({component: 'ConglomerateShim'})
+const logger = require('../logger').child({ component: 'ConglomerateShim' })
 const Shim = require('./shim')
 
-const {MODULE_TYPE} = require('./constants')
+const { MODULE_TYPE } = require('./constants')
 const SHIM_CLASSES = {
   [MODULE_TYPE.GENERIC]: Shim,
   [MODULE_TYPE.DATASTORE]: require('./datastore-shim'),
@@ -27,7 +27,7 @@ const SHIM_CLASSES = {
 class ConglomerateShim extends Shim {
   constructor(agent, moduleName, resolvedName) {
     super(agent, moduleName, resolvedName)
-    this._logger = logger.child({module: moduleName})
+    this._logger = logger.child({ module: moduleName })
     this._resolvedName = resolvedName
   }
 
@@ -62,7 +62,7 @@ class ConglomerateShim extends Shim {
   makeSpecializedShim(type, submodule) {
     const ShimClass = SHIM_CLASSES[type]
     const shim = new ShimClass(this.agent, this.moduleName, this._resolvedName)
-    shim._logger = shim._logger.child({submodule})
+    shim._logger = shim._logger.child({ submodule })
     return shim
   }
 }

package/lib/shim/datastore-shim.js

@@ -7,7 +7,7 @@
 
 const dbutil = require('../db/utils')
 const hasOwnProperty = require('../util/properties').hasOwn
-const logger = require('../logger').child({component: 'DatastoreShim'})
+const logger = require('../logger').child({ component: 'DatastoreShim' })
 const metrics = require('../metrics/names')
 const parseSql = require('../db/query-parsers/sql')
 const ParsedStatement = require('../db/parsed-statement')
@@ -15,7 +15,6 @@ const Shim = require('./shim')
 const urltils = require('../util/urltils')
 const util = require('util')
 
-
 /**
  * An enumeration of well-known datastores so that new instrumentations can use
  * the same names we already use for first-party instrumentation.
@@ -47,7 +46,7 @@ const DATASTORE_NAMES = {
 const INSTANCE_UNKNOWN = 'unknown'
 
 const defaultParsers = {
-  'SQL': parseSql
+  SQL: parseSql
 }
 
 /**
@@ -93,7 +92,7 @@ const QUERY_PARSERS = {
  */
 function DatastoreShim(agent, moduleName, resolvedName, datastoreId) {
   Shim.call(this, agent, moduleName, resolvedName)
-  this._logger = logger.child({module: moduleName})
+  this._logger = logger.child({ module: moduleName })
   if (datastoreId) {
     this.setDatastore(datastoreId)
   }
@@ -326,8 +325,8 @@ function setDatastore(datastore) {
 
   this._datastore = datastore
 
-  this._logger = this._logger.child({datastore: this._metrics.PREFIX})
-  this.logger.trace({metrics: this._metrics}, 'Datastore metric names set')
+  this._logger = this._logger.child({ datastore: this._metrics.PREFIX })
+  this.logger.trace({ metrics: this._metrics }, 'Datastore metric names set')
 }
 
 /**
@@ -358,10 +357,7 @@ function setParser(parser) {
   } else if (this.isFunction(parser)) {
     this.queryParser = parser
   } else {
-    this.logger.trace(
-      "Received invalid parser (%s)",
-      parser
-    )
+    this.logger.trace('Received invalid parser (%s)', parser)
   }
 }
 
@@ -548,10 +544,9 @@ function parseQuery(query, nodule) {
     }
   }
 
-  var queryRecorded = (
+  var queryRecorded =
     this.agent.config.transaction_tracer.record_sql === 'raw' ||
     this.agent.config.transaction_tracer.record_sql === 'obfuscated'
-  )
 
   return new ParsedStatement(
     this._metrics.PREFIX,
@@ -733,18 +728,17 @@ function _recordQuery(suffix, nodule, properties, querySpec) {
     // If we're not actually recording this, then just return the segment
     // descriptor now.
     if (hasOwnProperty(queryDesc, 'record') && queryDesc.record === false) {
-      var parameters =
-        _normalizeParameters.call(shim, queryDesc.parameters || Object.create(null))
+      var parameters = _normalizeParameters.call(shim, queryDesc.parameters || Object.create(null))
       return {
         name: queryDesc.name || fnName,
         parameters,
-        callback:     'callback'    in queryDesc ? queryDesc.callback : null,
-        rowCallback:  'rowCallback' in queryDesc ? queryDesc.rowCallback : null,
-        stream:       'stream'      in queryDesc ? queryDesc.stream : null,
-        after:        'after'       in queryDesc ? queryDesc.after : null,
-        promise:      'promise'     in queryDesc ? queryDesc.promise : null,
-        internal:     'internal'    in queryDesc ? queryDesc.internal : false,
-        opaque:       'opaque'      in queryDesc ? queryDesc.opaque : false
+        callback: 'callback' in queryDesc ? queryDesc.callback : null,
+        rowCallback: 'rowCallback' in queryDesc ? queryDesc.rowCallback : null,
+        stream: 'stream' in queryDesc ? queryDesc.stream : null,
+        after: 'after' in queryDesc ? queryDesc.after : null,
+        promise: 'promise' in queryDesc ? queryDesc.promise : null,
+        internal: 'internal' in queryDesc ? queryDesc.internal : false,
+        opaque: 'opaque' in queryDesc ? queryDesc.opaque : false
       }
     }
 
@@ -760,18 +754,17 @@ function _recordQuery(suffix, nodule, properties, querySpec) {
     shim.logger.trace('Found and parsed query %s -> %s', parsed.type, name)
 
     // Return the segment descriptor.
-    var parameters =
-      _normalizeParameters.call(shim, queryDesc.parameters || Object.create(null))
+    var parameters = _normalizeParameters.call(shim, queryDesc.parameters || Object.create(null))
     return {
       name: shim._metrics.STATEMENT + name,
       parameters: parameters,
-      callback:     'callback'    in queryDesc ? queryDesc.callback : null,
-      rowCallback:  'rowCallback' in queryDesc ? queryDesc.rowCallback : null,
-      stream:       'stream'      in queryDesc ? queryDesc.stream : null,
-      after:        'after'       in queryDesc ? queryDesc.after : null,
-      promise:      'promise'     in queryDesc ? queryDesc.promise : null,
-      internal:     'internal'    in queryDesc ? queryDesc.internal : true,
-      opaque:       'opaque'      in queryDesc ? queryDesc.opaque : false,
+      callback: 'callback' in queryDesc ? queryDesc.callback : null,
+      rowCallback: 'rowCallback' in queryDesc ? queryDesc.rowCallback : null,
+      stream: 'stream' in queryDesc ? queryDesc.stream : null,
+      after: 'after' in queryDesc ? queryDesc.after : null,
+      promise: 'promise' in queryDesc ? queryDesc.promise : null,
+      internal: 'internal' in queryDesc ? queryDesc.internal : true,
+      opaque: 'opaque' in queryDesc ? queryDesc.opaque : false,
       recorder: function queryRecorder(segment, scope) {
         if (segment) {
           parsed.recordMetrics(segment, scope)
@@ -823,7 +816,7 @@ function _recordOperationMetrics(segment, scope) {
   )
 
   const attributes = segment.getAttributes()
-  if (attributes.host && attributes.port_path_or_id ) {
+  if (attributes.host && attributes.port_path_or_id) {
     const instanceName = [
       metrics.DB.INSTANCE,
       this._metrics.PREFIX,
@@ -892,13 +885,11 @@ function _normalizeParameters(parameters) {
   // Add database name if provided and enabled.
   if (!dsTracerConf.database_name_reporting.enabled) {
     delete parameters.database_name
-  } else if (
-    hasOwnProperty(parameters, 'database_name') &&
-    parameters.database_name !== false
-  ) {
-    parameters.database_name = typeof parameters.database_name === 'number'
-      ? String(parameters.database_name)
-      : (parameters.database_name || INSTANCE_UNKNOWN)
+  } else if (hasOwnProperty(parameters, 'database_name') && parameters.database_name !== false) {
+    parameters.database_name =
+      typeof parameters.database_name === 'number'
+        ? String(parameters.database_name)
+        : parameters.database_name || INSTANCE_UNKNOWN
   }
 
   // Add instance information if enabled.

package/lib/shim/index.js

@@ -15,6 +15,14 @@ const PromiseShim = require('./promise-shim')
 const TransactionShim = require('./transaction-shim')
 const WebFrameworkShim = require('./webframework-shim')
 const properties = require('../util/properties')
+const SHIM_TYPE_MAP = Object.create(null)
+SHIM_TYPE_MAP[constants.MODULE_TYPE.GENERIC] = Shim
+SHIM_TYPE_MAP[constants.MODULE_TYPE.CONGLOMERATE] = ConglomerateShim
+SHIM_TYPE_MAP[constants.MODULE_TYPE.DATASTORE] = DatastoreShim
+SHIM_TYPE_MAP[constants.MODULE_TYPE.MESSAGE] = MessageShim
+SHIM_TYPE_MAP[constants.MODULE_TYPE.PROMISE] = PromiseShim
+SHIM_TYPE_MAP[constants.MODULE_TYPE.TRANSACTION] = TransactionShim
+SHIM_TYPE_MAP[constants.MODULE_TYPE.WEB_FRAMEWORK] = WebFrameworkShim
 
 function createShimFromType(type, agent, moduleName, resolvedName) {
   var shim = null
@@ -27,15 +35,6 @@ function createShimFromType(type, agent, moduleName, resolvedName) {
   return shim
 }
 
-var SHIM_TYPE_MAP = Object.create(null)
-SHIM_TYPE_MAP[constants.MODULE_TYPE.GENERIC] = Shim
-SHIM_TYPE_MAP[constants.MODULE_TYPE.CONGLOMERATE] = ConglomerateShim
-SHIM_TYPE_MAP[constants.MODULE_TYPE.DATASTORE] = DatastoreShim
-SHIM_TYPE_MAP[constants.MODULE_TYPE.MESSAGE] = MessageShim
-SHIM_TYPE_MAP[constants.MODULE_TYPE.PROMISE] = PromiseShim
-SHIM_TYPE_MAP[constants.MODULE_TYPE.TRANSACTION] = TransactionShim
-SHIM_TYPE_MAP[constants.MODULE_TYPE.WEB_FRAMEWORK] = WebFrameworkShim
-
 exports.constants = constants
 exports.Shim = Shim
 exports.ConglomerateShim = ConglomerateShim

package/lib/shim/message-shim.js

@@ -7,7 +7,7 @@
 
 var copy = require('../util/copy')
 var genericRecorder = require('../metrics/recorders/generic')
-var logger = require('../logger').child({component: 'MessageShim'})
+var logger = require('../logger').child({ component: 'MessageShim' })
 var messageTransactionRecorder = require('../metrics/recorders/message-transaction')
 var props = require('../util/properties')
 var TransactionShim = require('./transaction-shim')
@@ -16,7 +16,6 @@ var util = require('util')
 
 var ATTR_DESTS = require('../config/attribute-filter').DESTINATIONS
 
-
 /**
  * Enumeration of well-known message brokers.
  *
@@ -60,7 +59,6 @@ const DESTINATION_TYPES = {
   TOPIC: 'Topic'
 }
 
-
 /**
  * Constructs a shim specialized for instrumenting message brokers.
  *
@@ -83,7 +81,7 @@ const DESTINATION_TYPES = {
  */
 function MessageShim(agent, moduleName, resolvedName) {
   TransactionShim.call(this, agent, moduleName, resolvedName)
-  this._logger = logger.child({module: moduleName})
+  this._logger = logger.child({ module: moduleName })
   this._metrics = null
   this._transportType = TransactionShim.TRANSPORT_TYPES.UNKNOWN
 }
@@ -293,8 +291,8 @@ function setLibrary(library) {
     this._transportType = LIBRARY_TRANSPORT_TYPES[library]
   }
 
-  this._logger = this._logger.child({library: library})
-  this.logger.trace({metrics: this._metrics}, 'Library metric names set')
+  this._logger = this._logger.child({ library: library })
+  this.logger.trace({ metrics: this._metrics }, 'Library metric names set')
 }
 
 /**
@@ -461,8 +459,7 @@ function recordConsume(nodule, properties, spec) {
 
       var segment = shim.createSegment(msgDesc)
       var getParams = shim.agent.config.message_tracer.segment_parameters.enabled
-      var resHandler = shim.isFunction(msgDesc.messageHandler)
-        ? msgDesc.messageHandler : null
+      var resHandler = shim.isFunction(msgDesc.messageHandler) ? msgDesc.messageHandler : null
 
       var cbIdx = shim.normalizeIndex(args.length, msgDesc.callback)
       if (cbIdx !== null) {
@@ -571,10 +568,14 @@ function recordPurgeQueue(nodule, properties, spec) {
     }
 
     return {
-      name: _nameMessageSegment(shim, {
-        destinationType: shim.QUEUE,
-        destinationName: queue
-      }, shim._metrics.PURGE),
+      name: _nameMessageSegment(
+        shim,
+        {
+          destinationType: shim.QUEUE,
+          destinationName: queue
+        },
+        shim._metrics.PURGE
+      ),
       recorder: genericRecorder,
       callback: descriptor.callback,
       promise: descriptor.promise,
@@ -672,10 +673,7 @@ function recordSubscribedConsume(nodule, properties, spec) {
       }
 
       if (consumerIdx !== null) {
-        args[consumerIdx] = shim.wrap(
-          args[consumerIdx],
-          makeWrapConsumer(queue, destName)
-        )
+        args[consumerIdx] = shim.wrap(args[consumerIdx], makeWrapConsumer(queue, destName))
       }
 
       return fn.apply(this, args)
@@ -718,112 +716,110 @@ function recordSubscribedConsume(nodule, properties, spec) {
         return consumer
       }
 
-      return shim.bindCreateTransaction(function createConsumeTrans() {
-        // If there is no transaction or we're in a pre-existing transaction,
-        // then don't do anything. Note that the latter should never happen.
-        var args = shim.argsToArray.apply(shim, arguments)
-        var tx = shim.tracer.getTransaction()
+      return shim.bindCreateTransaction(
+        function createConsumeTrans() {
+          // If there is no transaction or we're in a pre-existing transaction,
+          // then don't do anything. Note that the latter should never happen.
+          var args = shim.argsToArray.apply(shim, arguments)
+          var tx = shim.tracer.getTransaction()
 
-        if (!tx || tx.baseSegment) {
-          shim.logger.debug({transaction: !!tx}, 'Failed to start message transaction.')
-          return consumer.apply(this, args)
-        }
+          if (!tx || tx.baseSegment) {
+            shim.logger.debug({ transaction: !!tx }, 'Failed to start message transaction.')
+            return consumer.apply(this, args)
+          }
 
-        var msgDesc = spec.messageHandler.call(this, shim, consumer, cName, args)
+          var msgDesc = spec.messageHandler.call(this, shim, consumer, cName, args)
 
-        // If message could not be handled, immediately kill this transaction.
-        if (!msgDesc) {
-          shim.logger.debug('No description for message, cancelling transaction.')
-          tx.setForceIgnore(true)
-          tx.end()
-          return consumer.apply(this, args)
-        }
+          // If message could not be handled, immediately kill this transaction.
+          if (!msgDesc) {
+            shim.logger.debug('No description for message, cancelling transaction.')
+            tx.setForceIgnore(true)
+            tx.end()
+            return consumer.apply(this, args)
+          }
 
-        // Derive the transaction name.
-        shim.setDefaults(msgDesc, msgDescDefaults)
-        var txName = _nameMessageTransaction(shim, msgDesc)
-        tx.setPartialName(txName)
-        tx.baseSegment = shim.createSegment({
-          name: tx.getFullName(),
-          recorder: messageTransactionRecorder
-        })
+          // Derive the transaction name.
+          shim.setDefaults(msgDesc, msgDescDefaults)
+          var txName = _nameMessageTransaction(shim, msgDesc)
+          tx.setPartialName(txName)
+          tx.baseSegment = shim.createSegment({
+            name: tx.getFullName(),
+            recorder: messageTransactionRecorder
+          })
 
-        // Add would-be baseSegment attributes to transaction trace
-        for (var key in msgDesc.parameters) {
-          if (props.hasOwn(msgDesc.parameters, key)) {
-            tx.trace.attributes.addAttribute(
-              ATTR_DESTS.NONE,
-              'message.parameters.' + key,
-              msgDesc.parameters[key])
-
-            tx.baseSegment.attributes.addAttribute(
-              ATTR_DESTS.NONE,
-              'message.parameters.' + key,
-              msgDesc.parameters[key]
-            )
+          // Add would-be baseSegment attributes to transaction trace
+          for (var key in msgDesc.parameters) {
+            if (props.hasOwn(msgDesc.parameters, key)) {
+              tx.trace.attributes.addAttribute(
+                ATTR_DESTS.NONE,
+                'message.parameters.' + key,
+                msgDesc.parameters[key]
+              )
+
+              tx.baseSegment.attributes.addAttribute(
+                ATTR_DESTS.NONE,
+                'message.parameters.' + key,
+                msgDesc.parameters[key]
+              )
+            }
           }
-        }
 
-        // If we have a routing key, add it to the transaction. Note that it is
-        // camel cased here, but snake cased in the segment parameters.
-        if (!shim.agent.config.high_security) {
-          if (msgDesc.routingKey) {
-            tx.trace.attributes.addAttribute(
-              ATTR_DESTS.TRANS_COMMON,
-              'message.routingKey',
-              msgDesc.routingKey
-            )
-
-            tx.baseSegment.addSpanAttribute(
-              'message.routingKey',
-              msgDesc.routingKey
-            )
+          // If we have a routing key, add it to the transaction. Note that it is
+          // camel cased here, but snake cased in the segment parameters.
+          if (!shim.agent.config.high_security) {
+            if (msgDesc.routingKey) {
+              tx.trace.attributes.addAttribute(
+                ATTR_DESTS.TRANS_COMMON,
+                'message.routingKey',
+                msgDesc.routingKey
+              )
+
+              tx.baseSegment.addSpanAttribute('message.routingKey', msgDesc.routingKey)
+            }
+            if (shim.isString(msgDesc.queue)) {
+              tx.trace.attributes.addAttribute(
+                ATTR_DESTS.TRANS_COMMON,
+                'message.queueName',
+                msgDesc.queue
+              )
+
+              tx.baseSegment.addSpanAttribute('message.queueName', msgDesc.queue)
+            }
           }
-          if (shim.isString(msgDesc.queue)) {
-            tx.trace.attributes.addAttribute(
-              ATTR_DESTS.TRANS_COMMON,
-              'message.queueName',
-              msgDesc.queue
-            )
-
-            tx.baseSegment.addSpanAttribute(
-              'message.queueName',
-              msgDesc.queue
-            )
+          if (msgDesc.headers) {
+            shim.handleCATHeaders(msgDesc.headers, tx.baseSegment, shim._transportType)
           }
-        }
-        if (msgDesc.headers) {
-          shim.handleCATHeaders(msgDesc.headers, tx.baseSegment, shim._transportType)
-        }
 
-        shim.logger.trace('Started message transaction %s named %s', tx.id, txName)
-
-        // Execute the original function and attempt to hook in the transaction
-        // finish.
-        var ret = null
-        try {
-          ret = shim.applySegment(consumer, tx.baseSegment, true, this, args)
-        } finally {
-          if (shim.isPromise(ret)) {
-            shim.logger.trace('Got a promise, attaching tx %s ending to promise', tx.id)
-            ret = shim.interceptPromise(ret, endTransaction)
-          } else if (!tx.handledExternally) {
-            // We have no way of knowing when this transaction ended! ABORT!
-            shim.logger.trace('Immediately ending message tx %s', tx.id)
-            setImmediate(endTransaction)
+          shim.logger.trace('Started message transaction %s named %s', tx.id, txName)
+
+          // Execute the original function and attempt to hook in the transaction
+          // finish.
+          var ret = null
+          try {
+            ret = shim.applySegment(consumer, tx.baseSegment, true, this, args)
+          } finally {
+            if (shim.isPromise(ret)) {
+              shim.logger.trace('Got a promise, attaching tx %s ending to promise', tx.id)
+              ret = shim.interceptPromise(ret, endTransaction)
+            } else if (!tx.handledExternally) {
+              // We have no way of knowing when this transaction ended! ABORT!
+              shim.logger.trace('Immediately ending message tx %s', tx.id)
+              setImmediate(endTransaction)
+            }
           }
-        }
 
-        return ret
+          return ret
 
-        function endTransaction() {
-          tx.finalizeName(null) // Use existing partial name.
-          tx.end()
+          function endTransaction() {
+            tx.finalizeName(null) // Use existing partial name.
+            tx.end()
+          }
+        },
+        {
+          type: shim.MESSAGE,
+          nest: true
         }
-      }, {
-        type: shim.MESSAGE,
-        nest: true
-      })
+      )
     }
   }
 }
@@ -843,8 +839,12 @@ function recordSubscribedConsume(nodule, properties, spec) {
  */
 function _nameMessageSegment(shim, msgDesc, action) {
   var name =
-    shim._metrics.PREFIX + shim._metrics.LIBRARY + '/' +
-    (msgDesc.destinationType || shim.EXCHANGE) + '/' + action
+    shim._metrics.PREFIX +
+    shim._metrics.LIBRARY +
+    '/' +
+    (msgDesc.destinationType || shim.EXCHANGE) +
+    '/' +
+    action
 
   if (msgDesc.destinationName) {
     name += shim._metrics.NAMED + msgDesc.destinationName
@@ -856,9 +856,7 @@ function _nameMessageSegment(shim, msgDesc, action) {
 }
 
 function _nameMessageTransaction(shim, msgDesc) {
-  var name =
-    shim._metrics.LIBRARY + '/' +
-    (msgDesc.destinationType || shim.EXCHANGE) + '/'
+  var name = shim._metrics.LIBRARY + '/' + (msgDesc.destinationType || shim.EXCHANGE) + '/'
 
   if (msgDesc.destinationName) {
     name += shim._metrics.NAMED + msgDesc.destinationName