newrelic 12.11.0 → 12.11.1

package/NEWS.md

@@ -1,3 +1,21 @@
+### v12.11.1 (2025-01-16)
+
+#### Bug fixes
+
+* Updated undici instrumentation to fix crash with trying to calculate exclusive duration on a segment that no longer exists ([#2884](https://github.com/newrelic/node-newrelic/pull/2884)) ([3b7e4bf](https://github.com/newrelic/node-newrelic/commit/3b7e4bf0a40b21f16b11e7761809cbaa83c02515))
+
+#### Documentation
+
+* Updated compatibility report ([#2878](https://github.com/newrelic/node-newrelic/pull/2878)) ([e784f84](https://github.com/newrelic/node-newrelic/commit/e784f8427bd49852f0ed7a15d6025ea8dfc73c72))
+
+#### Miscellaneous chores
+
+* Fixed dns integration tests ([#2883](https://github.com/newrelic/node-newrelic/pull/2883)) ([dd30ad7](https://github.com/newrelic/node-newrelic/commit/dd30ad71f07233682da39ca41f452a55c6798a15))
+
+#### Tests
+
+* Restored the branch to test apollo-server-plugin to main ([#2879](https://github.com/newrelic/node-newrelic/pull/2879)) ([978faab](https://github.com/newrelic/node-newrelic/commit/978faab59f5378e26cb8f5e584a3c9e684e7bbb1))
+
 ### v12.11.0 (2025-01-14)
 
 #### Features

package/lib/feature_flags.js

@@ -13,7 +13,6 @@ exports.prerelease = {
 
   promise_segments: false,
   reverse_naming_rules: false,
-  undici_async_tracking: true,
   unresolved_promise_cleanup: true,
   kafkajs_instrumentation: false
 }
@@ -36,6 +35,7 @@ exports.released = [
   'await_support',
   'certificate_bundle',
   'async_local_context',
+  'undici_async_tracking',
   'undici_instrumentation',
   'aws_bedrock_instrumentation',
   'langchain_instrumentation'

package/lib/instrumentation/undici.js

@@ -11,8 +11,6 @@ const logger = require('../logger').child({ component: 'undici' })
 const NAMES = require('../metrics/names')
 const symbols = require('../symbols')
 // eslint-disable-next-line n/no-unsupported-features/node-builtins
-const { executionAsyncResource } = require('async_hooks')
-// eslint-disable-next-line n/no-unsupported-features/node-builtins
 const diagnosticsChannel = require('diagnostics_channel')
 const synthetics = require('../synthetics')
 const urltils = require('../util/urltils')
@@ -49,42 +47,6 @@ module.exports.unsubscribe = function unsubscribe() {
   })
 }
 
-/**
- * Retrieves the current segment(parent in our context) and transaction from executionAsyncResource
- * or from context manager then adds to the executionAsyncResource for future
- * undici requests within same async context.
- *
- * It was found that when running concurrent undici requests
- * within a transaction that the parent segment would get out of sync
- * depending on the async context of the transaction.  By using
- * `async_hooks.executionResource` it is more reliable.
- *
- * Note: However, if you have concurrent undici requests in a transaction
- * and the request to the transaction is using a keep alive there is a chance the
- * executionAsyncResource may be incorrect because of shared connections.  To revert to a more
- * naive tracking of parent set `config.feature_flag.undici_async_tracking: false` and
- * it will just get the segment and transaction from the context manager.
- *
- * @param {Shim} shim instance of shim
- * @returns {TraceSegment} parent segment
- */
-function getParentContext(shim) {
-  const { config } = shim.agent
-  if (config.feature_flag.undici_async_tracking) {
-    const resource = executionAsyncResource()
-
-    if (!resource[symbols.parentSegment]) {
-      const parent = shim.getSegment()
-      resource[symbols.parentSegment] = parent
-      const tx = shim.tracer.getTransaction()
-      resource[symbols.transaction] = tx
-    }
-    return { segment: resource[symbols.parentSegment], transaction: resource[symbols.transaction] }
-  }
-
-  return shim.tracer.getContext()
-}
-
 /**
  * Injects relevant DT headers for the external request
  *
@@ -160,7 +122,7 @@ function createExternalSegment({ shim, request, segment }) {
  */
 function requestCreateHook(shim, { request }) {
   const { config } = shim.agent
-  const { transaction, segment } = getParentContext(shim)
+  const { transaction, segment } = shim.tracer.getContext()
   request[symbols.parentSegment] = segment
   request[symbols.transaction] = transaction
   if (!(segment || transaction) || segment?.opaque) {
@@ -221,9 +183,8 @@ function requestHeadersHook(shim, { request, response }) {
 }
 
 /**
- * Gets the active and parent from given ctx(request, client connector)
- * and ends active and restores parent to active.  If an error exists
- * it will add the error to the transaction
+ * Gets the active segment, parent segment and transaction from given ctx(request, client connector)
+ * and ends segment and sets the previous parent segment as the active segment.  If an error exists it will add the error to the transaction
  *
  * @param {Shim} shim instance of shim
  * @param {object} params object from undici hook
@@ -236,14 +197,14 @@ function endAndRestoreSegment(shim, { request, error }) {
   const tx = request[symbols.transaction]
   if (activeSegment) {
     activeSegment.end()
+  }
 
-    if (error) {
-      handleError(shim, tx, error)
-    }
+  if (error && tx) {
+    handleError(shim, tx, error)
+  }
 
-    if (parentSegment) {
-      shim.setActiveSegment(parentSegment)
-    }
+  if (parentSegment) {
+    shim.setActiveSegment(parentSegment)
   }
 }
 

package/package.json

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