newrelic 11.10.4 → 11.11.0

package/NEWS.md

@@ -1,23 +1,66 @@
-### v11.10.4 (2024-02-13)
-
-#### Bug fixes
-
-* Resolved application logs getting blocked when an excessive payload is encountered ([#2013](https://github.com/newrelic/node-newrelic/pull/2013)) ([365ded4](https://github.com/newrelic/node-newrelic/commit/365ded432b7781ee9c896bf0e067dac8cc2c45cc))
-* Updated Shim to properly calculate the `_moduleRoot` on windows environments ([#2014](https://github.com/newrelic/node-newrelic/pull/2014)) ([ab0bd7f](https://github.com/newrelic/node-newrelic/commit/ab0bd7f87a5ed6ea38f51f068a2fc066af8f8d74))
-
-#### Code refactoring
-
-* Abstracted registering of new aggregators into a Harvester class that is responsible for starting, stopping, updating all registered aggregators. ([#1994](https://github.com/newrelic/node-newrelic/pull/1994)) ([1fb85a6](https://github.com/newrelic/node-newrelic/commit/1fb85a6f97c522ce2951911c670fcbddaa218049))
-* Refactored specs into classes for easier code navigation ([#2004](https://github.com/newrelic/node-newrelic/pull/2004)) ([4daedc0](https://github.com/newrelic/node-newrelic/commit/4daedc08c707bec22056466ef15a45b50f20026f))
-
-#### Miscellaneous chores
-
-* **deps:** Updated @newrelic/security agent to v1.0.1 ([#2002](https://github.com/newrelic/node-newrelic/pull/2002)) ([b460c7b](https://github.com/newrelic/node-newrelic/commit/b460c7be589dd6fa801285b756bf66f62e0f10aa))
-
-#### Tests
-
-* Updated smoke tests to send data to the appropriate collector method ([#2005](https://github.com/newrelic/node-newrelic/pull/2005)) ([6130486](https://github.com/newrelic/node-newrelic/commit/6130486514268b02f68dccceb9b1e29d1e99c78e))
-
+### v11.11.0 (2024-02-27)
+
+#### Features
+
+* Added instrumentation for RunnableSequence ([#1996](https://github.com/newrelic/node-newrelic/pull/1996)) ([71ffa37](https://github.com/newrelic/node-newrelic/commit/71ffa373e01d27be4d3ad40464facc8a33f4aeb2))
+
+* Added LangChain error events capture ([#2040](https://github.com/newrelic/node-newrelic/pull/2040)) ([4d0d839](https://github.com/newrelic/node-newrelic/commit/4d0d8396ac3c19dee9d14477d8b408efaae3c24f))
+
+* Added `ai_monitoring.streaming.enabled`. When set to `false` this will not instrument chat completion streams, thus it will not create relevant Llm events. ([#2021](https://github.com/newrelic/node-newrelic/pull/2021)) ([ff78b51](https://github.com/newrelic/node-newrelic/commit/ff78b514d0afe8127a094ce810f164b08768bcac))
+* Added ability to recordLlmFeedbackEvent by traceId ([#2043](https://github.com/newrelic/node-newrelic/pull/2043)) ([b0a4ed1](https://github.com/newrelic/node-newrelic/commit/b0a4ed10ad7d6e021727d6d5e4746292e7a34ea1))
+* Added instrumentation for langchain tools. ([#2009](https://github.com/newrelic/node-newrelic/pull/2009)) ([695d10e](https://github.com/newrelic/node-newrelic/commit/695d10e28ee6cbeba252299d7d94c9660137d293))
+
+#### Code refactoring
+
+* Updated AIM instrumentation ([#2015](https://github.com/newrelic/node-newrelic/pull/2015)) ([d37d2a8](https://github.com/newrelic/node-newrelic/commit/d37d2a88a4754c23ee039955c5839d8b7d35f875))
+    * removed capturing last 4 of api key
+    * included all custom attributes prefixed with `llm.` as attributes on all Llm events
+    * changed tracking metric to start with Supportability
+
+* Updated capturing conversation_id on Llm Events as `llm.conversation_id` ([#2020](https://github.com/newrelic/node-newrelic/pull/2020)) ([5f93f65](https://github.com/newrelic/node-newrelic/commit/5f93f6571eeb38740d8f3cb59f7706d9cb07c67a))
+* Updated instrumentation to construct specs at source instead of within the shim methods ([#2035](https://github.com/newrelic/node-newrelic/pull/2035)) ([ead8c25](https://github.com/newrelic/node-newrelic/commit/ead8c25e851d49b199cf808529e6483b2a3f024d))
+    * Simplified the logic in `shim.recordQuery` and `shim.recordOperation` to reduce merging of spec properties and rely on the constructed spec
+
+
+#### Documentation
+
+* Added note about using sudo for firewall script ([#2032](https://github.com/newrelic/node-newrelic/pull/2032)) ([bf106d2](https://github.com/newrelic/node-newrelic/commit/bf106d2a8a84d86443765a27d031233993cbd788))
+
+* Fixed spec objects parameter definitions ([#2024](https://github.com/newrelic/node-newrelic/pull/2024)) ([4378173](https://github.com/newrelic/node-newrelic/commit/4378173b19cd1a7c92c38d6d9d7c6ad22d823fe5))
+
+
+#### Miscellaneous chores
+
+* Added missing is_response to LangChain completion messages ([#2044](https://github.com/newrelic/node-newrelic/pull/2044)) ([20c7d47](https://github.com/newrelic/node-newrelic/commit/20c7d473e318d50854ab8fefcc92d0b7a3b95b64))
+
+* Attached specs to the `Shim.prototype` for use in custom instrumentation and instrumentation outside of the agent ([#2038](https://github.com/newrelic/node-newrelic/pull/2038)) ([2c97488](https://github.com/newrelic/node-newrelic/commit/2c974887068b7cc522eb29dd781481bb1583bde7))
+* **deps:** Updated to use @newrelic/ritm from require-in-the-middle ([#2034](https://github.com/newrelic/node-newrelic/pull/2034)) ([ffb729f](https://github.com/newrelic/node-newrelic/commit/ffb729f1e9389e7a3d495b09df913eb3b5b43c3f))
+* Updated DatastoreParameters to include collection ([#2039](https://github.com/newrelic/node-newrelic/pull/2039)) ([b9c73ca](https://github.com/newrelic/node-newrelic/commit/b9c73ca482d13d26f2bf54c22cd3ab4f77f413ca))
+
+#### Tests
+
+* Cleaned up pending mocks in the log dropping test to avoid a console warning around pending mocks in after each ([#2017](https://github.com/newrelic/node-newrelic/pull/2017)) ([d2f40c2](https://github.com/newrelic/node-newrelic/commit/d2f40c2e67c5bff826d0234412eacdfff70a2fd7))
+
+### v11.10.4 (2024-02-13)
+
+#### Bug fixes
+
+* Resolved application logs getting blocked when an excessive payload is encountered ([#2013](https://github.com/newrelic/node-newrelic/pull/2013)) ([365ded4](https://github.com/newrelic/node-newrelic/commit/365ded432b7781ee9c896bf0e067dac8cc2c45cc))
+* Updated Shim to properly calculate the `_moduleRoot` on windows environments ([#2014](https://github.com/newrelic/node-newrelic/pull/2014)) ([ab0bd7f](https://github.com/newrelic/node-newrelic/commit/ab0bd7f87a5ed6ea38f51f068a2fc066af8f8d74))
+
+#### Code refactoring
+
+* Abstracted registering of new aggregators into a Harvester class that is responsible for starting, stopping, updating all registered aggregators. ([#1994](https://github.com/newrelic/node-newrelic/pull/1994)) ([1fb85a6](https://github.com/newrelic/node-newrelic/commit/1fb85a6f97c522ce2951911c670fcbddaa218049))
+* Refactored specs into classes for easier code navigation ([#2004](https://github.com/newrelic/node-newrelic/pull/2004)) ([4daedc0](https://github.com/newrelic/node-newrelic/commit/4daedc08c707bec22056466ef15a45b50f20026f))
+
+#### Miscellaneous chores
+
+* **deps:** Updated @newrelic/security agent to v1.0.1 ([#2002](https://github.com/newrelic/node-newrelic/pull/2002)) ([b460c7b](https://github.com/newrelic/node-newrelic/commit/b460c7be589dd6fa801285b756bf66f62e0f10aa))
+
+#### Tests
+
+* Updated smoke tests to send data to the appropriate collector method ([#2005](https://github.com/newrelic/node-newrelic/pull/2005)) ([6130486](https://github.com/newrelic/node-newrelic/commit/6130486514268b02f68dccceb9b1e29d1e99c78e))
+
 ### v11.10.3 (2024-02-07)
 
 #### Features

package/THIRD_PARTY_NOTICES.md

@@ -18,6 +18,7 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 * [@grpc/proto-loader](#grpcproto-loader)
 * [@newrelic/aws-sdk](#newrelicaws-sdk)
 * [@newrelic/koa](#newrelickoa)
+* [@newrelic/ritm](#newrelicritm)
 * [@newrelic/security-agent](#newrelicsecurity-agent)
 * [@newrelic/superagent](#newrelicsuperagent)
 * [@tyriar/fibonacci-heap](#tyriarfibonacci-heap)
@@ -28,7 +29,6 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 * [json-stringify-safe](#json-stringify-safe)
 * [module-details-from-path](#module-details-from-path)
 * [readable-stream](#readable-stream)
-* [require-in-the-middle](#require-in-the-middle)
 * [semver](#semver)
 * [winston-transport](#winston-transport)
 
@@ -919,6 +919,36 @@ Apache License
 
 ```
 
+### @newrelic/ritm
+
+This product includes source derived from [@newrelic/ritm](https://github.com/newrelic-forks/require-in-the-middle) ([v7.2.0](https://github.com/newrelic-forks/require-in-the-middle/tree/v7.2.0)), distributed under the [MIT License](https://github.com/newrelic-forks/require-in-the-middle/blob/v7.2.0/LICENSE):
+
+```
+The MIT License (MIT)
+
+Copyright (c) 2016-2019, Thomas Watson Steen
+Copyright (c) 2019-2023, Elasticsearch B.V.
+
+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 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.
+
+```
+
 ### @newrelic/security-agent
 
 This product includes source derived from [@newrelic/security-agent](https://github.com/newrelic/csec-node-agent) ([v1.0.1](https://github.com/newrelic/csec-node-agent/tree/v1.0.1)), distributed under the [UNKNOWN License](https://github.com/newrelic/csec-node-agent/blob/v1.0.1/LICENSE):
@@ -1406,36 +1436,6 @@ 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.2.0](https://github.com/elastic/require-in-the-middle/tree/v7.2.0)), distributed under the [MIT License](https://github.com/elastic/require-in-the-middle/blob/v7.2.0/LICENSE):
-
-```
-The MIT License (MIT)
-
-Copyright (c) 2016-2019, Thomas Watson Steen
-Copyright (c) 2019-2023, Elasticsearch B.V.
-
-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 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.
-
-```
-
 ### semver
 
 This product includes source derived from [semver](https://github.com/npm/node-semver) ([v7.6.0](https://github.com/npm/node-semver/tree/v7.6.0)), distributed under the [ISC License](https://github.com/npm/node-semver/blob/v7.6.0/LICENSE):
@@ -2426,7 +2426,7 @@ THE SOFTWARE.
 
 ### eslint-plugin-jsdoc
 
-This product includes source derived from [eslint-plugin-jsdoc](https://github.com/gajus/eslint-plugin-jsdoc) ([v48.0.5](https://github.com/gajus/eslint-plugin-jsdoc/tree/v48.0.5)), distributed under the [BSD-3-Clause License](https://github.com/gajus/eslint-plugin-jsdoc/blob/v48.0.5/LICENSE):
+This product includes source derived from [eslint-plugin-jsdoc](https://github.com/gajus/eslint-plugin-jsdoc) ([v48.0.6](https://github.com/gajus/eslint-plugin-jsdoc/tree/v48.0.6)), distributed under the [BSD-3-Clause License](https://github.com/gajus/eslint-plugin-jsdoc/blob/v48.0.6/LICENSE):
 
 ```
 Copyright (c) 2018, Gajus Kuizinas (http://gajus.com/)

package/api.js

@@ -23,7 +23,7 @@ const {
   assignCLMSymbol,
   addCLMAttributes: maybeAddCLMAttributes
 } = require('./lib/util/code-level-metrics')
-const { LlmFeedbackMessage } = require('./lib/llm-events/openai')
+const LlmFeedbackMessage = require('./lib/llm-events/feedback-message')
 
 const ATTR_DEST = require('./lib/config/attribute-filter').DESTINATIONS
 const MODULE_TYPE = require('./lib/shim/constants').MODULE_TYPE
@@ -617,7 +617,7 @@ API.prototype.addIgnoringRule = function addIgnoringRule(pattern) {
  * @private
  * @see RUM_ISSUES
  * @param {number} errorCode Error code from `RUM_ISSUES`.
- * @param {boolean} [quiet=false] Be quiet about this failure.
+ * @param {boolean} [quiet] Be quiet about this failure.
  * @returns {string} HTML comment for debugging purposes with specific error code
  */
 function _gracefail(errorCode, quiet) {
@@ -1541,52 +1541,20 @@ API.prototype.getTraceMetadata = function getTraceMetadata() {
   return metadata
 }
 
-/**
- * Get a set of tracked identifiers
- *
- * @param {object} params Input parameters.
- * @param {string} params.responseId The LLM generated identifier for the
- * response.
- * @returns {LlmTrackedIds|undefined} The tracked identifiers.
- */
-API.prototype.getLlmMessageIds = function getLlmMessageIds({ responseId } = {}) {
-  this.agent.metrics
-    .getOrCreateMetric(`${NAMES.SUPPORTABILITY.API}/getLlmMessageIds`)
-    .incrementCallCount()
-
-  if (this.agent.config?.ai_monitoring?.enabled !== true) {
-    logger.warn('getLlmMessageIds invoked but ai_monitoring is disabled.')
-    return
-  }
-
-  const tx = this.agent.tracer.getTransaction()
-  if (!tx) {
-    logger.warn('getLlmMessageIds must be called within the scope of a transaction.')
-    return
-  }
-  return tx.llm.responses.get(responseId)
-}
-
 /**
  * Record a LLM feedback event which can be viewed in New Relic API Monitoring.
  *
  * @param {object} params Input parameters.
- * @param {string} [params.conversationId=""] If available, the unique
- * identifier for the LLM conversation that triggered the event.
- * @param {string} [params.requestId=""] If available, the request identifier
- * from the remote service.
- * @param {string} params.messageId Identifier for the message being rated.
- * Obtained from {@link getLlmMessageIds}.
+ * @param {string} params.traceId Identifier for the feedback event.
+ * Obtained from {@link getTraceMetadata}.
  * @param {string} params.category A tag for the event.
  * @param {string} params.rating A indicator of how useful the message was.
- * @param {string} [params.message=""] The message that triggered the event.
- * @param {object} [params.metadata={}] Additional key-value pairs to associate
+ * @param {string} [params.message] The message that triggered the event.
+ * @param {object} [params.metadata] Additional key-value pairs to associate
  * with the recorded event.
  */
 API.prototype.recordLlmFeedbackEvent = function recordLlmFeedbackEvent({
-  conversationId = '',
-  requestId = '',
-  messageId,
+  traceId,
   category,
   rating,
   message = '',
@@ -1596,6 +1564,13 @@ API.prototype.recordLlmFeedbackEvent = function recordLlmFeedbackEvent({
     .getOrCreateMetric(`${NAMES.SUPPORTABILITY.API}/recordLlmFeedbackEvent`)
     .incrementCallCount()
 
+  if (!traceId) {
+    logger.warn(
+      'A feedback event will not be recorded.  recordLlmFeedbackEvent must be called with a traceId.'
+    )
+    return
+  }
+
   if (this.agent.config?.ai_monitoring?.enabled !== true) {
     logger.warn('recordLlmFeedbackEvent invoked but ai_monitoring is disabled.')
     return
@@ -1604,15 +1579,13 @@ API.prototype.recordLlmFeedbackEvent = function recordLlmFeedbackEvent({
   const tx = this.agent.tracer.getTransaction()
   if (!tx) {
     logger.warn(
-      'No message feedback events will be recorded. recordLlmFeedbackEvent must be called within the scope of a transaction.'
+      'A feedback events will not be recorded. recordLlmFeedbackEvent must be called within the scope of a transaction.'
     )
     return
   }
 
   const feedback = new LlmFeedbackMessage({
-    conversationId,
-    requestId,
-    messageId,
+    traceId,
     category,
     rating,
     message
@@ -1625,12 +1598,12 @@ API.prototype.recordLlmFeedbackEvent = function recordLlmFeedbackEvent({
  *
  * @param {object} [options]
  *  Object with shut down options.
- * @param {boolean} [options.collectPendingData=false]
+ * @param {boolean} [options.collectPendingData]
  *  If true, the agent will send any pending data to the collector before
  *  shutting down.
- * @param {number} [options.timeout=0]
+ * @param {number} [options.timeout]
  *  Time in milliseconds to wait before shutting down.
- * @param {boolean} [options.waitForIdle=false]
+ * @param {boolean} [options.waitForIdle]
  *  If true, the agent will not shut down until there are no active transactions.
  * @param {Function} [cb]
  *  Callback function that runs when agent stops.
@@ -1675,12 +1648,12 @@ function _logErrorCallback(error, phase) {
  * @private
  * @param {object} api instantiation of this file
  * @param {object} options shutdown options object
- * @param {boolean} [options.collectPendingData=false]
+ * @param {boolean} [options.collectPendingData]
  *  If true, the agent will send any pending data to the collector before
  *  shutting down.
- * @param {number} [options.timeout=0]
+ * @param {number} [options.timeout]
  *  Time in milliseconds to wait before shutting down.
- * @param {boolean} [options.waitForIdle=false]
+ * @param {boolean} [options.waitForIdle]
  *  If true, the agent will not shut down until there are no active transactions.
  * @param {Function} callback callback function to execute after shutdown process is complete (successful or not)
  */

package/lib/config/default.js

@@ -1358,6 +1358,16 @@ defaultConfig.definition = () => ({
     enabled: {
       formatter: boolean,
       default: false
+    },
+    /**
+     * Toggles the capturing of Llm events when using streaming
+     * based methods in AIM supported libraries(i.e.- openai, AWS bedrock, langchain)
+     */
+    streaming: {
+      enabled: {
+        formatter: boolean,
+        default: true
+      }
     }
   }
 })

package/lib/instrumentation/@elastic/elasticsearch.js

@@ -4,6 +4,8 @@
  */
 
 'use strict'
+
+const { QuerySpec } = require('../../shim/specs')
 const semver = require('semver')
 const logger = require('../../logger').child({ component: 'ElasticSearch' })
 const { isNotEmpty } = require('../../util/objects')
@@ -33,14 +35,14 @@ module.exports = function initialize(_agent, elastic, _moduleName, shim) {
 
   shim.recordQuery(elastic.Transport.prototype, 'request', function wrapQuery(shim, _, __, args) {
     const ctx = this
-    return {
+    return new QuerySpec({
       query: JSON.stringify(args?.[0]),
       promise: true,
       opaque: true,
       inContext: function inContext() {
         getConnection.call(ctx, shim)
       }
-    }
+    })
   })
 }
 

package/lib/instrumentation/@hapi/hapi.js

@@ -5,6 +5,7 @@
 
 'use strict'
 
+const { MiddlewareSpec, SegmentSpec } = require('../../shim/specs')
 const record = require('../../metrics/recorders/generic')
 // This object defines all the events that we want to wrap extensions
 // for, as they are the only ones associated with requests.
@@ -208,23 +209,29 @@ function wrapPreHandlers(shim, container, path) {
 
 function wrapPreHandler(shim, container, path) {
   return shim.record(container, (shim) => {
-    return { name: [shim.HAPI, ' pre handler: ', '(', path, ')'].join(''), recorder: record }
+    return new SegmentSpec({
+      name: [shim.HAPI, ' pre handler: ', '(', path, ')'].join(''),
+      recorder: record
+    })
   })
 }
 
 function wrapRouteHandler(shim, handler, path) {
-  return shim.recordMiddleware(handler, {
-    route: path,
-    req: function getReq(shim, fn, fnName, args) {
-      const [request] = args
-      return request?.raw?.req
-    },
-    promise: true,
-    params: function getParams(shim, fn, fnName, args) {
-      const [req] = args
-      return req?.params
-    }
-  })
+  return shim.recordMiddleware(
+    handler,
+    new MiddlewareSpec({
+      route: path,
+      req: function getReq(shim, fn, fnName, args) {
+        const [request] = args
+        return request?.raw?.req
+      },
+      promise: true,
+      params: function getParams(shim, fn, fnName, args) {
+        const [req] = args
+        return req?.params
+      }
+    })
+  )
 }
 
 function wrapMiddleware(shim, middleware, event) {
@@ -232,13 +239,16 @@ function wrapMiddleware(shim, middleware, event) {
     return middleware
   }
 
-  return shim.recordMiddleware(middleware, {
-    route: event,
-    type: event === 'onPreResponse' ? shim.ERRORWARE : shim.MIDDLEWARE,
-    promise: true,
-    req: function getReq(_shim, _fn, _fnName, args) {
-      const [req] = args
-      return req?.raw?.req
-    }
-  })
+  return shim.recordMiddleware(
+    middleware,
+    new MiddlewareSpec({
+      route: event,
+      type: event === 'onPreResponse' ? shim.ERRORWARE : shim.MIDDLEWARE,
+      promise: true,
+      req: function getReq(_shim, _fn, _fnName, args) {
+        const [req] = args
+        return req?.raw?.req
+      }
+    })
+  )
 }

package/lib/instrumentation/@hapi/vision.js

@@ -6,6 +6,7 @@
 'use strict'
 
 const semver = require('semver')
+const { RenderSpec } = require('../../shim/specs')
 
 module.exports = function initialize(agent, vision, moduleName, shim) {
   const plugin = vision.plugin
@@ -36,7 +37,7 @@ function wrapDecorate(shim, decorate) {
     }
 
     const args = shim.argsToArray.apply(shim, arguments)
-    args[2] = shim.recordRender(handler, { promise: true })
+    args[2] = shim.recordRender(handler, new RenderSpec({ promise: true }))
 
     return decorate.apply(this, args)
   }

package/lib/instrumentation/@node-redis/client.js

@@ -4,6 +4,11 @@
  */
 
 'use strict'
+
+const {
+  OperationSpec,
+  params: { DatastoreParameters }
+} = require('../../shim/specs')
 const CLIENT_COMMANDS = ['select', 'quit', 'SELECT', 'QUIT']
 const opts = Symbol('clientOptions')
 
@@ -49,11 +54,11 @@ function instrumentClientCommand(shim, client, cmd) {
       }
     }
 
-    return {
+    return new OperationSpec({
       name: (cmd && cmd.toLowerCase()) || 'other',
       parameters,
       promise: true
-    }
+    })
   })
 }
 
@@ -64,11 +69,11 @@ function instrumentClientCommand(shim, client, cmd) {
  * @returns {object} params
  */
 function getRedisParams(clientOpts) {
-  return {
+  return new DatastoreParameters({
     host: clientOpts?.socket?.host || 'localhost',
     port_path_or_id: clientOpts?.socket?.path || clientOpts?.socket?.port || '6379',
     database_name: clientOpts?.database || 0
-  }
+  })
 }
 
 module.exports.getRedisParams = getRedisParams

package/lib/instrumentation/@prisma/client.js

@@ -5,6 +5,7 @@
 
 'use strict'
 
+const { QuerySpec } = require('../../shim/specs')
 const { prismaConnection, prismaModelCall } = require('../../symbols')
 const { URL } = require('url')
 const logger = require('../../logger').child({ component: 'prisma' })
@@ -172,7 +173,7 @@ module.exports = async function initialize(_agent, prisma, _moduleName, shim) {
     function wrapExecuteRequest(shim, _executeRequest, _fnName, args) {
       const client = this
 
-      return {
+      return new QuerySpec({
         promise: true,
         query: retrieveQuery(args, pkgVersion),
         /**
@@ -201,7 +202,7 @@ module.exports = async function initialize(_agent, prisma, _moduleName, shim) {
             )
           }
         }
-      }
+      })
     }
   )
 }