newrelic 13.6.4 → 13.6.5

package/NEWS.md

@@ -1,11 +1,26 @@
-### v13.6.4 (2025-11-13)
-
-#### Bug fixes
-
-* Updated `MessageConsumerSubscriber` to end transaction created for a given message consumption ([#3503](https://github.com/newrelic/node-newrelic/pull/3503)) ([ba30818](https://github.com/newrelic/node-newrelic/commit/ba308184e5cb4f916aec53963cce0caa9149efbe))
-* Updated `MessageProducerSubscriber` to properly set the sampled flag on `traceparent` ([#3505](https://github.com/newrelic/node-newrelic/pull/3505)) ([0b1a9a8](https://github.com/newrelic/node-newrelic/commit/0b1a9a80b81e0f4388d421f17176eab386d04cbc))
-* Updated the bedrock middleware to be registered with a `high` priority to ensure payload is properly deserialized ([#3500](https://github.com/newrelic/node-newrelic/pull/3500)) ([63e531b](https://github.com/newrelic/node-newrelic/commit/63e531bf50d600d92556b3785725dd38145f3491))
-
+### v13.6.5 (2025-11-17)
+
+#### Bug fixes
+
+* Updated express instrumentation to ignore error when the `next` handler passes `route` or `router` ([#3513](https://github.com/newrelic/node-newrelic/pull/3513)) ([724b218](https://github.com/newrelic/node-newrelic/commit/724b218174bddcf2ecf8cffc317bbfad1f0012eb))
+* Updated MessageConsumerSubscriber to wait for consumer callback to end when it is a promise ([#3510](https://github.com/newrelic/node-newrelic/pull/3510)) ([45667a0](https://github.com/newrelic/node-newrelic/commit/45667a0ce2aaaf57a5e7a8acc8f0feea31e6152f))
+
+#### Documentation
+
+* Updated compatibility report ([#3498](https://github.com/newrelic/node-newrelic/pull/3498)) ([ef41b38](https://github.com/newrelic/node-newrelic/commit/ef41b3851b2096035d5b7b655d5243a9aeb699c8))
+
+#### Tests
+
+* Updated aws sdk v3 s3 test to no longer test DeleteBucketCommand ([#3512](https://github.com/newrelic/node-newrelic/pull/3512)) ([df27448](https://github.com/newrelic/node-newrelic/commit/df274484e0e657fd9c38452e500450878fc24ee4))
+
+### v13.6.4 (2025-11-13)
+
+#### Bug fixes
+
+* Updated `MessageConsumerSubscriber` to end transaction created for a given message consumption ([#3503](https://github.com/newrelic/node-newrelic/pull/3503)) ([ba30818](https://github.com/newrelic/node-newrelic/commit/ba308184e5cb4f916aec53963cce0caa9149efbe))
+* Updated `MessageProducerSubscriber` to properly set the sampled flag on `traceparent` ([#3505](https://github.com/newrelic/node-newrelic/pull/3505)) ([0b1a9a8](https://github.com/newrelic/node-newrelic/commit/0b1a9a80b81e0f4388d421f17176eab386d04cbc))
+* Updated the bedrock middleware to be registered with a `high` priority to ensure payload is properly deserialized ([#3500](https://github.com/newrelic/node-newrelic/pull/3500)) ([63e531b](https://github.com/newrelic/node-newrelic/commit/63e531bf50d600d92556b3785725dd38145f3491))
+
 ### v13.6.3 (2025-11-11)
 
 #### Bug fixes
@@ -8048,3 +8063,4 @@ Special thanks to Ryan Copley (@RyanCopley) for the contribution.
 
 
 
+

package/lib/subscribers/amqplib/connect.js

@@ -9,8 +9,11 @@ const isString = require('#agentlib/util/is-string.js')
 
 /**
  * This subscriber is two-fold:
- *  1. capture the connection arguments and assign to symbol on connection to be used for all other amqplib subscribers
- *  2. create a segment for the connect. Not this will attempt to create a segment but the base subscriber will decide if it is created or not, otherwise it'll return the current context
+ *  1. Capture the connection arguments and assign to symbol on connection to be
+ *  used for all other amqplib subscribers.
+ *  2. Create a segment for the connect. Note this will attempt to create a segment
+ *  but the base subscriber will decide if it is created or not, otherwise it'll
+ *  return the current context.
  */
 class ConnectSubscriber extends Subscriber {
   constructor({ agent, logger }) {

package/lib/subscribers/base.js

@@ -114,7 +114,9 @@ class Subscriber {
       asyncStart.runStores(context, () => {
         try {
           if (callback) {
-            return Reflect.apply(callback, this, arguments)
+            const cbResult = Reflect.apply(callback, this, arguments)
+            context.cbResult = cbResult
+            return cbResult
           }
         } finally {
           asyncEnd.publish(context)

package/lib/subscribers/express/base.js

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2025 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+const MiddlewareSubscriber = require('../middleware')
+
+/**
+ * Special error handler to ignore if the error passed to next handler
+ * is 'route' or 'router', which are used by Express internally to
+ * skip out of a route or router.
+ *
+ * @param {*} err - The error passed to the next handler
+ * @returns {boolean} - returns true if error exists and not equal to a string or `route` or `router`
+ */
+function errorHandler(err) {
+  return err && err !== 'route' && err !== 'router'
+}
+
+class ExpressSubscriber extends MiddlewareSubscriber {
+  constructor({ agent, logger, packageName = 'express', channelName }) {
+    super({ agent, logger, packageName, channelName, system: 'Expressjs', errorHandler })
+  }
+}
+
+module.exports = ExpressSubscriber

package/lib/subscribers/express/param.js

@@ -5,11 +5,11 @@
 
 'use strict'
 
-const MiddlewareSubscriber = require('../middleware')
+const ExpressSubscriber = require('./base')
 
-class ExpressParamSubscriber extends MiddlewareSubscriber {
-  constructor({ agent, logger, packageName = 'express' }) {
-    super({ agent, logger, packageName, channelName: 'nr_param', system: 'Expressjs' })
+class ExpressParamSubscriber extends ExpressSubscriber {
+  constructor({ agent, logger, packageName }) {
+    super({ agent, logger, packageName, channelName: 'nr_param' })
   }
 
   handler(data) {

package/lib/subscribers/express/route.js

@@ -5,12 +5,12 @@
 
 'use strict'
 
-const MiddlewareSubscriber = require('../middleware')
 const methods = ['all', 'delete', 'get', 'head', 'post', 'put', 'patch']
+const ExpressSubscriber = require('./base')
 
-class ExpressRouteSubscriber extends MiddlewareSubscriber {
-  constructor({ agent, logger, packageName = 'express' }) {
-    super({ agent, logger, packageName, channelName: 'nr_route', system: 'Expressjs' })
+class ExpressRouteSubscriber extends ExpressSubscriber {
+  constructor({ agent, logger, packageName }) {
+    super({ agent, logger, packageName, channelName: 'nr_route' })
     this.events = ['end']
   }
 

package/lib/subscribers/express/use.js

@@ -5,11 +5,11 @@
 
 'use strict'
 
-const MiddlewareSubscriber = require('../middleware')
+const ExpressSubscriber = require('./base')
 
-class ExpressUseSubscriber extends MiddlewareSubscriber {
-  constructor({ agent, logger, packageName = 'express' }) {
-    super({ agent, logger, packageName, channelName: 'nr_use', system: 'Expressjs' })
+class ExpressUseSubscriber extends ExpressSubscriber {
+  constructor({ agent, logger, packageName }) {
+    super({ agent, logger, packageName, channelName: 'nr_use' })
   }
 
   handler(data) {

package/lib/subscribers/message-consumer.js

@@ -66,11 +66,22 @@ class MessageConsumerSubscriber extends Subscriber {
   }
 
   /**
-   * Ends the transaction created for the consumption callback.
+   * Checks the result of the message handler.
+   * If it's a promise, waits for it to resolve before ending transaction.
+   * This ensures that the transaction stays active until the promise resolves.
+   * @param {object} data the data associated with the `asyncEnd` event
    */
-  asyncEnd() {
+  asyncEnd(data) {
     const ctx = this.agent.tracer.getContext()
-    ctx?.transaction?.end()
+    const result = data.cbResult
+    if (typeof result?.then === 'function') {
+      const prom = Promise.resolve(result)
+      prom.finally(() => {
+        ctx?.transaction?.end()
+      })
+    } else {
+      ctx?.transaction?.end()
+    }
   }
 
   enable() {

package/lib/subscribers/middleware-wrapper.js

@@ -19,6 +19,17 @@ function getFunctionName(handler) {
   return handler.name === '' ? '<anonymous>' : handler.name
 }
 
+/**
+ * Default error handler for determining if error should stored with transaction.
+ * Note: Based on previous shim instrumentation only Express, Restify, and Hapi have
+ * a different handler.
+ * @param {Error} err error passed to done handler
+ * @returns {boolean} returns true if error exists
+ */
+function defaultErrorHandler(err) {
+  return err
+}
+
 /**
  * The baseline parameters available to the middleware wrapper
  *
@@ -26,6 +37,7 @@ function getFunctionName(handler) {
  * @property {object} agent A New Relic Node.js agent instance.
  * @property {object} logger An agent logger instance.
  * @property {string} system handling the instrumentation(i.e - Fastify, Expressjs, Hapi, etc)
+ * @property {Function} [errorHandler] optional function to determine if error should be recorded
  */
 
 /**
@@ -36,13 +48,14 @@ function getFunctionName(handler) {
  * @property {string} prefix formatted prefix to name segments/timeslice metrics
  */
 class MiddlewareWrapper {
-  constructor({ agent, logger, system }) {
+  constructor({ agent, logger, system, errorHandler }) {
     this.agent = agent
     this.logger = logger
     this.system = system
     this.config = agent.config
     this.prefix = `Nodejs/Middleware/${this.system}`
     this.agent.environment.setFramework(system)
+    this.isError = errorHandler ?? defaultErrorHandler
   }
 
   /**
@@ -180,7 +193,7 @@ class MiddlewareWrapper {
     if (isSync) {
       function wrappedDone(...doneArgs) {
         const [err] = doneArgs
-        if (err) {
+        if (self.isError(err)) {
           self.storeError(txInfo, err)
         // route has been completed, pop from path
         // to allow other handlers to name it more accurately

package/lib/subscribers/middleware.js

@@ -8,12 +8,12 @@ const Subscriber = require('./base')
 const MiddlewareWrapper = require('./middleware-wrapper')
 
 class MiddlewareSubscriber extends Subscriber {
-  constructor({ agent, logger, packageName, channelName, system }) {
+  constructor({ agent, logger, packageName, channelName, system, errorHandler }) {
     super({ agent, logger, packageName, channelName })
     // this is because the handler simply wraps a function
     // that is executed later when a request is made
     this.requireActiveTx = false
-    this.wrapper = new MiddlewareWrapper({ agent, logger, system })
+    this.wrapper = new MiddlewareWrapper({ agent, logger, system, errorHandler })
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "13.6.4",
+  "version": "13.6.5",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [