newrelic 12.14.0 → 12.16.0

package/NEWS.md

@@ -1,46 +1,99 @@
-### v12.14.0 (2025-02-18)
-
-#### Features
-
-* Added support for region-prefixed Bedrock models ([#2947](https://github.com/newrelic/node-newrelic/pull/2947)) ([6acf535](https://github.com/newrelic/node-newrelic/commit/6acf5354d1e7f6786da88c0078699e82a714551d))
-* Added attribute reconciliation for message producer spans ([#2942](https://github.com/newrelic/node-newrelic/pull/2942)) ([a9ba396](https://github.com/newrelic/node-newrelic/commit/a9ba39613c78b89c047ca35a218c2eedbb01e3d2))
-* Added timeslice metrics for synthesized consumer segments ([#2938](https://github.com/newrelic/node-newrelic/pull/2938)) ([acfe953](https://github.com/newrelic/node-newrelic/commit/acfe953cf7a656fafb69104384c72f94ddc13000))
-
-#### Bug fixes
-
-* Fixed queueing of logs from child loggers ([#2945](https://github.com/newrelic/node-newrelic/pull/2945)) ([888cfe8](https://github.com/newrelic/node-newrelic/commit/888cfe84a1ffaf0287682cc9099a2fa762f7a37f))
-* Fixed undici/fetch instrumentation to properly assign the parent-id portion of the `traceparent` header on outgoing requests to the active http external span id ([#2951](https://github.com/newrelic/node-newrelic/pull/2951)) ([bc714cf](https://github.com/newrelic/node-newrelic/commit/bc714cfa8fe6754abf25eb556b8f804c9982f986))
-* Updated `api.recordLogEvent` to no longer truncate the message key in log event ([#2949](https://github.com/newrelic/node-newrelic/pull/2949)) ([8dd557b](https://github.com/newrelic/node-newrelic/commit/8dd557b4dfca2505b7e9f7f030ab094a6ae8019a))
-    * Thanks for your contribution @rChaoz 🎉 
-
-#### Documentation
-
-* Updated compatibility report ([#2948](https://github.com/newrelic/node-newrelic/pull/2948)) ([8e32ed7](https://github.com/newrelic/node-newrelic/commit/8e32ed7d7bc456a0693485e7bdef955c25ead29a))
-
-### v12.13.0 (2025-02-12)
-
-#### Features
-
-* Added timeslice metrics for synthesized server segments ([#2924](https://github.com/newrelic/node-newrelic/pull/2924)) ([f404585](https://github.com/newrelic/node-newrelic/commit/f4045855a1cdbfb74e3217daf8bfa125aa6fe2e4))
-* Added timeslice metrics for synthesized producer segments ([#2939](https://github.com/newrelic/node-newrelic/pull/2939)) ([6832637](https://github.com/newrelic/node-newrelic/commit/68326377dcd23b574abae7c323ff93bc05c525ed))
-* Added timeslice metrics for synthesized database segments ([#2922](https://github.com/newrelic/node-newrelic/pull/2922)) ([8606f78](https://github.com/newrelic/node-newrelic/commit/8606f789772b7651d0c46ad50dad3a1da74e5e9c))
-* Propagate agent root context when opentelemetry `ROOT_CONTEXT` is passed in to trace propagator.([#2940](https://github.com/newrelic/node-newrelic/pull/2940)) ([b85111c](https://github.com/newrelic/node-newrelic/commit/b85111c46797dfbf399faf973e7a3e0ea6bbdc28)) 
-  * Added logic to handle properly naming and ending transactions for server spans. 
-* Provided ability to disable instrumentation for core Node.js libraries ([#2927](https://github.com/newrelic/node-newrelic/pull/2927)) ([2d232f1](https://github.com/newrelic/node-newrelic/commit/2d232f16c167e5f84b7b7898a6c5410d9cece55e))
-
-#### Bug fixes
-
-* Fixed `api.getTraceMetadata` to handle when there is an active transaction but not active segment ([#2944](https://github.com/newrelic/node-newrelic/pull/2944)) ([6db3b4d](https://github.com/newrelic/node-newrelic/commit/6db3b4d53a077a9738dd72d46e1ba1cee0d6af3f))
-
-#### Documentation
-
-* Updated compatibility report ([#2920](https://github.com/newrelic/node-newrelic/pull/2920)) ([c7ae8be](https://github.com/newrelic/node-newrelic/commit/c7ae8befafa4c91fab6804cd95e20f5a93546ea4))
-
-#### Miscellaneous chores
-
-* Localized OTEL attribute constants ([#2928](https://github.com/newrelic/node-newrelic/pull/2928)) ([965c41b](https://github.com/newrelic/node-newrelic/commit/965c41b3e64805ac14ae4dd36120b018ec5899f4))
-* Updated import-in-the-middle version ([#2923](https://github.com/newrelic/node-newrelic/pull/2923)) ([aa2781f](https://github.com/newrelic/node-newrelic/commit/aa2781fd9c7bed08d590e33682729a92f21f43a5))
-
+### v12.16.0 (2025-03-17)
+
+#### Features
+
+* Added support for response streaming Lambda functions ([#2981](https://github.com/newrelic/node-newrelic/pull/2981)) ([61dbbf9](https://github.com/newrelic/node-newrelic/commit/61dbbf9b4a6cf69f5378387fc9c17c31671e9da4))
+* Added AWS entity linking segment attributes for otel bridge ([#2978](https://github.com/newrelic/node-newrelic/pull/2978)) ([6bf1ccc](https://github.com/newrelic/node-newrelic/commit/6bf1ccc657a955b4064a7a3a473bf24948d4ff56))
+* Added error handling on transactions for otel spans ([#2985](https://github.com/newrelic/node-newrelic/pull/2985)) ([4e61e09](https://github.com/newrelic/node-newrelic/commit/4e61e0935394744345c39f6b581ee86e66d0f82c))
+
+#### Code refactoring
+
+* Updated span event generation to assign the appropriate `span.kind` based on the segment name ([#2976](https://github.com/newrelic/node-newrelic/pull/2976)) ([697b17e](https://github.com/newrelic/node-newrelic/commit/697b17e0553111aa494d08bc33eb7043cdfa8ca6))
+
+#### Documentation
+
+* Updated compatibility report ([#2988](https://github.com/newrelic/node-newrelic/pull/2988)) ([ed17a6d](https://github.com/newrelic/node-newrelic/commit/ed17a6df1152a8e54cb8c8570fec0015990a4247)
+
+#### Miscellaneous chores
+
+* Clarified supported next.js middleware versions in docs ([#2984](https://github.com/newrelic/node-newrelic/pull/2984)) ([15cb454](https://github.com/newrelic/node-newrelic/commit/15cb454f9cc38ccc22089d62aaeea54713159aa7))
+* Clarified system metrics sampler naming ([#2987](https://github.com/newrelic/node-newrelic/pull/2987)) ([8647d43](https://github.com/newrelic/node-newrelic/commit/8647d43f097d6d3d68a372824d9feb325604be96))
+* Refactored loops to be simpler ([#2990](https://github.com/newrelic/node-newrelic/pull/2990)) ([79fb8e9](https://github.com/newrelic/node-newrelic/commit/79fb8e90802954b617c1c00aecc866aa065aee12))
+* Removed unused transaction method ([#2986](https://github.com/newrelic/node-newrelic/pull/2986)) ([cb4e2f7](https://github.com/newrelic/node-newrelic/commit/cb4e2f7a8b84adb6d744a2083b083c92e306fbd5))
+* Reverted restriction in NestJS versioned tests ([#2979](https://github.com/newrelic/node-newrelic/pull/2979)) ([ffddcab](https://github.com/newrelic/node-newrelic/commit/ffddcab6d77bfc10c0df9cbfa724bc1c8f5fb251))
+
+#### Tests
+
+* Fixed fastify assertions around span kind while running security agent ([#2983](https://github.com/newrelic/node-newrelic/pull/2983)) ([c641645](https://github.com/newrelic/node-newrelic/commit/c6416451f1fa6126b7dfd59f6b9267f9d2188ad0))
+
+### v12.15.0 (2025-03-03)
+
+#### Features
+
+* Allowed undici error reporting to be disabled with feature flag `undici_error_tracking` ([#2956](https://github.com/newrelic/node-newrelic/pull/2956)) ([6278107](https://github.com/newrelic/node-newrelic/commit/6278107727678c8b45769190c6972c33057067e5))
+     * Thanks for your contribution @Voziv :tada:
+* Added ability to propagate traceparent and tracestate on incoming server/consumer spans and outgoing client http and producer spans ([#2958](https://github.com/newrelic/node-newrelic/pull/2958)) ([258ad7d](https://github.com/newrelic/node-newrelic/commit/258ad7de7751df59cf6d68334e342f751bb3a934))
+* Added server span transaction naming fallback to the url.path ([#2966](https://github.com/newrelic/node-newrelic/pull/2966)) ([770bf6f](https://github.com/newrelic/node-newrelic/commit/770bf6fd6ce26642e3fe08b2c1557dd826270516))
+* Updated Context class to ensure bi-directional context propagation with opentelemetry bridge ([#2962](https://github.com/newrelic/node-newrelic/pull/2962)) ([dfeec5a](https://github.com/newrelic/node-newrelic/commit/dfeec5a0443723e7f799db4b9ea7bf4aed5b3bcc))
+
+#### Code refactoring
+
+* Separated context classes for agent in standard and opentelemetry bridge mode ([#2967](https://github.com/newrelic/node-newrelic/pull/2967)) ([d11c071](https://github.com/newrelic/node-newrelic/commit/d11c071be2504ef442e5aa19fed769ca7a20ceb5))
+
+#### Documentation
+
+* Updated compatibility report ([#2973](https://github.com/newrelic/node-newrelic/pull/2973)) ([7106c81](https://github.com/newrelic/node-newrelic/commit/7106c818b7add3220d256646cd816dee64efb80a))
+
+#### Miscellaneous chores
+
+* Added consumer attribute reconciliation ([#2957](https://github.com/newrelic/node-newrelic/pull/2957)) ([8943672](https://github.com/newrelic/node-newrelic/commit/894367239e5e8050da0a38347b81d7186cac0a1f))
+* Added http external span attributes ([#2955](https://github.com/newrelic/node-newrelic/pull/2955)) ([ef697a5](https://github.com/newrelic/node-newrelic/commit/ef697a505ee23f5c2fb2bbe306e90561e66d75c1))
+* Limit nestjs to enable successful CI ([#2972](https://github.com/newrelic/node-newrelic/pull/2972)) ([e9699cf](https://github.com/newrelic/node-newrelic/commit/e9699cf31ff758ff79f44c470bc5f11630117f1c))
+* Refactored otel attribute reconciling ([#2964](https://github.com/newrelic/node-newrelic/pull/2964)) ([1b5ed2c](https://github.com/newrelic/node-newrelic/commit/1b5ed2c2f7c78cb413603124757b9b1c3412ab0a))
+
+### v12.14.0 (2025-02-18)
+
+#### Features
+
+* Added support for region-prefixed Bedrock models ([#2947](https://github.com/newrelic/node-newrelic/pull/2947)) ([6acf535](https://github.com/newrelic/node-newrelic/commit/6acf5354d1e7f6786da88c0078699e82a714551d))
+* Added attribute reconciliation for message producer spans ([#2942](https://github.com/newrelic/node-newrelic/pull/2942)) ([a9ba396](https://github.com/newrelic/node-newrelic/commit/a9ba39613c78b89c047ca35a218c2eedbb01e3d2))
+* Added timeslice metrics for synthesized consumer segments ([#2938](https://github.com/newrelic/node-newrelic/pull/2938)) ([acfe953](https://github.com/newrelic/node-newrelic/commit/acfe953cf7a656fafb69104384c72f94ddc13000))
+
+#### Bug fixes
+
+* Fixed queueing of logs from child loggers ([#2945](https://github.com/newrelic/node-newrelic/pull/2945)) ([888cfe8](https://github.com/newrelic/node-newrelic/commit/888cfe84a1ffaf0287682cc9099a2fa762f7a37f))
+* Fixed undici/fetch instrumentation to properly assign the parent-id portion of the `traceparent` header on outgoing requests to the active http external span id ([#2951](https://github.com/newrelic/node-newrelic/pull/2951)) ([bc714cf](https://github.com/newrelic/node-newrelic/commit/bc714cfa8fe6754abf25eb556b8f804c9982f986))
+* Updated `api.recordLogEvent` to no longer truncate the message key in log event ([#2949](https://github.com/newrelic/node-newrelic/pull/2949)) ([8dd557b](https://github.com/newrelic/node-newrelic/commit/8dd557b4dfca2505b7e9f7f030ab094a6ae8019a))
+    * Thanks for your contribution @rChaoz 🎉 
+
+#### Documentation
+
+* Updated compatibility report ([#2948](https://github.com/newrelic/node-newrelic/pull/2948)) ([8e32ed7](https://github.com/newrelic/node-newrelic/commit/8e32ed7d7bc456a0693485e7bdef955c25ead29a))
+
+### v12.13.0 (2025-02-12)
+
+#### Features
+
+* Added timeslice metrics for synthesized server segments ([#2924](https://github.com/newrelic/node-newrelic/pull/2924)) ([f404585](https://github.com/newrelic/node-newrelic/commit/f4045855a1cdbfb74e3217daf8bfa125aa6fe2e4))
+* Added timeslice metrics for synthesized producer segments ([#2939](https://github.com/newrelic/node-newrelic/pull/2939)) ([6832637](https://github.com/newrelic/node-newrelic/commit/68326377dcd23b574abae7c323ff93bc05c525ed))
+* Added timeslice metrics for synthesized database segments ([#2922](https://github.com/newrelic/node-newrelic/pull/2922)) ([8606f78](https://github.com/newrelic/node-newrelic/commit/8606f789772b7651d0c46ad50dad3a1da74e5e9c))
+* Propagate agent root context when opentelemetry `ROOT_CONTEXT` is passed in to trace propagator.([#2940](https://github.com/newrelic/node-newrelic/pull/2940)) ([b85111c](https://github.com/newrelic/node-newrelic/commit/b85111c46797dfbf399faf973e7a3e0ea6bbdc28)) 
+  * Added logic to handle properly naming and ending transactions for server spans. 
+* Provided ability to disable instrumentation for core Node.js libraries ([#2927](https://github.com/newrelic/node-newrelic/pull/2927)) ([2d232f1](https://github.com/newrelic/node-newrelic/commit/2d232f16c167e5f84b7b7898a6c5410d9cece55e))
+
+#### Bug fixes
+
+* Fixed `api.getTraceMetadata` to handle when there is an active transaction but not active segment ([#2944](https://github.com/newrelic/node-newrelic/pull/2944)) ([6db3b4d](https://github.com/newrelic/node-newrelic/commit/6db3b4d53a077a9738dd72d46e1ba1cee0d6af3f))
+
+#### Documentation
+
+* Updated compatibility report ([#2920](https://github.com/newrelic/node-newrelic/pull/2920)) ([c7ae8be](https://github.com/newrelic/node-newrelic/commit/c7ae8befafa4c91fab6804cd95e20f5a93546ea4))
+
+#### Miscellaneous chores
+
+* Localized OTEL attribute constants ([#2928](https://github.com/newrelic/node-newrelic/pull/2928)) ([965c41b](https://github.com/newrelic/node-newrelic/commit/965c41b3e64805ac14ae4dd36120b018ec5899f4))
+* Updated import-in-the-middle version ([#2923](https://github.com/newrelic/node-newrelic/pull/2923)) ([aa2781f](https://github.com/newrelic/node-newrelic/commit/aa2781fd9c7bed08d590e33682729a92f21f43a5))
+
 ### v12.12.0 (2025-02-05)
 
 #### Features

package/README.md

@@ -31,7 +31,7 @@ To use New Relic's Node.js agent entails these three steps, which are described
 
 3. Now, add your New Relic license key and application/service name to that file:
 
-```js
+    ```js
     /* File: newrelic.js */
     'use strict'
     /**
@@ -45,30 +45,29 @@ To use New Relic's Node.js agent entails these three steps, which are described
       license_key: 'your new relic license key',
       /* ... rest of configuration .. */
     }
-```
+    ```
 
 4. Finally, run your program with the `newrelic` module loaded first by using node's `-r/--require` flag.
 
-```
- $ node -r newrelic your-program.js
-```
+    ```sh
+    $ node -r newrelic your-program.js
+    ```
 
-If you cannot control how your program is run, you can load the `newrelic` module _before any other module_ in your program.
+    If you cannot control how your program is run, you can load the `newrelic` module _before any other module_ in your program.
 
-```js
+    ```js
     const newrelic = require('newrelic')
 
     /* ... the rest of your program ... */
-```
+    ```
 
 ## Next.js instrumentation
 **Note**: The minimum supported Next.js version is [12.0.9](https://github.com/vercel/next.js/releases/tag/v12.0.9).  If you are using Next.js middleware the minimum supported version is [12.2.0](https://github.com/vercel/next.js/releases/tag/v12.2.0).
 
-The New Relic Node.js agent provides instrumentation for Next.js  The instrumentation provides telemetry for server-side rendering via [getServerSideProps](https://nextjs.org/docs/basic-features/data-fetching/get-server-side-props), [middleware](https://nextjs.org/docs/middleware), and New Relic transaction naming for both page and server requests. It does not provide any instrumentation for actions occurring during build or in client-side code.  If you want telemetry data on actions occurring on the client (browser), you can [inject the browser agent](./documentation/nextjs/faqs/browser-agent.md).
+The New Relic Node.js agent provides instrumentation for Next.js  The instrumentation provides telemetry for server-side rendering via [`getServerSideProps`](https://nextjs.org/docs/basic-features/data-fetching/get-server-side-props), [middleware](https://nextjs.org/docs/middleware) (limited to Next.js versions [12.2.0](https://github.com/vercel/next.js/releases/tag/v12.2.0) - [13.4.12](https://github.com/vercel/next.js/releases/tag/v13.4.12)), and New Relic transaction naming for both page and server requests. It does not provide any instrumentation for actions occurring during build or in client-side code.  If you want telemetry data on actions occurring on the client (browser), you can [inject the browser agent](./documentation/nextjs/faqs/browser-agent.md).
 
 Here are documents for more in-depth explanations about [transaction naming](./documentation/nextjs/transactions.md), and [segments/spans](./documentation/nextjs/segments-and-spans.md).
 
-
 ### Setup
 Typically you are running a Next.js app with the `next` cli and you must load the agent via `NODE_OPTIONS`:
 
@@ -102,15 +101,15 @@ The New Relic Node.js agent includes ***_experimental_*** support for ES Modules
 
  1. If you rely on a configuration file to run the agent, you must rename the file from `newrelic.js` to `newrelic.cjs` so it can be properly loaded.  All the contents of the configuration file will behave the same once you rename. See [CommonJS modules in ESM](https://nodejs.org/api/modules.html#enabling) for more details.
 
-```sh
-$ mv newrelic.js newrelic.cjs
-```
+    ```sh
+    $ mv newrelic.js newrelic.cjs
+    ```
 
  2. To use the newrelic ESM loader, start your program with node and use the `--experimental-loader` flag and a path to the loader file, like this:
 
-```sh
-$ node --experimental-loader newrelic/esm-loader.mjs -r newrelic your-program.js
-```
+    ```sh
+    $ node --experimental-loader newrelic/esm-loader.mjs -r newrelic your-program.js
+    ```
 
 **Note**: Unlike the CommonJS methods listed above, there are no alternatives to running the agent without the `--experimental-loader` flag.
 
@@ -122,11 +121,11 @@ The agent supports adding your own custom instrumentation to ES module applicati
 import newrelic from 'newrelic'
 newrelic.instrument({ moduleName: 'parse-json', isEsm: true }, function wrap(shim, parseJson, moduleName) {
   shim.wrap(parseJson.default, function wrapParseJson(shim, orig) {
-      return function wrappedParseJson() {
-          const result = orig.apply(this, arguments)
-          result.instrumented = true
-          return true
-      }
+    return function wrappedParseJson() {
+      const result = orig.apply(this, arguments)
+      result.instrumented = true
+      return true
+    }
   })
 })
 ```
@@ -151,11 +150,11 @@ For more information on getting started, [check the Node.js docs](https://docs.n
 
 There are modules that can be installed and configured to accompany the Node.js agent:
 
- * [@newrelic/apollo-server-plugin](https://github.com/newrelic/newrelic-node-apollo-server-plugin): New Relic's official Apollo Server plugin for use with the Node.js agent.
+ * [`@newrelic/apollo-server-plugin`](https://github.com/newrelic/newrelic-node-apollo-server-plugin): New Relic's official Apollo Server plugin for use with the Node.js agent.
 
 There are modules included within the Node.js agent to add more instrumentation for 3rd party modules:
 
- * [@newrelic/native-metrics](https://github.com/newrelic/node-native-metrics): Provides hooks into the native v8 layer of Node.js to provide metrics to the Node.js agent.
+ * [`@newrelic/native-metrics`](https://github.com/newrelic/node-native-metrics): Provides hooks into the native v8 layer of Node.js to provide metrics to the Node.js agent.
 
 ## Usage
 
@@ -164,10 +163,10 @@ There are modules included within the Node.js agent to add more instrumentation
 The `newrelic` module returns an object with the Node.js agent's API methods attached.
 
 ```js
-    const newrelic = require('newrelic')
+const newrelic = require('newrelic')
 
-    /* ... */
-    newrelic.addCustomAttribute('some-attribute', 'some-value')
+/* ... */
+newrelic.addCustomAttribute('some-attribute', 'some-value')
 ```
 
 You can read more about using the API over on the [New Relic documentation](https://docs.newrelic.com/docs/agents/nodejs-agent/api-guides/guide-using-nodejs-agent-api) site.
@@ -182,12 +181,16 @@ These are the steps to work on core agent features, with more detail below:
 
 1. [Fork](https://github.com/newrelic/node-newrelic/fork) and clone this GitHub repository:
 
+    ```sh
     $ git clone git@github.com:your-user-name/node-newrelic.git
     $ cd node-newrelic
+    ```
 
 2. Install the project's dependencies:
 
+    ```sh
     $ npm install
+    ```
 
 Then you're all set to start programming.
 
@@ -199,11 +202,13 @@ Then you're all set to start programming.
 
 Available test suites include:
 
-    $ npm run unit
-    $ npm run integration
-    $ npm run versioned
-    $ npm run lint
-    $ npm run smoke
+  ```sh
+  $ npm run unit
+  $ npm run integration
+  $ npm run versioned
+  $ npm run lint
+  $ npm run smoke
+  ```
 
 ## Further Reading
 

package/api.js

@@ -992,6 +992,7 @@ API.prototype.startWebTransaction = function startWebTransaction(url, handle) {
       transaction: tx,
       parent
     })
+    tx.baseSegment.spanKind = 'server'
     const newContext = context.enterSegment({ transaction: tx, segment: tx.baseSegment })
     tx.baseSegment.start()
 
@@ -1101,6 +1102,7 @@ function startBackgroundTransaction(name, group, handle) {
       parent
     })
     const newContext = context.enterSegment({ transaction: tx, segment: tx.baseSegment })
+    tx.baseSegment.spanKind = 'server'
     tx.baseSegment.partialName = group
     tx.baseSegment.start()
 

package/lib/agent.js

@@ -21,7 +21,7 @@ const MetricNormalizer = require('./metrics/normalizer')
 const MetricAggregator = require('./metrics/metric-aggregator')
 const NAMES = require('./metrics/names')
 const QueryTraceAggregator = require('./db/query-trace-aggregator')
-const sampler = require('./sampler')
+const systemMetricsSampler = require('./system-metrics-sampler')
 const TransactionTraceAggregator = require('./transaction/trace/aggregator')
 const TransactionEventAggregator = require('./transaction/transaction-event-aggregator')
 const Tracer = require('./transaction/tracer')
@@ -334,7 +334,7 @@ Agent.prototype.start = function start(callback) {
     return process.nextTick(callback)
   }
 
-  sampler.start(agent)
+  systemMetricsSampler.start(agent)
 
   if (this.config.serverless_mode.enabled) {
     return this._serverlessModeStart(callback)
@@ -349,7 +349,7 @@ Agent.prototype.start = function start(callback) {
     this.healthReporter.setStatus(HealthReporter.STATUS_LICENSE_KEY_MISSING)
 
     this.setState('errored')
-    sampler.stop()
+    systemMetricsSampler.stop()
     return process.nextTick(function onNextTick() {
       agent.healthReporter.stop(() => {
         callback(new Error('Not starting without license key!'))
@@ -362,7 +362,7 @@ Agent.prototype.start = function start(callback) {
     if (error || response.shouldShutdownRun()) {
       agent.healthReporter.setStatus(HealthReporter.STATUS_CONNECT_ERROR)
       agent.setState('errored')
-      sampler.stop()
+      systemMetricsSampler.stop()
       callback(error || new Error('Failed to connect to collector'), response && response.payload)
       return
     }
@@ -482,7 +482,7 @@ Agent.prototype.stop = function stop(callback) {
 
   this.harvester.stop()
 
-  sampler.stop()
+  systemMetricsSampler.stop()
 
   this.healthReporter.setStatus(HealthReporter.STATUS_AGENT_SHUTDOWN)
   this.healthReporter.stop(() => {

package/lib/context-manager/async-local-context-manager.js

@@ -7,6 +7,7 @@
 
 const { AsyncLocalStorage } = require('async_hooks')
 const Context = require('./context')
+const OtelContext = require('../otel/context')
 
 /**
  * Class for managing state in the agent.
@@ -18,7 +19,8 @@ const Context = require('./context')
  * @class
  */
 class AsyncLocalContextManager {
-  constructor() {
+  constructor(isOtelBridgeMode) {
+    this.isOtelBridgeMode = isOtelBridgeMode
     this._asyncLocalStorage = new AsyncLocalStorage()
   }
 
@@ -28,7 +30,7 @@ class AsyncLocalContextManager {
    * @returns {object} The current active context.
    */
   getContext() {
-    return this._asyncLocalStorage.getStore() || new Context()
+    return this._asyncLocalStorage.getStore() || (this.isOtelBridgeMode ? new OtelContext() : new Context())
   }
 
   /**

package/lib/context-manager/context.js

@@ -4,13 +4,11 @@
  */
 
 'use strict'
-const { otelSynthesis } = require('../symbols')
 
 module.exports = class Context {
-  constructor(transaction, segment, parentContext) {
+  constructor(transaction, segment) {
     this._transaction = transaction
     this._segment = segment
-    this._otelCtx = parentContext ? new Map(parentContext) : new Map()
   }
 
   get segment() {
@@ -21,58 +19,27 @@ module.exports = class Context {
     return this._transaction
   }
 
-  enterSegment({ segment, transaction = this._transaction }) {
-    return new this.constructor(transaction, segment)
-  }
-
-  enterTransaction(transaction) {
-    return new this.constructor(transaction, transaction.trace.root)
-  }
-
-  /**
-   * Required for bridging OTEL data into the agent.
-   *
-   * @param {string} key Stored entity name to retrieve.
-   *
-   * @returns {*} The stored value.
-   */
-  getValue(key) {
-    return this._otelCtx.get(key)
-  }
-
   /**
-   * Required for bridging OTEL data into the agent.
+   * Constructs a new context from segment about to be bound to context manager
+   * along with the current transaction.
    *
-   * @param {string} key Name for stored value.
-   * @param {*} value Value to store.
-   *
-   * @returns {object} The context manager object.
+   * @param {object} params to function
+   * @param {TraceSegment} params.segment segment to bind to context
+   * @param {Transaction} params.transaction active transaction
+   * @returns {Context} a newly constructed context
    */
-  setValue(key, value) {
-    let ctx
-
-    if (value[otelSynthesis] && value[otelSynthesis].segment && value[otelSynthesis].transaction) {
-      const { segment, transaction } = value[otelSynthesis]
-      segment.start()
-      ctx = new this.constructor(transaction, segment, this._otelCtx)
-    } else {
-      ctx = new this.constructor(this._transaction, this._segment, this._otelCtx)
-    }
-
-    ctx._otelCtx.set(key, value)
-    return ctx
+  enterSegment({ segment, transaction = this._transaction }) {
+    return new this.constructor(transaction, segment)
   }
 
   /**
-   * Required for bridging OTEL data into the agent.
-   *
-   * @param {string} key Named value to remove from the store.
+   * Constructs a new context from transaction about to be bound to context manager.
+   * It uses the trace root segment as the segment in context.
    *
-   * @returns {object} The context manager object.
+   * @param {Transaction} transaction transaction to bind to context
+   * @returns {Context} a newly constructed context
    */
-  deleteValue(key) {
-    const ctx = new this.constructor(this._transaction, this._segment, this._otelCtx)
-    ctx._otelCtx.delete(key)
-    return ctx
+  enterTransaction(transaction) {
+    return new this.constructor(transaction, transaction.trace.root)
   }
 }

package/lib/errors/error-collector.js

@@ -215,8 +215,9 @@ class ErrorCollector {
    * @param {?Transaction}  transaction  Transaction associated with the error.
    * @param {Error}  error  The error to be traced.
    * @param {?object}  customAttributes  Custom attributes associated with the request (optional).
+   * @param {object} segment The segment associated with the error (optional). Only used in otel bridge.
    */
-  add(transaction, error, customAttributes) {
+  add(transaction, error, customAttributes, segment) {
     if (!error) {
       return
     }
@@ -236,7 +237,7 @@ class ErrorCollector {
     const exception = new Exception({ error, timestamp, customAttributes })
 
     if (transaction) {
-      transaction.addException(exception)
+      transaction.addException(exception, segment)
     } else {
       this.collect(transaction, exception)
     }

package/lib/feature_flags.js

@@ -14,7 +14,8 @@ exports.prerelease = {
   promise_segments: false,
   reverse_naming_rules: false,
   unresolved_promise_cleanup: true,
-  kafkajs_instrumentation: false
+  kafkajs_instrumentation: false,
+  undici_error_tracking: true
 }
 
 // flags that are no longer used for released features

package/lib/instrumentation/kafkajs/consumer.js

@@ -42,7 +42,7 @@ function wrapConsumer(shim, orig) {
       consumer,
       'run',
       new MessageSubscribeSpec({
-        name: `${SEGMENT_PREFIX}#run`,
+        name: `${SEGMENT_PREFIX}run`,
         destinationType: shim.TOPIC,
         promise: true,
         consumer: shim.FIRST,

package/lib/instrumentation/undici.js

@@ -192,6 +192,7 @@ function requestHeadersHook(shim, { request, response }) {
  * @param {Error} params.error error from undici request
  */
 function endAndRestoreSegment(shim, { request, error }) {
+  const { config } = shim.agent
   const activeSegment = request[symbols.segment]
   const parentSegment = request[symbols.parentSegment]
   const tx = request[symbols.transaction]
@@ -199,7 +200,7 @@ function endAndRestoreSegment(shim, { request, error }) {
     activeSegment.end()
   }
 
-  if (error && tx) {
+  if (error && tx && config.feature_flag.undici_error_tracking === true) {
     handleError(shim, tx, error)
   }
 

package/lib/otel/attr-reconciler.js

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2025 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+const urltils = require('../util/urltils')
+const constants = require('./constants')
+
+const hostKeys = [
+  constants.ATTR_NET_HOST_NAME,
+  constants.ATTR_NET_PEER_NAME,
+  constants.ATTR_SERVER_ADDRESS
+]
+
+class AttributeReconciler {
+  #agent
+
+  constructor({ agent }) {
+    this.#agent = agent
+  }
+
+  #resolveHost(hostname) {
+    if (urltils.isLocalhost(hostname)) {
+      return this.#agent.config.getHostnameSafe(hostname)
+    }
+    return hostname
+  }
+
+  #isHostnameKey(key) {
+    return hostKeys.includes(key)
+  }
+
+  reconcile({ segment, otelSpan, mapper = {} }) {
+    for (const [key, srcValue] of Object.entries(otelSpan.attributes)) {
+      let value = srcValue
+
+      if (this.#isHostnameKey(key) === true) {
+        value = this.#resolveHost(srcValue)
+      }
+
+      if (Object.prototype.hasOwnProperty.call(mapper, key) === true) {
+        mapper[key](value)
+      } else {
+        segment.addAttribute(key, value)
+      }
+    }
+  }
+}
+
+module.exports = AttributeReconciler