newrelic 11.22.0 → 11.23.1

package/NEWS.md

@@ -1,5 +1,42 @@
+### v11.23.1 (2024-07-11)
+
+#### Bug fixes
+
+* Updated redis v4 instrumentation to work with transactions(multi/exec) ([#2343](https://github.com/newrelic/node-newrelic/pull/2343)) ([39eb842](https://github.com/newrelic/node-newrelic/commit/39eb8421b84f7fe298acf5c9c89de31ee0cc2604))
+
+#### Documentation
+
+* Updated compatibility report ([#2342](https://github.com/newrelic/node-newrelic/pull/2342)) ([5c9e3e6](https://github.com/newrelic/node-newrelic/commit/5c9e3e6bfa8a388c7dd071ecb0231b069f065645))
+
+### v11.23.0 (2024-07-10)
+
+#### Features
+
+* Added support for account level governance of AI Monitoring ([#2326](https://github.com/newrelic/node-newrelic/pull/2326)) ([7069335](https://github.com/newrelic/node-newrelic/commit/7069335bfee38b1774da00bdbb63138ebf38da90))
+
+#### Code refactoring
+
+* Removed redundant isExpected in the Exception class ([#2328](https://github.com/newrelic/node-newrelic/pull/2328)) ([38f9825](https://github.com/newrelic/node-newrelic/commit/38f982564c0e0b93f17146be8beed005f9405ead))
+* Reduced duplication in the error-collector ([#2323](https://github.com/newrelic/node-newrelic/pull/2323)) ([10581bf](https://github.com/newrelic/node-newrelic/commit/10581bf8cdad5c61c25dc1309ad97ca36d58cf79))
+* Refactored benchmark tests to complete async functions ([#2334](https://github.com/newrelic/node-newrelic/pull/2334)) ([57a4dfb](https://github.com/newrelic/node-newrelic/commit/57a4dfb77c0408cbd81291c71db770005a0f2b5a))
+
+#### Documentation
+
+* Included commands and links for Mac setup ([#2327](https://github.com/newrelic/node-newrelic/pull/2327)) ([6eddb72](https://github.com/newrelic/node-newrelic/commit/6eddb721b676b246e5ace28bea75c6cd723d5ddb))
+* Updated compatibility report ([#2318](https://github.com/newrelic/node-newrelic/pull/2318)) ([3a910ef](https://github.com/newrelic/node-newrelic/commit/3a910ef29c76cfd05903f01fb84d6775f8669578))
+
+#### Miscellaneous chores
+
+* Fixed copy paste error in post release workflow ([#2329](https://github.com/newrelic/node-newrelic/pull/2329)) ([6f2da7a](https://github.com/newrelic/node-newrelic/commit/6f2da7a2a07ce699f8d6ef859b4a90f0bd68df15))
+* Implemented split jobs for post release docs publishing ([#2319](https://github.com/newrelic/node-newrelic/pull/2319)) ([c14ec3b](https://github.com/newrelic/node-newrelic/commit/c14ec3b7020f43f6515609346f3b2f9586e63430))
+
+#### Tests
+
+* Fixed recordMiddlewawre benchmark test ([#2338](https://github.com/newrelic/node-newrelic/pull/2338)) ([fb55ac7](https://github.com/newrelic/node-newrelic/commit/fb55ac7e19a26c76d19ead169664e40e0df4b822))
+
 ### v11.22.0 (2024-06-28)
 
+
 #### Features
 
 * Added support for Node 22([#2305](https://github.com/newrelic/node-newrelic/pull/2305)) ([0bf8908](https://github.com/newrelic/node-newrelic/commit/0bf89081a59fe598b22613257f519c171149c454))

package/lib/config/index.js

@@ -306,6 +306,12 @@ Config.prototype._fromServer = function _fromServer(params, key) {
     case 'high_security':
       break
 
+    // interpret AI Monitoring account setting
+    case 'collect_ai':
+      this._disableOption(params.collect_ai, 'ai_monitoring')
+      this.emit('change', this)
+      break
+
     // always accept these settings
     case 'cross_process_id':
     case 'encoding_key':
@@ -1071,10 +1077,10 @@ function setFromEnv({ config, key, envVar, formatter, paths }) {
 /**
  * Recursively visit the nodes of the config definition and look for environment variable names, overriding any configuration values that are found.
  *
- * @param {object} [config=this] The current level of the configuration object.
- * @param {object} [data=configDefinition] The current level of the config definition object.
- * @param {Array} [paths=[]] keeps track of the nested path to properly derive the env var
- * @param {number} [objectKeys=1] indicator of how many keys exist in current node to know when to remove current node after all keys are processed
+ * @param {object} [config] The current level of the configuration object.
+ * @param {object} [data] The current level of the config definition object.
+ * @param {Array} [paths] keeps track of the nested path to properly derive the env var
+ * @param {number} [objectKeys] indicator of how many keys exist in current node to know when to remove current node after all keys are processed
  */
 Config.prototype._fromEnvironment = function _fromEnvironment(
   config = this,

package/lib/errors/error-collector.js

@@ -89,75 +89,62 @@ class ErrorCollector {
   }
 
   /**
-   * Helper method for processing errors that are created with .noticeError()
+   * Gets the iterable property from the transaction based on the error type
    *
    * @param {Transaction} transaction the collected exception's transaction
-   * @param {number} collectedErrors the number of errors we've successfully .collect()-ed
-   * @param {number} expectedErrors the number of errors marked as expected in noticeError
-   * @returns {Array.<number>} the updated [collectedErrors, expectedErrors] numbers post-processing
+   * @param {string} errorType the type of error: "user", "transactionException", "transaction"
+   * @returns {object[]} the iterable property from the transaction based on the error type
    */
-  _processUserErrors(transaction, collectedErrors, expectedErrors) {
-    if (transaction.userErrors.length) {
-      for (let i = 0; i < transaction.userErrors.length; i++) {
-        const exception = transaction.userErrors[i]
-        if (this.collect(transaction, exception)) {
-          ++collectedErrors
-          // if we could collect it, then check if expected
-          if (
-            urltils.isExpectedError(this.config, transaction.statusCode) ||
-            errorHelper.isExpectedException(transaction, exception, this.config, urltils)
-          ) {
-            ++expectedErrors
-          }
-        }
-      }
+  _getIterableProperty(transaction, errorType) {
+    let iterableProperty = null
+    if (errorType === 'user') {
+      iterableProperty = transaction.userErrors
     }
-
-    return [collectedErrors, expectedErrors]
+    if (errorType === 'transactionException') {
+      iterableProperty = transaction.exceptions
+    }
+    return iterableProperty
   }
 
   /**
-   * Helper method for processing exceptions on the transaction (transaction.exceptions array)
+   * Helper method for processing errors that are created with .noticeError(), exceptions
+   * on the transaction (transaction.exceptions array), and inferred errors based on Transaction metadata.
    *
-   * @param {Transaction} transaction the transaction being processed
-   * @param {number} collectedErrors the number of errors successfully .collect()-ed
-   * @param {number} expectedErrors the number of collected errors that were expected
-   * @returns {Array.<number>} the updated [collectedErrors, expectedErrors] numbers post-processing
+   * @param {Transaction} transaction the collected exception's transaction
+   * @param {number} collectedErrors the number of errors we've successfully .collect()-ed
+   * @param {number} expectedErrors the number of errors marked as expected in noticeError
+   * @param {string} errorType the type of error to be processed; "user", "transactionException", "transaction"
+   * @returns {Array.<number>} the updated [collectedErrors, expectedErrors] numbers post processing
    */
-  _processTransactionExceptions(transaction, collectedErrors, expectedErrors) {
-    for (let i = 0; i < transaction.exceptions.length; i++) {
-      const exception = transaction.exceptions[i]
-      if (this.collect(transaction, exception)) {
-        ++collectedErrors
-        // if we could collect it, then check if expected
-        if (
-          urltils.isExpectedError(this.config, transaction.statusCode) ||
-          errorHelper.isExpectedException(transaction, exception, this.config, urltils)
-        ) {
-          ++expectedErrors
+  _processErrors(transaction, collectedErrors, expectedErrors, errorType) {
+    const iterableProperty = this._getIterableProperty(transaction, errorType)
+    if (iterableProperty === null && errorType === 'transaction') {
+      if (this.collect(transaction)) {
+        collectedErrors++
+        if (urltils.isExpectedError(this.config, transaction.statusCode)) {
+          expectedErrors++
         }
       }
+      return [collectedErrors, expectedErrors]
     }
 
-    return [collectedErrors, expectedErrors]
-  }
+    if (iterableProperty === null) {
+      return [collectedErrors, expectedErrors]
+    }
 
-  /**
-   * Helper method for processing an inferred error based on Transaction metadata
-   *
-   * @param {Transaction} transaction the transaction being processed
-   * @param {number} collectedErrors the number of errors successfully .collect()-ed
-   * @param {number} expectedErrors the number of collected errors that were expected
-   * @returns {Array.<number>} the updated [collectedErrors, expectedErrors] numbers post-processing
-   */
-  _processTransactionErrors(transaction, collectedErrors, expectedErrors) {
-    if (this.collect(transaction)) {
-      ++collectedErrors
-      if (urltils.isExpectedError(this.config, transaction.statusCode)) {
-        ++expectedErrors
+    for (let i = 0; i < iterableProperty.length; i++) {
+      const exception = iterableProperty[i]
+      if (!this.collect(transaction, exception)) {
+        continue
+      }
+      collectedErrors++
+      if (
+        urltils.isExpectedError(this.config, transaction.statusCode) ||
+        errorHelper.isExpectedException(transaction, exception, this.config, urltils)
+      ) {
+        expectedErrors++
       }
     }
-
     return [collectedErrors, expectedErrors]
   }
 
@@ -183,10 +170,11 @@ class ErrorCollector {
 
     // errors from noticeError are currently exempt from
     // ignore and exclude rules
-    ;[collectedErrors, expectedErrors] = this._processUserErrors(
+    ;[collectedErrors, expectedErrors] = this._processErrors(
       transaction,
       collectedErrors,
-      expectedErrors
+      expectedErrors,
+      'user'
     )
 
     const isErroredTransaction = urltils.isError(this.config, transaction.statusCode)
@@ -194,16 +182,18 @@ class ErrorCollector {
 
     // collect other exceptions only if status code is not ignored
     if (transaction.exceptions.length && !isIgnoredErrorStatusCode) {
-      ;[collectedErrors, expectedErrors] = this._processTransactionExceptions(
+      ;[collectedErrors, expectedErrors] = this._processErrors(
         transaction,
         collectedErrors,
-        expectedErrors
+        expectedErrors,
+        'transactionException'
       )
     } else if (isErroredTransaction) {
-      ;[collectedErrors, expectedErrors] = this._processTransactionErrors(
+      ;[collectedErrors, expectedErrors] = this._processErrors(
         transaction,
         collectedErrors,
-        expectedErrors
+        expectedErrors,
+        'transaction'
       )
     }
 

package/lib/errors/index.js

@@ -31,19 +31,18 @@ class Exception {
 
   getErrorDetails(config) {
     const errorDetails = errorHelper.extractErrorInformation(null, this.error, config)
-    errorDetails.expected = this.isExpected(config, errorDetails)
-
-    return errorDetails
-  }
-
-  isExpected(config, { type, message }) {
     if (typeof this._expected === 'undefined') {
-      this._expected =
-        errorHelper.isExpectedErrorClass(config, type) ||
-        errorHelper.isExpectedErrorMessage(config, type, message)
+      this._expected = errorHelper.isExpected(
+        errorDetails.type,
+        errorDetails.message,
+        null,
+        config,
+        urltils
+      )
     }
+    errorDetails.expected = this._expected
 
-    return this._expected
+    return errorDetails
   }
 }
 

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

@@ -7,63 +7,78 @@
 
 const {
   OperationSpec,
-  params: { DatastoreParameters }
+  params: { DatastoreParameters },
+  ClassWrapSpec
 } = require('../../shim/specs')
-const CLIENT_COMMANDS = ['select', 'quit', 'SELECT', 'QUIT']
-const opts = Symbol('clientOptions')
+const { redisClientOpts } = require('../../symbols')
 
 module.exports = function initialize(_agent, redis, _moduleName, shim) {
   shim.setDatastore(shim.REDIS)
-  const COMMANDS = Object.keys(shim.require('dist/lib/client/commands.js').default)
-  const CMDS_TO_INSTRUMENT = [...COMMANDS, ...CLIENT_COMMANDS]
-  shim.wrap(redis, 'createClient', function wrapCreateClient(shim, original) {
-    return function wrappedCreateClient() {
-      const client = original.apply(this, arguments)
-      client[opts] = getRedisParams(client.options)
-      CMDS_TO_INSTRUMENT.forEach(instrumentClientCommand.bind(null, shim, client))
-      if (client.options.legacyMode) {
-        client.v4[opts] = getRedisParams(client.options)
-        CMDS_TO_INSTRUMENT.forEach(instrumentClientCommand.bind(null, shim, client.v4))
+  const commandsQueue = shim.require('dist/lib/client/commands-queue.js')
+
+  shim.wrapClass(
+    commandsQueue,
+    'default',
+    new ClassWrapSpec({
+      post: function postConstructor(shim) {
+        instrumentAddCommand({ shim, commandsQueue: this })
       }
+    })
+  )
+
+  shim.wrap(redis, 'createClient', function wrapCreateClient(_shim, createClient) {
+    return function wrappedCreateClient(options) {
+      // saving connection opts to shim
+      // since the RedisCommandsQueue gets constructed at createClient
+      // we can delete the symbol afterwards to ensure the appropriate
+      // connection options are for the given RedisCommandsQueue
+      shim[redisClientOpts] = getRedisParams(options)
+      const client = createClient.apply(this, arguments)
+      delete shim[redisClientOpts]
       return client
     }
   })
 }
 
 /**
- * Instruments a given command on the client by calling `shim.recordOperation`
+ * Instruments a given command when added to the command queue by calling `shim.recordOperation`
  *
- * @param {Shim} shim shim instance
- * @param {object} client redis client instance
- * @param {string} cmd command to instrument
+ * @param {object} params
+ * @param {Shim} params.shim shim instance
+ * @param {object} params.commandsQueue instance
  */
-function instrumentClientCommand(shim, client, cmd) {
+function instrumentAddCommand({ shim, commandsQueue }) {
   const { agent } = shim
+  const clientOpts = shim[redisClientOpts]
 
-  shim.recordOperation(client, cmd, function wrapCommand(_shim, _fn, _fnName, args) {
-    const [key, value] = args
-    const parameters = Object.assign({}, client[opts])
-    // If selecting a database, subsequent commands
-    // will be using said database, update the clientOptions
-    // but not the current parameters(feature parity with v3)
-    if (cmd.toLowerCase() === 'select') {
-      client[opts].database_name = key
-    }
-    if (agent.config.attributes.enabled) {
-      if (key) {
-        parameters.key = JSON.stringify(key)
+  shim.recordOperation(
+    commandsQueue,
+    'addCommand',
+    function wrapAddCommand(_shim, _fn, _fnName, args) {
+      const [cmd, key, value] = args[0]
+      const parameters = Object.assign({}, clientOpts)
+      // If selecting a database, subsequent commands
+      // will be using said database, update the clientOpts
+      // but not the current parameters(feature parity with v3)
+      if (cmd.toLowerCase() === 'select') {
+        clientOpts.database_name = key
       }
-      if (value) {
-        parameters.value = JSON.stringify(value)
+      if (agent.config.attributes.enabled) {
+        if (key) {
+          parameters.key = JSON.stringify(key)
+        }
+        if (value) {
+          parameters.value = JSON.stringify(value)
+        }
       }
-    }
 
-    return new OperationSpec({
-      name: (cmd && cmd.toLowerCase()) || 'other',
-      parameters,
-      promise: true
-    })
-  })
+      return new OperationSpec({
+        name: (cmd && cmd.toLowerCase()) || 'other',
+        parameters,
+        promise: true
+      })
+    }
+  )
 }
 
 /**
@@ -73,6 +88,21 @@ function instrumentClientCommand(shim, client, cmd) {
  * @returns {object} params
  */
 function getRedisParams(clientOpts) {
+  // need to replicate logic done in RedisClient
+  // to parse the url to assign to socket.host/port
+  // see: https://github.com/redis/node-redis/blob/5576a0db492cda2cd88e09881bc330aa956dd0f5/packages/client/lib/client/index.ts#L160
+  if (clientOpts?.url) {
+    const parsedURL = new URL(clientOpts.url)
+    clientOpts.socket = { host: parsedURL.hostname }
+    if (parsedURL.port) {
+      clientOpts.socket.port = parsedURL.port
+    }
+
+    if (parsedURL.pathname) {
+      clientOpts.database = parsedURL.pathname.substring(1)
+    }
+  }
+
   return new DatastoreParameters({
     host: clientOpts?.socket?.host || 'localhost',
     port_path_or_id: clientOpts?.socket?.path || clientOpts?.socket?.port || '6379',

package/lib/instrumentation/aws-sdk/v3/bedrock.js

@@ -85,8 +85,21 @@ function addLlmMeta({ agent, segment }) {
  * @param {BedrockCommand} params.bedrockCommand parsed input
  * @param {Error|null} params.err error from request if exists
  * @param params.bedrockResponse
+ * @param params.shim
  */
-function recordChatCompletionMessages({ agent, segment, bedrockCommand, bedrockResponse, err }) {
+function recordChatCompletionMessages({
+  agent,
+  shim,
+  segment,
+  bedrockCommand,
+  bedrockResponse,
+  err
+}) {
+  if (shouldSkipInstrumentation(agent.config) === true) {
+    shim.logger.debug('skipping sending of ai data')
+    return
+  }
+
   const summary = new LlmChatCompletionSummary({
     agent,
     bedrockResponse,
@@ -133,12 +146,18 @@ function recordChatCompletionMessages({ agent, segment, bedrockCommand, bedrockR
  *
  * @param {object} params function params
  * @param {object} params.agent instance of agent
+ * @param {object} params.shim current shim instance
  * @param {object} params.segment active segment
  * @param {BedrockCommand} params.bedrockCommand parsed input
  * @param {Error|null} params.err error from request if exists
  * @param params.bedrockResponse
  */
-function recordEmbeddingMessage({ agent, segment, bedrockCommand, bedrockResponse, err }) {
+function recordEmbeddingMessage({ agent, shim, segment, bedrockCommand, bedrockResponse, err }) {
+  if (shouldSkipInstrumentation(agent.config) === true) {
+    shim.logger.debug('skipping sending of ai data')
+    return
+  }
+
   const embedding = new LlmEmbedding({
     agent,
     segment,
@@ -239,6 +258,7 @@ function handleResponse({ shim, err, response, segment, bedrockCommand, modelTyp
   if (modelType === 'completion') {
     recordChatCompletionMessages({
       agent,
+      shim,
       segment,
       bedrockCommand,
       bedrockResponse,
@@ -247,6 +267,7 @@ function handleResponse({ shim, err, response, segment, bedrockCommand, modelTyp
   } else if (modelType === 'embedding') {
     recordEmbeddingMessage({
       agent,
+      shim,
       segment,
       bedrockCommand,
       bedrockResponse,

package/lib/instrumentation/langchain/runnable.js

@@ -16,13 +16,14 @@ const LlmErrorMessage = require('../../llm-events/error-message')
 const { DESTINATIONS } = require('../../config/attribute-filter')
 const { langchainRunId } = require('../../symbols')
 const { RecorderSpec } = require('../../shim/specs')
+const { shouldSkipInstrumentation } = require('./common')
 
 module.exports = function initialize(shim, langchain) {
   const { agent, pkgVersion } = shim
 
   if (common.shouldSkipInstrumentation(agent.config)) {
     shim.logger.debug(
-      'langchain instrumentation is disabled.  To enable set `config.ai_monitoring.enabled` to true'
+      'langchain instrumentation is disabled. To enable set `config.ai_monitoring.enabled` to true'
     )
     return
   }
@@ -186,6 +187,15 @@ function wrapNextHandler({ shim, output, segment, request, metadata, tags }) {
 function recordChatCompletionEvents({ segment, messages, events, metadata, tags, err, shim }) {
   const { pkgVersion, agent } = shim
   segment.end()
+
+  if (shouldSkipInstrumentation(shim.agent.config) === true) {
+    // We need this check inside the wrapper because it is possible for monitoring
+    // to be disabled at the account level. In such a case, the value is set
+    // after the instrumentation has been initialized.
+    shim.logger.debug('skipping sending of ai data')
+    return
+  }
+
   const completionSummary = new LangChainCompletionSummary({
     agent,
     messages,
@@ -198,6 +208,7 @@ function recordChatCompletionEvents({ segment, messages, events, metadata, tags,
 
   common.recordEvent({
     agent,
+    shim,
     type: 'LlmChatCompletionSummary',
     pkgVersion,
     msg: completionSummary
@@ -266,6 +277,7 @@ function recordCompletions({ events, completionSummary, agent, segment, shim })
 
     common.recordEvent({
       agent,
+      shim,
       type: 'LlmChatCompletionMessage',
       pkgVersion: shim.pkgVersion,
       msg: completionMsg

package/lib/instrumentation/langchain/tools.js

@@ -35,6 +35,15 @@ module.exports = function initialize(shim, tools) {
         const metadata = mergeMetadata(instanceMeta, paramsMeta)
         const tags = mergeTags(instanceTags, paramsTags)
         segment.end()
+
+        if (shouldSkipInstrumentation(shim.agent.config) === true) {
+          // We need this check inside the wrapper because it is possible for monitoring
+          // to be disabled at the account level. In such a case, the value is set
+          // after the instrumentation has been initialized.
+          shim.logger.debug('skipping sending of ai data')
+          return
+        }
+
         const toolEvent = new LangChainTool({
           agent,
           description,
@@ -47,7 +56,7 @@ module.exports = function initialize(shim, tools) {
           segment,
           error: err != null
         })
-        recordEvent({ agent, type: 'LlmTool', pkgVersion, msg: toolEvent })
+        recordEvent({ agent, shim, type: 'LlmTool', pkgVersion, msg: toolEvent })
 
         if (err) {
           agent.errors.add(

package/lib/instrumentation/langchain/vectorstore.js

@@ -23,11 +23,12 @@ const LlmErrorMessage = require('../../llm-events/error-message')
  * @param {number} params.k vector search top k
  * @param {object} params.output vector search documents
  * @param {Agent} params.agent NR agent instance
+ * @param {Shim} params.shim current shim instance
  * @param {TraceSegment} params.segment active segment from vector search
  * @param {string} params.pkgVersion langchain version
- * @param {err} params.err if it exists
+ * @param {Error} params.err if it exists
  */
-function recordVectorSearch({ request, k, output, agent, segment, pkgVersion, err }) {
+function recordVectorSearch({ request, k, output, agent, shim, segment, pkgVersion, err }) {
   const vectorSearch = new LangChainVectorSearch({
     agent,
     segment,
@@ -37,7 +38,7 @@ function recordVectorSearch({ request, k, output, agent, segment, pkgVersion, er
     error: err !== null
   })
 
-  recordEvent({ agent, type: 'LlmVectorSearch', pkgVersion, msg: vectorSearch })
+  recordEvent({ agent, shim, type: 'LlmVectorSearch', pkgVersion, msg: vectorSearch })
 
   output.forEach((document, sequence) => {
     const vectorSearchResult = new LangChainVectorSearchResult({
@@ -51,6 +52,7 @@ function recordVectorSearch({ request, k, output, agent, segment, pkgVersion, er
 
     recordEvent({
       agent,
+      shim,
       type: 'LlmVectorSearchResult',
       pkgVersion,
       msg: vectorSearchResult
@@ -97,7 +99,15 @@ module.exports = function initialize(shim, vectorstores) {
           }
 
           segment.end()
-          recordVectorSearch({ request, k, output, agent, segment, pkgVersion, err })
+          if (shouldSkipInstrumentation(shim.agent.config) === true) {
+            // We need this check inside the wrapper because it is possible for monitoring
+            // to be disabled at the account level. In such a case, the value is set
+            // after the instrumentation has been initialized.
+            shim.logger.debug('skipping sending of ai data')
+            return
+          }
+
+          recordVectorSearch({ request, k, output, agent, shim, segment, pkgVersion, err })
 
           segment.transaction.trace.attributes.addAttribute(DESTINATIONS.TRANS_EVENT, 'llm', true)
         }

package/lib/instrumentation/openai.js

@@ -99,12 +99,18 @@ function addLlmMeta({ agent, segment }) {
  *
  * @param {object} params input params
  * @param {Agent} params.agent NR agent instance
+ * @param {Shim} params.shim the current shim instance
  * @param {TraceSegment} params.segment active segment from chat completion
  * @param {object} params.request chat completion params
  * @param {object} params.response chat completion response
  * @param {boolean} [params.err] err if it exists
  */
-function recordChatCompletionMessages({ agent, segment, request, response, err }) {
+function recordChatCompletionMessages({ agent, shim, segment, request, response, err }) {
+  if (shouldSkipInstrumentation(agent.config, shim) === true) {
+    shim.logger.debug('skipping sending of ai data')
+    return
+  }
+
   if (!response) {
     // If we get an error, it is possible that `response = null`.
     // In that case, we define it to be an empty object.
@@ -195,6 +201,7 @@ function instrumentStream({ agent, shim, request, response, segment }) {
 
         recordChatCompletionMessages({
           agent: shim.agent,
+          shim,
           segment,
           request,
           response: chunk,
@@ -205,6 +212,7 @@ function instrumentStream({ agent, shim, request, response, segment }) {
   })
 }
 
+/* eslint-disable sonarjs/cognitive-complexity */
 module.exports = function initialize(agent, openai, moduleName, shim) {
   if (shouldSkipInstrumentation(agent.config, shim)) {
     shim.logger.debug(
@@ -268,6 +276,7 @@ module.exports = function initialize(agent, openai, moduleName, shim) {
           } else {
             recordChatCompletionMessages({
               agent,
+              shim,
               segment,
               request,
               response,
@@ -301,10 +310,20 @@ module.exports = function initialize(agent, openai, moduleName, shim) {
             // In that case, we define it to be an empty object.
             response = {}
           }
+
+          segment.end()
+          if (shouldSkipInstrumentation(shim.agent.config, shim) === true) {
+            // We need this check inside the wrapper because it is possible for monitoring
+            // to be disabled at the account level. In such a case, the value is set
+            // after the instrumentation has been initialized.
+            shim.logger.debug('skipping sending of ai data')
+            return
+          }
+
           response.headers = segment[openAiHeaders]
           // explicitly end segment to get consistent duration
           // for both LLM events and the segment
-          segment.end()
+
           const embedding = new LlmEmbedding({
             agent,
             segment,

package/lib/symbols.js

@@ -27,6 +27,7 @@ module.exports = {
   langchainRunId: Symbol('runId'),
   prismaConnection: Symbol('prismaConnection'),
   prismaModelCall: Symbol('modelCall'),
+  redisClientOpts: Symbol('clientOptions'),
   segment: Symbol('segment'),
   shim: Symbol('shim'),
   storeDatabase: Symbol('storeDatabase'),

package/package.json

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