newrelic 12.11.2 → 12.11.3

package/NEWS.md

@@ -1,3 +1,22 @@
+### v12.11.3 (2025-01-29)
+
+#### Bug fixes
+
+* Fixed issue with `bluebird` and `when` instrumentation where checking active context crashed when transaction prematurely ends ([#2909](https://github.com/newrelic/node-newrelic/pull/2909)) ([4a30d5c](https://github.com/newrelic/node-newrelic/commit/4a30d5c5082e963cca3664f2ed152017f6360d21))
+* Fixed transaction-shim to properly create new transactions when the existing transaction is not active ([#2912](https://github.com/newrelic/node-newrelic/pull/2912)) ([3ad8c59](https://github.com/newrelic/node-newrelic/commit/3ad8c59e15e037a366ddf6803729b61ecfa701f3))
+
+#### Documentation
+
+* Updated compatibility report ([#2902](https://github.com/newrelic/node-newrelic/pull/2902)) ([cb16516](https://github.com/newrelic/node-newrelic/commit/cb16516e90a3dc2cefb98e6131a7243412aefbfc))
+
+#### Miscellaneous chores
+
+* Updated lint rule suppression comment ([#2895](https://github.com/newrelic/node-newrelic/pull/2895)) ([559dc98](https://github.com/newrelic/node-newrelic/commit/559dc98e18c8ba8280b73779780f3efc1c946ed7))
+
+#### Continuous integration
+
+* Move init container release from lambda to GHA ([#2848](https://github.com/newrelic/node-newrelic/pull/2848)) ([8d8608d](https://github.com/newrelic/node-newrelic/commit/8d8608d1089cafaeb8c17354034c96fe1b49597a))
+
 ### v12.11.2 (2025-01-23)
 
 #### Features

package/lib/db/utils.js

@@ -11,9 +11,9 @@ function extractDatabaseChangeFromUse(sql) {
   // The character ranges for this were pulled from
   // http://dev.mysql.com/doc/refman/5.7/en/identifiers.html
 
-  // Suppressing a warning on this regex because it is not obvious what this
-  // regex does, and we don't want to break anything.
-  // eslint-disable-next-line sonarjs/slow-regex, sonarjs/duplicates-in-character-class
-  const match = /^\s*use[^\w`]+([\w$_\u0080-\uFFFF]+|`[^`]+`)[\s;]*$/i.exec(sql)
+  // The lint rule being suppressed here has been evaluated, and it has been
+  // determined that the regular expression is sufficient for our use case.
+  // eslint-disable-next-line sonarjs/slow-regex
+  const match = /^\s*use[^\w`]+([\w$\u0080-\uFFFF]+|`[^`]+`)[\s;]*$/i.exec(sql)
   return (match && match[1]) || null
 }

package/lib/instrumentation/when/contextualizer.js

@@ -116,7 +116,8 @@ Contextualizer.prototype = Object.create(null)
 Contextualizer.prototype.isActive = function isActive() {
   const segments = this.context.segments
   const segment = segments[this.idx] || segments[this.parentIdx] || segments[0]
-  return segment && this.context.transaction.isActive()
+  const transaction = this.getTransaction()
+  return segment && transaction?.isActive()
 }
 
 /**

package/lib/shim/promise-shim.js

@@ -121,7 +121,7 @@ class PromiseShim extends Shim {
           const transaction = shim.tracer.getTransaction()
           // This extra property is added by `_wrapExecutorContext` in the pre step.
           const executor = args[0]
-          const context = executor && executor[symbols.executorContext]
+          const context = executor?.[symbols.executorContext]
           if (!context || !shim.isFunction(context.executor)) {
             return
           }
@@ -387,9 +387,7 @@ function _wrapExecutorContext(shim, args) {
 function _wrapResolver(context, fn) {
   return function wrappedResolveReject(val) {
     const promise = context.promise
-    if (promise && promise[symbols.context]) {
-      promise[symbols.context].getSegment().touch()
-    }
+    promise?.[symbols.context]?.getSegment()?.touch()
     fn(val)
   }
 }
@@ -416,7 +414,7 @@ function wrapHandler({ handler, index, argsLength, useAllParams, ctx, shim }) {
   }
 
   return function __NR_wrappedThenHandler() {
-    if (!ctx.handler || !ctx.handler[symbols.context]) {
+    if (!ctx?.handler?.[symbols.context]) {
       return handler.apply(this, arguments)
     }
 
@@ -591,7 +589,8 @@ class Contextualizer {
   isActive() {
     const segments = this.context.segments
     const segment = segments[this.idx] || segments[this.parentIdx] || segments[0]
-    return segment && this.context.transaction.isActive()
+    const transaction = this.getTransaction()
+    return segment && transaction?.isActive()
   }
 
   getTransaction() {

package/lib/shim/transaction-shim.js

@@ -372,12 +372,13 @@ function _makeNestedTransWrapper(shim, func, name, spec) {
     }
 
     let context = shim.tracer.getContext()
+    let transaction = shim.tracer.getTransaction()
 
     // Only create a new transaction if we either do not have a current
     // transaction _or_ the current transaction is not of the type we want.
-    if (!context?.transaction || spec.type !== context?.transaction?.type) {
+    if (!transaction || spec.type !== transaction?.type) {
       shim.logger.trace('Creating new nested %s transaction for %s', spec.type, name)
-      const transaction = new Transaction(shim.agent)
+      transaction = new Transaction(shim.agent)
       transaction.type = spec.type
       context = context.enterTransaction(transaction)
     }
@@ -405,10 +406,11 @@ function _makeNestedTransWrapper(shim, func, name, spec) {
  */
 function _makeTransWrapper(shim, func, name, spec) {
   return function transactionWrapper() {
-    // Don't nest transactions, reuse existing ones!
     let context = shim.tracer.getContext()
-    const existingTransaction = context.transaction
+    // Don't nest transactions, reuse existing ones!
+    const existingTransaction = shim.tracer.getTransaction()
     if (!shim.agent.canCollectData() || existingTransaction) {
+      shim.logger.trace('Transaction %s exists, not creating new transaction %s for %s', existingTransaction?.id, spec.type, name)
       return func.apply(this, arguments)
     }
 

package/package.json

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