newrelic 12.18.1 → 12.19.0

package/NEWS.md

@@ -1,3 +1,37 @@
+### v12.19.0 (2025-05-20)
+
+#### Features
+
+* Added Azure Function HTTP streaming support ([#3070](https://github.com/newrelic/node-newrelic/pull/3070)) ([9865e1c](https://github.com/newrelic/node-newrelic/commit/9865e1c4d47c2a41fef20f83eb810eee8559bea2))
+
+#### Code refactoring
+
+* Added check to only set a FakeSpan if `transaction.agent.otelSpanKey` exists ([#3071](https://github.com/newrelic/node-newrelic/pull/3071)) ([b0c1ac1](https://github.com/newrelic/node-newrelic/commit/b0c1ac141be17e4aa1d845a810e60743dc08863d))
+
+#### Documentation
+
+* Updated compatibility report ([#3074](https://github.com/newrelic/node-newrelic/pull/3074)) ([7dc9aad](https://github.com/newrelic/node-newrelic/commit/7dc9aad20a1cf201de9dd946913daab8e3d23e54))
+
+#### Miscellaneous chores
+
+* Fixed `redis` legacy test suite ([#3077](https://github.com/newrelic/node-newrelic/pull/3077)) ([ec39925](https://github.com/newrelic/node-newrelic/commit/ec399254d277e36e1120dcf43542819f1ce8d475))
+* Updated security agent ([#3098](https://github.com/newrelic/node-newrelic/pull/3098)) ([48ed8cb](https://github.com/newrelic/node-newrelic/commit/48ed8cb53f5331966bb39065f1b157754a51414e))
+
+
+#### Tests
+
+* Added cross agent otel bridge tests ([#3057](https://github.com/newrelic/node-newrelic/pull/3057)) ([1526bed](https://github.com/newrelic/node-newrelic/commit/1526bed9cf0f99481cf26ded2ebd43a0fcd720ae))
+
+### v12.18.2 (2025-04-30)
+
+#### Bug fixes
+
+* Updated `createSegment` to stop adding segments to trace when `max_trace_segments` is exceeded ([#3056](https://github.com/newrelic/node-newrelic/pull/3056)) ([8f3336e](https://github.com/newrelic/node-newrelic/commit/8f3336e98ac9f7d4ad0ded3a061774fd68053e76))
+
+#### Documentation
+
+* Updated compatibility report ([#3065](https://github.com/newrelic/node-newrelic/pull/3065)) ([#3063](https://github.com/newrelic/node-newrelic/pull/3063)) 
+
 ### v12.18.1 (2025-04-29)
 
 #### Bug fixes

package/THIRD_PARTY_NOTICES.md

@@ -91,7 +91,7 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 
 ### @grpc/grpc-js
 
-This product includes source derived from [@grpc/grpc-js](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js) ([v1.13.2](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/tree/v1.13.2)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/blob/v1.13.2/LICENSE):
+This product includes source derived from [@grpc/grpc-js](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js) ([v1.13.3](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/tree/v1.13.3)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/blob/v1.13.3/LICENSE):
 
 ```
                                  Apache License
@@ -300,7 +300,7 @@ This product includes source derived from [@grpc/grpc-js](https://github.com/grp
 
 ### @grpc/proto-loader
 
-This product includes source derived from [@grpc/proto-loader](https://github.com/grpc/grpc-node) ([v0.7.13](https://github.com/grpc/grpc-node/tree/v0.7.13)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/blob/v0.7.13/LICENSE):
+This product includes source derived from [@grpc/proto-loader](https://github.com/grpc/grpc-node) ([v0.7.15](https://github.com/grpc/grpc-node/tree/v0.7.15)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/blob/v0.7.15/LICENSE):
 
 ```
                                  Apache License
@@ -509,7 +509,7 @@ This product includes source derived from [@grpc/proto-loader](https://github.co
 
 ### @newrelic/security-agent
 
-This product includes source derived from [@newrelic/security-agent](https://github.com/newrelic/csec-node-agent) ([v2.4.0](https://github.com/newrelic/csec-node-agent/tree/v2.4.0)), distributed under the [UNKNOWN License](https://github.com/newrelic/csec-node-agent/blob/v2.4.0/LICENSE):
+This product includes source derived from [@newrelic/security-agent](https://github.com/newrelic/csec-node-agent) ([v2.4.1](https://github.com/newrelic/csec-node-agent/tree/v2.4.1)), distributed under the [UNKNOWN License](https://github.com/newrelic/csec-node-agent/blob/v2.4.1/LICENSE):
 
 ```
 ## New Relic Software License v1.0
@@ -1271,7 +1271,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ### import-in-the-middle
 
-This product includes source derived from [import-in-the-middle](https://github.com/nodejs/import-in-the-middle) ([v1.13.1](https://github.com/nodejs/import-in-the-middle/tree/v1.13.1)), distributed under the [Apache-2.0 License](https://github.com/nodejs/import-in-the-middle/blob/v1.13.1/LICENSE):
+This product includes source derived from [import-in-the-middle](https://github.com/nodejs/import-in-the-middle) ([v1.13.2](https://github.com/nodejs/import-in-the-middle/tree/v1.13.2)), distributed under the [Apache-2.0 License](https://github.com/nodejs/import-in-the-middle/blob/v1.13.2/LICENSE):
 
 ```
                                  Apache License
@@ -1531,12 +1531,12 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ### module-details-from-path
 
-This product includes source derived from [module-details-from-path](https://github.com/watson/module-details-from-path) ([v1.0.3](https://github.com/watson/module-details-from-path/tree/v1.0.3)), distributed under the [MIT License](https://github.com/watson/module-details-from-path/blob/v1.0.3/LICENSE):
+This product includes source derived from [module-details-from-path](https://github.com/watson/module-details-from-path) ([v1.0.4](https://github.com/watson/module-details-from-path/tree/v1.0.4)), distributed under the [MIT License](https://github.com/watson/module-details-from-path/blob/v1.0.4/LICENSE):
 
 ```
 The MIT License (MIT)
 
-Copyright (c) 2016 Thomas Watson Steen
+Copyright (c) 2016-2025 Thomas Watson Steen
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -1615,13 +1615,14 @@ IN THE SOFTWARE.
 
 ### require-in-the-middle
 
-This product includes source derived from [require-in-the-middle](https://github.com/elastic/require-in-the-middle) ([v7.5.0](https://github.com/elastic/require-in-the-middle/tree/v7.5.0)), distributed under the [MIT License](https://github.com/elastic/require-in-the-middle/blob/v7.5.0/LICENSE):
+This product includes source derived from [require-in-the-middle](https://github.com/nodejs/require-in-the-middle) ([v7.5.2](https://github.com/nodejs/require-in-the-middle/tree/v7.5.2)), distributed under the [MIT License](https://github.com/nodejs/require-in-the-middle/blob/v7.5.2/LICENSE):
 
 ```
 The MIT License (MIT)
 
 Copyright (c) 2016-2019, Thomas Watson Steen
-Copyright (c) 2019-2023, Elasticsearch B.V.
+Copyright (c) 2019-2025, Elasticsearch B.V.
+Copyright (c) 2025+, require-in-the-middle contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -1645,7 +1646,7 @@ SOFTWARE.
 
 ### semver
 
-This product includes source derived from [semver](https://github.com/npm/node-semver) ([v7.6.3](https://github.com/npm/node-semver/tree/v7.6.3)), distributed under the [ISC License](https://github.com/npm/node-semver/blob/v7.6.3/LICENSE):
+This product includes source derived from [semver](https://github.com/npm/node-semver) ([v7.7.2](https://github.com/npm/node-semver/tree/v7.7.2)), distributed under the [ISC License](https://github.com/npm/node-semver/blob/v7.7.2/LICENSE):
 
 ```
 The ISC License
@@ -1701,7 +1702,7 @@ SOFTWARE.
 
 ### @aws-sdk/client-s3
 
-This product includes source derived from [@aws-sdk/client-s3](https://github.com/aws/aws-sdk-js-v3) ([v3.726.1](https://github.com/aws/aws-sdk-js-v3/tree/v3.726.1)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.726.1/LICENSE):
+This product includes source derived from [@aws-sdk/client-s3](https://github.com/aws/aws-sdk-js-v3) ([v3.808.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.808.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.808.0/LICENSE):
 
 ```
                                 Apache License
@@ -1910,7 +1911,7 @@ This product includes source derived from [@aws-sdk/client-s3](https://github.co
 
 ### @aws-sdk/s3-request-presigner
 
-This product includes source derived from [@aws-sdk/s3-request-presigner](https://github.com/aws/aws-sdk-js-v3) ([v3.726.1](https://github.com/aws/aws-sdk-js-v3/tree/v3.726.1)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.726.1/LICENSE):
+This product includes source derived from [@aws-sdk/s3-request-presigner](https://github.com/aws/aws-sdk-js-v3) ([v3.808.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.808.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.808.0/LICENSE):
 
 ```
                                 Apache License
@@ -3738,7 +3739,7 @@ SOFTWARE.
 
 ### eslint-plugin-jsdoc
 
-This product includes source derived from [eslint-plugin-jsdoc](https://github.com/gajus/eslint-plugin-jsdoc) ([v50.6.1](https://github.com/gajus/eslint-plugin-jsdoc/tree/v50.6.1)), distributed under the [BSD-3-Clause License](https://github.com/gajus/eslint-plugin-jsdoc/blob/v50.6.1/LICENSE):
+This product includes source derived from [eslint-plugin-jsdoc](https://github.com/gajus/eslint-plugin-jsdoc) ([v50.6.14](https://github.com/gajus/eslint-plugin-jsdoc/tree/v50.6.14)), distributed under the [BSD-3-Clause License](https://github.com/gajus/eslint-plugin-jsdoc/blob/v50.6.14/LICENSE):
 
 ```
 Copyright (c) 2018, Gajus Kuizinas (http://gajus.com/)
@@ -3770,7 +3771,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ### eslint
 
-This product includes source derived from [eslint](https://github.com/eslint/eslint) ([v9.18.0](https://github.com/eslint/eslint/tree/v9.18.0)), distributed under the [MIT License](https://github.com/eslint/eslint/blob/v9.18.0/LICENSE):
+This product includes source derived from [eslint](https://github.com/eslint/eslint) ([v9.26.0](https://github.com/eslint/eslint/tree/v9.26.0)), distributed under the [MIT License](https://github.com/eslint/eslint/blob/v9.26.0/LICENSE):
 
 ```
 Copyright OpenJS Foundation and other contributors, <www.openjsf.org>
@@ -3797,7 +3798,7 @@ THE SOFTWARE.
 
 ### express
 
-This product includes source derived from [express](https://github.com/expressjs/express) ([v4.21.2](https://github.com/expressjs/express/tree/v4.21.2)), distributed under the [MIT License](https://github.com/expressjs/express/blob/v4.21.2/LICENSE):
+This product includes source derived from [express](https://github.com/expressjs/express) ([v5.1.0](https://github.com/expressjs/express/tree/v5.1.0)), distributed under the [MIT License](https://github.com/expressjs/express/blob/v5.1.0/LICENSE):
 
 ```
 (The MIT License)
@@ -4050,11 +4051,20 @@ MIT License
 
 Copyright (c) <year> <copyright holders>
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and 
+associated documentation files (the "Software"), to deal in the Software without restriction, including 
+without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the 
+following conditions:
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all copies or substantial 
+portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT 
+LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO 
+EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE 
+USE OR OTHER DEALINGS IN THE SOFTWARE.
 ```
 
 ### koa-router
@@ -4088,7 +4098,7 @@ THE SOFTWARE.
 
 ### koa
 
-This product includes source derived from [koa](https://github.com/koajs/koa) ([v2.15.3](https://github.com/koajs/koa/tree/v2.15.3)), distributed under the [MIT License](https://github.com/koajs/koa/blob/v2.15.3/LICENSE):
+This product includes source derived from [koa](https://github.com/koajs/koa) ([v2.16.1](https://github.com/koajs/koa/tree/v2.16.1)), distributed under the [MIT License](https://github.com/koajs/koa/blob/v2.16.1/LICENSE):
 
 ```
 (The MIT License)
@@ -4147,7 +4157,7 @@ SOFTWARE.
 
 ### lockfile-lint
 
-This product includes source derived from [lockfile-lint](https://github.com/lirantal/lockfile-lint) ([v4.14.0](https://github.com/lirantal/lockfile-lint/tree/v4.14.0)), distributed under the [Apache-2.0 License](https://github.com/lirantal/lockfile-lint/blob/v4.14.0/LICENSE):
+This product includes source derived from [lockfile-lint](https://github.com/lirantal/lockfile-lint) ([v4.14.1](https://github.com/lirantal/lockfile-lint/tree/v4.14.1)), distributed under the [Apache-2.0 License](https://github.com/lirantal/lockfile-lint/blob/v4.14.1/LICENSE):
 
 ```
 
@@ -4435,11 +4445,20 @@ MIT License
 
 Copyright (c) <year> <copyright holders>
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and 
+associated documentation files (the "Software"), to deal in the Software without restriction, including 
+without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the 
+following conditions:
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all copies or substantial 
+portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT 
+LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO 
+EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE 
+USE OR OTHER DEALINGS IN THE SOFTWARE.
 ```
 
 ### should

package/lib/agent.js

@@ -923,24 +923,14 @@ Agent.prototype.getServiceLinkingMetadata = function getServiceLinkingMetadata(
 Agent.prototype.getNRLinkingMetadata = function getNRLinkingMetadata() {
   const metadata = this.getLinkingMetadata()
   const nrLinkingMeta = [
-    getValue('entity.guid'),
-    getValue('hostname'),
-    getValue('trace.id'),
-    getValue('span.id'),
-    encodeURIComponent(getValue('entity.name'))
+    metadata['entity.guid'] ?? '',
+    metadata['hostname'] ?? '',
+    metadata['trace.id'] ?? '',
+    metadata['span.id'] ?? '',
+    encodeURIComponent(metadata['entity.name'] ?? '')
   ]
 
   return ` NR-LINKING|${nrLinkingMeta.join('|')}|`
-
-  /**
-   * Retries value for a given key but defaults to `` if falsey
-   *
-   * @param {string} key in linking metadata
-   * @returns {string} Metadata value or empty string
-   */
-  function getValue(key) {
-    return metadata[key] || ''
-  }
 }
 
 function generateEventHarvestSupportMetrics(agent, harvestConfig) {

package/lib/context-manager/context.js

@@ -40,6 +40,6 @@ module.exports = class Context {
    * @returns {Context} a newly constructed context
    */
   enterTransaction(transaction) {
-    return new this.constructor(transaction, transaction.trace.root)
+    return new this.constructor(transaction, transaction?.trace?.root)
   }
 }

package/lib/instrumentation/@azure/functions.js

@@ -9,6 +9,7 @@ const defaultLogger = require('../../logger').child({ component: 'azure-function
 const urltils = require('../../util/urltils')
 const headerProcessing = require('../../header-processing')
 const synthetics = require('../../synthetics')
+const { Transform } = require('node:stream')
 
 const backgroundRecorder = require('../../metrics/recorders/other.js')
 const recordWeb = require('../../metrics/recorders/http')
@@ -134,24 +135,29 @@ function wrapAzureHttpMethods(shim, appMethod) {
 
       const newContext = ctx.enterSegment({ segment })
       const boundHandler = tracer.bindFunction(handler, newContext)
-
       const result = await boundHandler(...args)
+
       // Responses should have a shape as described at:
       // https://learn.microsoft.com/en-us/azure/azure-functions/functions-reference-node?tabs=javascript%2Cwindows%2Cazure-cli&pivots=nodejs-model-v4#http-response
-      if (result.status) {
+      if (result?.status) {
         tx.trace.attributes.addAttribute(
           DESTS.TRANS_COMMON,
           'http.statusCode',
           result.status
         )
       }
-
       if (coldStart === true) {
         tx.trace.attributes.addAttribute(DESTS.TRANS_COMMON, 'faas.coldStart', true)
         coldStart = false
       }
+      if (result?.body instanceof Transform) {
+        result.body.on('close', () => {
+          tx.end()
+        })
+      } else {
+        tx.end()
+      }
 
-      tx.end()
       return result
     })
 

package/lib/instrumentation/core/http.js

@@ -167,6 +167,7 @@ function instrumentedFinish(segment, transaction) {
 
   // Naming must happen before the segment and transaction are ended,
   // because metrics recording depends on naming's side effects.
+
   transaction.finalizeNameFromUri(transaction.parsedUrl, this.statusCode)
 
   if (this) {
@@ -444,6 +445,11 @@ module.exports = function initialize(agent, http, moduleName) {
     return false
   }
 
+  if (process.env.FUNCTIONS_WORKER_RUNTIME) {
+    logger.debug('In azure functions environment, disabling core http instrumentation in favor of @azure/functions')
+    return false
+  }
+
   const IS_HTTPS = moduleName === 'https'
 
   // FIXME: will this ever not be called?

package/lib/instrumentation/redis.js

@@ -14,6 +14,7 @@ const {
 module.exports = function initialize(_agent, redis, _moduleName, shim) {
   const proto = redis?.RedisClient?.prototype
   if (!proto) {
+    shim.logger.warn('Skipping redis instrumentation due to unrecognized module shape')
     return false
   }
 

package/lib/otel/context.js

@@ -24,7 +24,9 @@ module.exports = class OtelContext extends Context {
    * @returns {OtelContext} a newly constructed context
    */
   enterSegment({ segment, transaction = this._transaction }) {
-    this._otelCtx.set(transaction.agent.otelSpanKey, new FakeSpan(segment, transaction))
+    if (transaction?.agent?.otelSpanKey) {
+      this._otelCtx.set(transaction.agent.otelSpanKey, new FakeSpan(segment, transaction))
+    }
     return new this.constructor(transaction, segment, this._otelCtx)
   }
 
@@ -36,8 +38,10 @@ module.exports = class OtelContext extends Context {
    * @returns {OtelContext} a newly constructed context
    */
   enterTransaction(transaction) {
-    this._otelCtx.set(transaction.agent.otelSpanKey, new FakeSpan(transaction.trace.root, transaction))
-    return new this.constructor(transaction, transaction.trace.root, this._otelCtx)
+    if (transaction?.agent?.otelSpanKey) {
+      this._otelCtx.set(transaction.agent.otelSpanKey, new FakeSpan(transaction.trace.root, transaction))
+    }
+    return new this.constructor(transaction, transaction?.trace?.root, this._otelCtx)
   }
 
   /**

package/lib/otel/fake-span.js

@@ -14,14 +14,14 @@
  */
 module.exports = class FakeSpan {
   constructor(segment, transaction) {
-    this.segment = segment
-    this.transaction = transaction
+    this.segmentId = segment.id
+    this.traceId = transaction.traceId
   }
 
   spanContext() {
     return {
-      spanId: this.segment.id,
-      traceId: this.transaction.traceId,
+      spanId: this.segmentId,
+      traceId: this.traceId,
       traceFlags: 1
     }
   }

package/lib/otel/sampler.js

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2025 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+const { SamplingDecision } = require('@opentelemetry/sdk-trace-base')
+const { trace, SpanKind } = require('@opentelemetry/api')
+
+/**
+ * Basic sampler that just checks if there is an active transaction.
+ * If not, it falls back to checking if it is a server of consumer span
+ * or `isRemote` exists on the parent span context.
+ */
+module.exports = class NrSampler {
+  shouldSample(context, _traceId, _spanName, spanKind) {
+    if (context?.transaction?.isActive()) {
+      return { decision: SamplingDecision.RECORD_AND_SAMPLED }
+    }
+
+    const parentContext = trace.getSpanContext(context)
+    if (parentContext?.isRemote || spanKind === SpanKind.SERVER || spanKind === SpanKind.CONSUMER) {
+      return { decision: SamplingDecision.RECORD_AND_SAMPLED }
+    }
+
+    return { decision: SamplingDecision.NOT_RECORD }
+  }
+
+  toString() {
+    return 'NrSampler'
+  }
+}

package/lib/otel/segments/consumer.js

@@ -12,12 +12,18 @@ const recorder = require('../../metrics/recorders/message-transaction')
 const { TYPES } = Transaction
 const { propagateTraceContext } = require('./utils')
 const { msgAttr } = require('../attr-mapping/messaging')
+const createInternalSegment = require('./internal')
 
 const {
   UNKNOWN
 } = require('../constants')
 
 function createConsumerSegment(agent, otelSpan) {
+  const activeTx = agent.tracer.getTransaction()
+  // tx already exists do not create a new transaction
+  if (activeTx) {
+    return createInternalSegment(agent, otelSpan)
+  }
   const spanContext = otelSpan.spanContext()
   const transaction = new Transaction(agent, spanContext?.traceId)
   transaction.type = TYPES.MESSAGE

package/lib/otel/segments/server.js

@@ -14,8 +14,14 @@ const { propagateTraceContext } = require('./utils')
 const { httpAttr } = require('../attr-mapping/http')
 const DESTINATION = Transaction.DESTINATIONS.TRANS_COMMON
 const { UNKNOWN } = require('../constants')
+const createInternalSegment = require('./internal')
 
 module.exports = function createServerSegment(agent, otelSpan) {
+  const activeTx = agent.tracer.getTransaction()
+  // tx already exists do not create a new transaction
+  if (activeTx) {
+    return createInternalSegment(agent, otelSpan)
+  }
   const spanContext = otelSpan.spanContext()
   const transaction = new Transaction(agent, spanContext?.traceId)
   transaction.type = 'web'

package/lib/otel/setup.js

@@ -7,6 +7,7 @@
 const opentelemetry = require('@opentelemetry/api')
 const { BasicTracerProvider } = require('@opentelemetry/sdk-trace-base')
 const NrSpanProcessor = require('./span-processor')
+const NrSampler = require('./sampler')
 const ContextManager = require('./context-manager')
 const defaultLogger = require('../logger').child({ component: 'opentelemetry-bridge' })
 const createOtelLogger = require('./logger')
@@ -14,7 +15,7 @@ const TracePropagator = require('./trace-propagator')
 
 const interceptSpanKey = require('./span-key-interceptor')
 
-module.exports = function setupOtel(agent, logger = defaultLogger) {
+function setupOtel(agent, logger = defaultLogger) {
   if (agent.config.feature_flag.opentelemetry_bridge !== true) {
     logger.warn(
       '`feature_flag.opentelemetry_bridge` is not enabled, skipping setup of opentelemetry-bridge'
@@ -25,6 +26,7 @@ module.exports = function setupOtel(agent, logger = defaultLogger) {
   createOtelLogger(logger, agent.config)
 
   opentelemetry.trace.setGlobalTracerProvider(new BasicTracerProvider({
+    sampler: new NrSampler(),
     spanProcessors: [new NrSpanProcessor(agent)],
     generalLimits: {
       attributeValueLengthLimit: 4095
@@ -39,3 +41,19 @@ module.exports = function setupOtel(agent, logger = defaultLogger) {
     .getOrCreateMetric('Supportability/Nodejs/OpenTelemetryBridge/Setup')
     .incrementCallCount()
 }
+
+function teardownOtel(agent) {
+  if (agent?.config?.feature_flag?.opentelemetry_bridge !== true) {
+    return
+  }
+
+  opentelemetry.trace.disable()
+  opentelemetry.context.disable()
+  opentelemetry.propagation.disable()
+  opentelemetry.diag.disable()
+}
+
+module.exports = {
+  setupOtel,
+  teardownOtel
+}

package/lib/shimmer.js

@@ -23,7 +23,7 @@ let pkgsToHook = []
 const NAMES = require('./metrics/names')
 const symbols = require('./symbols')
 const { unsubscribe } = require('./instrumentation/undici')
-const setupOtel = require('./otel/setup')
+const { setupOtel, teardownOtel } = require('./otel/setup')
 
 /**
  * Unwrapping is only likely to be used by test code, and is a fairly drastic
@@ -317,7 +317,7 @@ const shimmer = (module.exports = {
     })
   },
 
-  removeHooks() {
+  removeHooks(agent) {
     if (this._ritm) {
       this._ritm.unhook()
       this._ritm = null
@@ -329,6 +329,7 @@ const shimmer = (module.exports = {
     }
 
     pkgsToHook = []
+    teardownOtel(agent)
     unsubscribe()
   },
 

package/lib/transaction/tracer/index.js

@@ -135,7 +135,10 @@ function createSegment({ id, name, recorder, parent, transaction }) {
   if (recorder) {
     transaction.addRecorder(recorder.bind(null, segment))
   }
-  transaction.trace.segments.add(segment)
+
+  if (collect) {
+    transaction.trace.segments.add(segment)
+  }
 
   return segment
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "12.18.1",
+  "version": "12.19.0",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [
@@ -170,6 +170,7 @@
     "public-docs": "jsdoc -c ./jsdoc-conf.jsonc",
     "publish-docs": "./bin/publish-docs.sh",
     "services": "DOCKER_PLATFORM=linux/$(uname -m) docker compose up -d --wait",
+    "services:start": "npm run services",
     "services:stop": "docker compose down",
     "smoke": "time borp --timeout 180000 --reporter ./test/lib/test-reporter.mjs 'test/smoke/**/*.{test,tap}.js'",
     "sub-install": "node test/bin/install_sub_deps",
@@ -202,7 +203,7 @@
   "dependencies": {
     "@grpc/grpc-js": "^1.13.2",
     "@grpc/proto-loader": "^0.7.5",
-    "@newrelic/security-agent": "^2.3.0",
+    "@newrelic/security-agent": "^2.4.2",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/core": "^2.0.0",
     "@opentelemetry/sdk-trace-base": "^2.0.0",