newrelic 13.17.0 → 13.18.0

package/NEWS.md

@@ -1,34 +1,65 @@
-### v13.17.0 (2026-03-19)
-
-#### Features
-
-* Added support for Continuous Profiling ([#3834](https://github.com/newrelic/node-newrelic/pull/3834)) ([6d8d5b5](https://github.com/newrelic/node-newrelic/commit/6d8d5b5df2f459ffca39cc14ef0cdabcf7f22cea))
-  * Added server-side configuration for `profiling.enabled` ([#3790](https://github.com/newrelic/node-newrelic/pull/3790)) ([0d44e5b](https://github.com/newrelic/node-newrelic/commit/0d44e5b3b24b60d8b920f7d6a762f208fa4139ca)) ([#3847](https://github.com/newrelic/node-newrelic/pull/3847)) ([e57223c](https://github.com/newrelic/node-newrelic/commit/e57223c7c66ab7fe1f464725efe0474e23326159))
-  * Added delay + duration to `ProfilingAggregator` ([#3815](https://github.com/newrelic/node-newrelic/pull/3815)) ([8000665](https://github.com/newrelic/node-newrelic/commit/8000665b1714275f8e019a2f7c911d62ee8dd127))
-  * Added supportability metrics for profiling ([#3801](https://github.com/newrelic/node-newrelic/pull/3801)) ([19bbb7e](https://github.com/newrelic/node-newrelic/commit/19bbb7ef426e835a13ec38fc543637bdae57a5fc))
-  * Prevented ProfilingAggregator from running in serverless mode ([#3806](https://github.com/newrelic/node-newrelic/pull/3806)) ([e4db0f4](https://github.com/newrelic/node-newrelic/commit/e4db0f469fde9ae6aa4984cb312ee1de269e5c7b))
-  * Disabled `profiling.enabled` when high security mode is enabled ([#3803](https://github.com/newrelic/node-newrelic/pull/3803)) ([9d4eebb](https://github.com/newrelic/node-newrelic/commit/9d4eebb11df00fc5729ad178063712734449741a))
-  * Added Heap profiler ([#3751](https://github.com/newrelic/node-newrelic/pull/3751)) ([8262f6b](https://github.com/newrelic/node-newrelic/commit/8262f6bb5d7bf0a1c996455d6829883a7ff3b696))
-  * Added Cpu Profiler ([#3747](https://github.com/newrelic/node-newrelic/pull/3747)) ([2c2097f](https://github.com/newrelic/node-newrelic/commit/2c2097fdfd4ec924bf24901eecb8ad62a9e4c4f5))
-
-**Note**: Continuous Profiling UI is coming soon! While the Node.js agent now supports Continuous Profiling data collection, the visualization experience will debut in Limited Preview starting next week. If you would like to get early access to the profiling dashboards and UI features, please reach out to your Account Executive (AE) about how to opt-in to the preview.
-
-#### Code refactoring
-
-* Refactor `winston` instrumentation to subscribe to events emitted ([#3808](https://github.com/newrelic/node-newrelic/pull/3808)) ([4af2f48](https://github.com/newrelic/node-newrelic/commit/4af2f48d99b0842085044deb36d14af9e96ac8ed))
-
-#### Documentation
-
-* Updated compatibility report ([#3824](https://github.com/newrelic/node-newrelic/pull/3824)) ([0cfb356](https://github.com/newrelic/node-newrelic/commit/0cfb356c487fbe47c4ac11095704846d948168fb))
-
-#### Tests
-
-* Added segment duration tests for `ioredis`/`iovalkey` ([#3825](https://github.com/newrelic/node-newrelic/pull/3825)) ([9738bc8](https://github.com/newrelic/node-newrelic/commit/9738bc88b59c219d896d80e0f8ccb93866cd7f0b))
-* Added segment duration timing tests for `mysql2` ([#3820](https://github.com/newrelic/node-newrelic/pull/3820)) ([bb424ff](https://github.com/newrelic/node-newrelic/commit/bb424ffa59fe55912f1ad711d84b57518dbd778f))
-* Changed structure of bedrock tests to avoid getting instrumented core libraries from first test ([#3838](https://github.com/newrelic/node-newrelic/pull/3838)) ([886a36c](https://github.com/newrelic/node-newrelic/commit/886a36c1607e1a7c0ddc0688f7b8ee62f9a8bf10))
-* Changed structure of lambda and sns tests to avoid getting instrumented core libraries from first test ([#3836](https://github.com/newrelic/node-newrelic/pull/3836)) ([414044d](https://github.com/newrelic/node-newrelic/commit/414044d184be885843a3267097c87954daf408bd))
-* Updated `@aws-sdk/lib-dynamodb` version range ([#3829](https://github.com/newrelic/node-newrelic/pull/3829)) ([d28c938](https://github.com/newrelic/node-newrelic/commit/d28c938fbe823155fedeb5e5f85bd6a98e04ceed))
-
+### v13.18.0 (2026-03-30)
+
+#### Features
+
+* Instrumented grpc server stream to bind async context to stream event handlers ([#3855](https://github.com/newrelic/node-newrelic/pull/3855)) ([92c70a8](https://github.com/newrelic/node-newrelic/commit/92c70a8c81c7bf26f63cf3f5b94d993ebc88bf51))
+
+#### Code refactoring
+
+* Refactored `when` instrumentation to subscribe to events emitted ([#3866](https://github.com/newrelic/node-newrelic/pull/3866)) ([1b55c5a](https://github.com/newrelic/node-newrelic/commit/1b55c5ae5df8eb8d20d499e31b80014acd9b7833))
+* Refactored `memcached` instrumentation to subscribe to events emitted ([#3849](https://github.com/newrelic/node-newrelic/pull/3849)) ([915b320](https://github.com/newrelic/node-newrelic/commit/915b320e1b01944fe89754305e146c0c69dca0c6))
+* Refactored `bluebird` instrumentation to subscribe to events emitted ([#3858](https://github.com/newrelic/node-newrelic/pull/3858)) ([e3d84c2](https://github.com/newrelic/node-newrelic/commit/e3d84c285b9b73c2d2e7f690fe449371e92a5b1a))
+* Refactored `q` instrumentation to subscribe to events emitted ([#3853](https://github.com/newrelic/node-newrelic/pull/3853)) ([9fdb0b8](https://github.com/newrelic/node-newrelic/commit/9fdb0b80130998d283d3ec6a2f0e1b39916bd9e5))
+* Refactored `grpc-js` client instrumentation to subscriber type ([#3856](https://github.com/newrelic/node-newrelic/pull/3856)) ([057fca2](https://github.com/newrelic/node-newrelic/commit/057fca295e31a952795d688e7a12228c58d839ba))
+* Refactored `grpc-js` server instrumentation to subscriber type ([#3805](https://github.com/newrelic/node-newrelic/pull/3805)) ([ca3010a](https://github.com/newrelic/node-newrelic/commit/ca3010aca73cf69786794824063b4f2d5ce38d41))
+* Updated `@langchain/core` subscribers to properly instrument the tool class methods ([#3850](https://github.com/newrelic/node-newrelic/pull/3850)) ([2d17eed](https://github.com/newrelic/node-newrelic/commit/2d17eeda540ef99f5ce829499ca1f4b0ef65e1a6))
+
+#### Documentation
+
+* Updated compatibility report ([#3831](https://github.com/newrelic/node-newrelic/pull/3831)) ([9156a6a](https://github.com/newrelic/node-newrelic/commit/9156a6a239dd57c46524d5d1a43a654dc7a89cb5))
+
+#### Miscellaneous chores
+
+* Added subscriber packages to `load-externals` ([#3868](https://github.com/newrelic/node-newrelic/pull/3868)) ([83adcc4](https://github.com/newrelic/node-newrelic/commit/83adcc43b061e55b2d9d3df6fafa152b2ed201df))
+
+#### Tests
+
+* Removed unused context manager feature flag for running versioned tests ([#3851](https://github.com/newrelic/node-newrelic/pull/3851)) ([15c9757](https://github.com/newrelic/node-newrelic/commit/15c9757339e0d811c96ff58fc275386b9fc2a7a4))
+* Updated core tracing cross agent tests ([#3860](https://github.com/newrelic/node-newrelic/pull/3860)) ([08e4570](https://github.com/newrelic/node-newrelic/commit/08e45703852ea556c8518acd0560c57f56ea9c8c))
+* Fixed issue with span links test ([#3863](https://github.com/newrelic/node-newrelic/pull/3863)) ([23a8594](https://github.com/newrelic/node-newrelic/commit/23a8594f7b0078b62c73f73e7afa0411e96ade69))
+* Removed segment duration timing threshold in `memcached` tests ([#3869](https://github.com/newrelic/node-newrelic/pull/3869)) ([bd24410](https://github.com/newrelic/node-newrelic/commit/bd24410f135868a4e86f4c5375baf67cee2ccbc7))
+
+### v13.17.0 (2026-03-19)
+
+#### Features
+
+* Added support for Continuous Profiling ([#3834](https://github.com/newrelic/node-newrelic/pull/3834)) ([6d8d5b5](https://github.com/newrelic/node-newrelic/commit/6d8d5b5df2f459ffca39cc14ef0cdabcf7f22cea))
+  * Added server-side configuration for `profiling.enabled` ([#3790](https://github.com/newrelic/node-newrelic/pull/3790)) ([0d44e5b](https://github.com/newrelic/node-newrelic/commit/0d44e5b3b24b60d8b920f7d6a762f208fa4139ca)) ([#3847](https://github.com/newrelic/node-newrelic/pull/3847)) ([e57223c](https://github.com/newrelic/node-newrelic/commit/e57223c7c66ab7fe1f464725efe0474e23326159))
+  * Added delay + duration to `ProfilingAggregator` ([#3815](https://github.com/newrelic/node-newrelic/pull/3815)) ([8000665](https://github.com/newrelic/node-newrelic/commit/8000665b1714275f8e019a2f7c911d62ee8dd127))
+  * Added supportability metrics for profiling ([#3801](https://github.com/newrelic/node-newrelic/pull/3801)) ([19bbb7e](https://github.com/newrelic/node-newrelic/commit/19bbb7ef426e835a13ec38fc543637bdae57a5fc))
+  * Prevented ProfilingAggregator from running in serverless mode ([#3806](https://github.com/newrelic/node-newrelic/pull/3806)) ([e4db0f4](https://github.com/newrelic/node-newrelic/commit/e4db0f469fde9ae6aa4984cb312ee1de269e5c7b))
+  * Disabled `profiling.enabled` when high security mode is enabled ([#3803](https://github.com/newrelic/node-newrelic/pull/3803)) ([9d4eebb](https://github.com/newrelic/node-newrelic/commit/9d4eebb11df00fc5729ad178063712734449741a))
+  * Added Heap profiler ([#3751](https://github.com/newrelic/node-newrelic/pull/3751)) ([8262f6b](https://github.com/newrelic/node-newrelic/commit/8262f6bb5d7bf0a1c996455d6829883a7ff3b696))
+  * Added Cpu Profiler ([#3747](https://github.com/newrelic/node-newrelic/pull/3747)) ([2c2097f](https://github.com/newrelic/node-newrelic/commit/2c2097fdfd4ec924bf24901eecb8ad62a9e4c4f5))
+
+**Note**: Continuous Profiling UI is coming soon! While the Node.js agent now supports Continuous Profiling data collection, the visualization experience will debut in Limited Preview starting next week. If you would like to get early access to the profiling dashboards and UI features, please reach out to your Account Executive (AE) about how to opt-in to the preview.
+
+#### Code refactoring
+
+* Refactor `winston` instrumentation to subscribe to events emitted ([#3808](https://github.com/newrelic/node-newrelic/pull/3808)) ([4af2f48](https://github.com/newrelic/node-newrelic/commit/4af2f48d99b0842085044deb36d14af9e96ac8ed))
+
+#### Documentation
+
+* Updated compatibility report ([#3824](https://github.com/newrelic/node-newrelic/pull/3824)) ([0cfb356](https://github.com/newrelic/node-newrelic/commit/0cfb356c487fbe47c4ac11095704846d948168fb))
+
+#### Tests
+
+* Added segment duration tests for `ioredis`/`iovalkey` ([#3825](https://github.com/newrelic/node-newrelic/pull/3825)) ([9738bc8](https://github.com/newrelic/node-newrelic/commit/9738bc88b59c219d896d80e0f8ccb93866cd7f0b))
+* Added segment duration timing tests for `mysql2` ([#3820](https://github.com/newrelic/node-newrelic/pull/3820)) ([bb424ff](https://github.com/newrelic/node-newrelic/commit/bb424ffa59fe55912f1ad711d84b57518dbd778f))
+* Changed structure of bedrock tests to avoid getting instrumented core libraries from first test ([#3838](https://github.com/newrelic/node-newrelic/pull/3838)) ([886a36c](https://github.com/newrelic/node-newrelic/commit/886a36c1607e1a7c0ddc0688f7b8ee62f9a8bf10))
+* Changed structure of lambda and sns tests to avoid getting instrumented core libraries from first test ([#3836](https://github.com/newrelic/node-newrelic/pull/3836)) ([414044d](https://github.com/newrelic/node-newrelic/commit/414044d184be885843a3267097c87954daf408bd))
+* Updated `@aws-sdk/lib-dynamodb` version range ([#3829](https://github.com/newrelic/node-newrelic/pull/3829)) ([d28c938](https://github.com/newrelic/node-newrelic/commit/d28c938fbe823155fedeb5e5f85bd6a98e04ceed))
+
 ### v13.16.0 (2026-03-11)
 
 #### Bug fixes

package/lib/context-manager/context.js

@@ -5,6 +5,19 @@
 
 'use strict'
 
+/**
+ * Data used across {@link AsyncLocalStorage} invocations.
+ *
+ * @typedef {object} AsyncContext
+ * @property {Transaction} transaction The current transaction or `null`.
+ * @property {TraceSegment} segment The current segment or `null`.
+ * @property {object} extras Miscellaneous data used during the handling of
+ * this context.
+ */
+
+/**
+ * Implementation of an {@link AsyncContext}.
+ */
 module.exports = class Context {
   constructor({ transaction, segment, extras = {} } = {}) {
     this._transaction = transaction
@@ -35,7 +48,7 @@ module.exports = class Context {
    * @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
+   * @returns {AsyncContext} a newly constructed context
    */
   enterSegment({ segment, transaction = this.transaction }) {
     return new this.constructor({ transaction, segment, extras: this.extras })

package/lib/feature_flags.js

@@ -10,7 +10,6 @@ exports.prerelease = {
   // internal_test_only is used for testing our feature flag implementation.
   // It is not used to gate any features.
   internal_test_only: false,
-  promise_segments: false,
   reverse_naming_rules: false,
   unresolved_promise_cleanup: true,
   kafkajs_instrumentation: false,
@@ -33,6 +32,7 @@ exports.released = [
   'native_metrics',
   'new_promise_tracking',
   'opentelemetry',
+  'promise_segments',
   'protocol_17',
   'released',
   'send_request_uri_attribute',

package/lib/instrumentations.js

@@ -11,21 +11,16 @@ const InstrumentationDescriptor = require('./instrumentation-descriptor')
 module.exports = function instrumentations() {
   return {
     '@azure/functions': { type: InstrumentationDescriptor.TYPE_GENERIC },
-    '@grpc/grpc-js': { module: './instrumentation/grpc-js' },
     '@hapi/hapi': { type: InstrumentationDescriptor.TYPE_WEB_FRAMEWORK },
     '@hapi/vision': { type: InstrumentationDescriptor.TYPE_WEB_FRAMEWORK },
     '@prisma/client': { type: InstrumentationDescriptor.TYPE_DATASTORE },
     'aws-sdk': { module: './instrumentation/aws-sdk' },
-    bluebird: { type: InstrumentationDescriptor.TYPE_PROMISE },
     connect: { type: InstrumentationDescriptor.TYPE_WEB_FRAMEWORK },
     fastify: { type: InstrumentationDescriptor.TYPE_WEB_FRAMEWORK },
     kafkajs: { type: InstrumentationDescriptor.TYPE_MESSAGE },
     koa: { module: './instrumentation/koa' },
-    memcached: { type: InstrumentationDescriptor.TYPE_DATASTORE },
     mongodb: { type: InstrumentationDescriptor.TYPE_DATASTORE },
     next: { module: './instrumentation/nextjs' },
-    q: { type: null },
-    restify: { type: InstrumentationDescriptor.TYPE_WEB_FRAMEWORK },
-    when: { module: './instrumentation/when' }
+    restify: { type: InstrumentationDescriptor.TYPE_WEB_FRAMEWORK }
   }
 }

package/lib/spans/span-link.js

@@ -66,8 +66,10 @@ class SpanLink {
     this.intrinsics.linkedSpanId = link.context.spanId
     this.intrinsics.linkedTraceId = link.context.traceId
 
-    for (const [key, value] of Object.entries(link.attributes)) {
-      this.userAttributes.addAttribute(DESTINATIONS.TRANS_SEGMENT, key, value)
+    if (Object.hasOwn(link, 'attributes') === true) {
+      for (const [key, value] of Object.entries(link.attributes)) {
+        this.userAttributes.addAttribute(DESTINATIONS.TRANS_SEGMENT, key, value)
+      }
     }
   }
 

package/lib/subscriber-configs.js

@@ -9,27 +9,32 @@
 // 'package-name': [ { path: 'subscriberPath', instrumentations: [] }, ... ]
 const subscribers = {
   ...require('./subscribers/amqplib/config'),
+  ...require('./subscribers/bluebird/config'),
   ...require('./subscribers/bunyan/config'),
   ...require('./subscribers/cassandra-driver/config'),
   ...require('./subscribers/elasticsearch/config'),
   ...require('./subscribers/express/config'),
   ...require('./subscribers/fastify/config'),
   ...require('./subscribers/google-genai/config'),
+  ...require('./subscribers/grpcjs/config'),
   ...require('./subscribers/ioredis/config'),
   ...require('./subscribers/iovalkey/config'),
   ...require('./subscribers/langchain/config'),
   ...require('./subscribers/langgraph/config'),
   ...require('./subscribers/mcp-sdk/config'),
+  ...require('./subscribers/memcached/config'),
   ...require('./subscribers/mysql/config'),
   ...require('./subscribers/mysql2/config'),
   ...require('./subscribers/nestjs/config'),
   ...require('./subscribers/node-redis-client/config'),
   ...require('./subscribers/openai/config'),
-  ...require('./subscribers/pino/config'),
   ...require('./subscribers/pg/config'),
+  ...require('./subscribers/pino/config'),
+  ...require('./subscribers/q/config'),
   ...require('./subscribers/redis/config'),
   ...require('./subscribers/redis-client/config'),
   ...require('./subscribers/undici/config'),
+  ...require('./subscribers/when/config'),
   ...require('./subscribers/winston/config')
 }
 

package/lib/subscribers/README.md

@@ -84,6 +84,16 @@ module.exports = {
 }
 ```
 
+#### Function Query
+
+| Query type                          | Use when                                                                           |
+| ----------------------------------- | ---------------------------------------------------------------------------------- |
+| `expressionName`                  | Function expression assigned to a variable/property (`x.y = function name() {}`) |
+| `functionName`                    | Standalone function declaration (`function foo() {}`)                            |
+| `className` + `methodName`      | Class method (`class Foo { bar() {} }`)                                          |
+| `methodName` alone                | Any method with that name across all classes                                       |
+| `moduleName` + `expressionName` | Disambiguate by the object it's assigned to                                        |
+
 ### Creating the Subscribers
 
 Now that you have the config specified for the function that you are instrumenting, you'll then need to create a subscriber for it. All subscribers should at least inherit from the base [`Subscriber`](./base.js) with the exception of subscribers that do not rely on `orchestrion` to create their tracing channels (they inherit from the `node:diagnostics_channel` `Subscriber` in [`dc-base.js`](./dc-base.js)).

package/lib/subscribers/base.js

@@ -182,12 +182,17 @@ class Subscriber {
 
   /**
    * Creates a segment with a name, parent, transaction and optional recorder.
-   * If the segment is successfully created, it will be started and added to the context.
+   * If the segment is successfully created, it will be started and added to the
+   * context.
+   *
    * @param {object} params - Parameters for creating the segment
    * @param {string} params.name - The name of the segment
    * @param {object} [params.recorder] - Optional recorder for the segment
-   * @param {Context} params.ctx - The context containing the parent segment and transaction
-   * @returns {Context} - The updated context with the new segment or existing context if segment creation fails
+   * @param {Context} params.ctx - The context containing the parent segment and
+   * transaction
+   *
+   * @returns {AsyncContext} - The updated context with the new segment or
+   * existing context if segment creation fails
    */
   createSegment({ name, recorder, ctx }) {
     const parent = ctx?.segment
@@ -210,8 +215,7 @@ class Subscriber {
       segment.start()
       this.logger.trace('Created segment %s, returning new context', name)
       this.addAttributes(segment)
-      const newCtx = ctx.enterSegment({ segment })
-      return newCtx
+      return ctx.enterSegment({ segment })
     } else {
       this.logger.trace('Failed to create segment for %s, returning existing context', name)
       return ctx
@@ -230,9 +234,9 @@ class Subscriber {
   /**
    * Not all subscribers need to change the context on an event.
    * This is defined on base to fulfill those use cases.
-   * @param {object} data event passed to handler
-   * @param {Context} ctx context passed to handler
-   * @returns {Context} either new context or existing
+   * @param {SubscriberHandlerData} data event passed to handler
+   * @param {SubscriberHandlerContext} ctx context passed to handler
+   * @returns {AsyncContext} either new context or existing
    */
   handler(data, ctx) {
     return ctx

package/lib/subscribers/bluebird/config.js

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2026 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+'use strict'
+
+module.exports = {
+  bluebird: [
+    {
+      path: './bluebird/instrumentation',
+      instrumentations: [{
+        channelName: 'nr_then',
+        module: { name: 'bluebird', versionRange: '>=2.02', filePath: 'js/release/promise.js' },
+        functionQuery: {
+          functionName: 'Promise',
+          kind: 'Sync'
+        }
+      }]
+    },
+  ]
+}

package/lib/subscribers/bluebird/instrumentation.js

@@ -0,0 +1,59 @@
+/*
+ * Copyright 2026 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+const BaseSubscriber = require('../base')
+
+module.exports = class BluebirdPromiseSubscriber extends BaseSubscriber {
+  constructor({ agent, logger }) {
+    super({ agent, logger, channelName: 'nr_then', packageName: 'bluebird' })
+  }
+
+  /**
+   * We have to wrap the Promise prototype, not just the _then method.
+   * This is because we need to get the current context from when the promise was constructed.
+   * If we only wrapped `_then`, the context is not the same, you can see from the versioned tests
+   * Where it will defer promise resolution
+   *
+   * @param {object} data event data
+   * @param {Context} ctx the current context
+   * @returns {Context} in this case it is the same context, just with both `_then` and its respective callbacks bound to the current context
+   */
+  handler(data, ctx) {
+    const { self: BluebirdPromise } = data
+    const origThen = BluebirdPromise._then
+    BluebirdPromise._then = this.#wrapThenHandler({ ctx, origThen })
+    return ctx
+  }
+
+  /**
+   * wraps the current `_then` method on the instance.
+   * It binds the context from when promise was constructed to the callbacks(didFulfill, didReject, didProgress)
+   *
+   * @param {object} params to function
+   * @param {Context} params.ctx active context
+   * @param {Function} params.origThen the original `_then` method on promise instance
+   * @returns {Function} wrapped `_then` function
+   */
+  #wrapThenHandler({ ctx, origThen }) {
+    const self = this
+    return function wrappedThenHandler(...args) {
+      const [didFulfill, didReject, didProgress] = args
+      // only bind the callback if the transaction from context is still active
+      if (ctx.transaction.isActive() === false) {
+        return origThen.apply(this, args)
+      }
+      args[0] = self.agent.tracer.bindFunction(didFulfill, ctx)
+      args[1] = self.agent.tracer.bindFunction(didReject, ctx)
+
+      // didProgress is only applicable to v2.x
+      if (didProgress) {
+        args[2] = self.agent.tracer.bindFunction(didProgress, ctx)
+      }
+      return self.agent.tracer.bindFunction(origThen, ctx).apply(this, args)
+    }
+  }
+}

package/lib/subscribers/grpcjs/client.js

@@ -0,0 +1,126 @@
+/*
+ * Copyright 2026 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+const Subscriber = require('../base.js')
+const shouldTrackError = require('./should-track-error.js')
+const recordExternal = require('#agentlib/metrics/recorders/http_external.js')
+
+module.exports = class GrpcClientSubscriber extends Subscriber {
+  constructor({ agent, logger, channelName }) {
+    super({
+      agent,
+      logger,
+      channelName,
+      packageName: '@grpc/grpc-js',
+    })
+
+    this.opaque = true
+  }
+
+  handler(data, ctx) {
+    const { arguments: args, self: client } = data
+    const { transaction } = ctx
+
+    const { channel } = client
+    const authority = channel.target?.path || channel.getDefaultAuthority
+    // In grpc-js>=1.8.0  `.methodName` becomes `.method`.
+    const method = client.methodName || client.method
+
+    const newCtx = this.createSegment({
+      name: `External/${authority}${method}`,
+      recorder: recordExternal(authority, 'gRPC'),
+      ctx
+    })
+
+    // Acquire the original parameters to the handler, create patched
+    // versions of them, and update the parameters list with the patched
+    // instances.
+    const origMetadata = args[0]
+    const origListener = args[1]
+    const nrMetadata = origMetadata.clone()
+    const nrListener = Object.assign({}, origListener)
+    args[0] = nrMetadata
+    args[1] = nrListener
+
+    this.#addDistributedTraceHeaders(transaction, nrMetadata)
+    this.#wrapListenerCallback(nrListener, origListener, authority, method, newCtx)
+
+    return newCtx
+  }
+
+  /**
+   * When distributed tracing (DT) is enabled, pull DT headers from the
+   * provided transaction and add them to the metadata object used by gRPC
+   * when delivering data.
+   *
+   * @param {Transaction} transaction The transaction that contains the DT data.
+   * @param {object} destination The gRPC metadata object to add headers to.
+   * This object will be mutated.
+   */
+  #addDistributedTraceHeaders(transaction, destination) {
+    if (this.agent.config.distributed_tracing.enabled === false) {
+      this.logger.debug('Distributed tracing disabled by instrumentation.')
+      return
+    }
+
+    const outboundAgentHeaders = Object.create(null)
+    transaction.insertDistributedTraceHeaders(outboundAgentHeaders)
+    for (const [key, value] of Object.entries(outboundAgentHeaders)) {
+      destination.add(key, value)
+    }
+  }
+
+  /**
+   * When the original gRPC "listener" object has an `onReceiveStatus` method
+   * defined, wrap that method to capture tracing data and attach the wrapped
+   * method to the patched `nrListener` instance.
+   *
+   * @param {object} nrListener New Relic clone of the original listener.
+   * @param {object} origListener Original gRPC listener object.
+   * @param {string} authority Value of the `:authority` header.
+   * @param {string} method The gRPC method name to be invoked.
+   * @param {AsyncContext} ctx The context to execute the `onReceiveStatus`
+   * handler under.
+   */
+  #wrapListenerCallback(nrListener, origListener, authority, method, ctx) {
+    if (typeof origListener?.onReceiveStatus !== 'function') {
+      return
+    }
+
+    const agent = this.agent
+    const [hostname, port] = authority.split(':')
+
+    nrListener.onReceiveStatus = function nrOnReceiveStatus(status) {
+      const { segment, transaction } = ctx
+      const { code, details } = status
+      segment.addAttribute('grpc.statusCode', code)
+      segment.addAttribute('grpc.statusText', details)
+      segment.addAttribute('component', 'gRPC')
+
+      if (shouldTrackError(code, agent.config) === true) {
+        agent.errors.add(transaction, details)
+      }
+
+      const protocol = 'grpc:'
+      segment.captureExternalAttributes({
+        protocol,
+        host: authority,
+        port,
+        hostname,
+        method,
+        path: method
+      })
+
+      const boundFn = agent.tracer.bindFunction(
+        origListener.onReceiveStatus,
+        ctx,
+        true
+      )
+      boundFn(status)
+    }
+  }
+}

package/lib/subscribers/grpcjs/config.js

@@ -0,0 +1,63 @@
+/*
+ * Copyright 2026 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+const modName = '@grpc/grpc-js'
+
+module.exports = {
+  [modName]: [
+    {
+      path: './grpcjs/server.js',
+      instrumentations: [{
+        channelName: 'nr_grpc_server',
+        module: {
+          name: modName,
+          filePath: 'build/src/server.js',
+          versionRange: '>=1.4.0'
+        },
+        functionQuery: {
+          className: 'Server',
+          methodName: 'register',
+          kind: 'Sync'
+        }
+      }]
+    },
+
+    {
+      path: './grpcjs/http2-stream.js',
+      instrumentations: [{
+        channelName: 'nr_grpc_stream',
+        module: {
+          name: modName,
+          filePath: 'build/src/call-stream.js',
+          versionRange: '>=1.4.0 <1.8.0'
+        },
+        functionQuery: {
+          className: 'Http2CallStream',
+          methodName: 'start',
+          kind: 'Sync'
+        }
+      }]
+    },
+
+    {
+      path: './grpcjs/resolving-call.js',
+      instrumentations: [{
+        channelName: 'nr_grpc_resolving',
+        module: {
+          name: modName,
+          filePath: 'build/src/resolving-call.js',
+          versionRange: '>=1.8.0'
+        },
+        functionQuery: {
+          className: 'ResolvingCall',
+          methodName: 'start',
+          kind: 'Sync'
+        }
+      }]
+    }
+  ]
+}

package/lib/subscribers/grpcjs/http2-stream.js

@@ -0,0 +1,14 @@
+/*
+ * Copyright 2026 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+const GCS = require('./client.js')
+
+module.exports = class Http2StreamSubscriber extends GCS {
+  constructor({ agent, logger }) {
+    super({ agent, logger, channelName: 'nr_grpc_stream' })
+  }
+}

package/lib/subscribers/grpcjs/resolving-call.js

@@ -0,0 +1,14 @@
+/*
+ * Copyright 2026 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+const GCS = require('./client.js')
+
+module.exports = class ResolvingCallSubscriber extends GCS {
+  constructor({ agent, logger }) {
+    super({ agent, logger, channelName: 'nr_grpc_resolving' })
+  }
+}