split into redis and @redis/client

Author: amychisholm03

lib/subscriber-configs.js

@@ -25,6 +25,7 @@ const subscribers = {
   ...require('./subscribers/openai/config'),
   ...require('./subscribers/pino/config'),
   ...require('./subscribers/pg/config'),
+  ...require('./subscribers/redis-client/config'),
   ...require('./subscribers/redis/config'),
   ...require('./subscribers/undici/config')
 }

lib/subscribers/redis/add-command.js …/subscribers/redis-client/add-command.jslib/subscribers/redis/add-command.js renamed to lib/subscribers/redis-client/add-command.js lib/subscribers/redis/add-command.js renamed to lib/subscribers/redis-client/add-command.js

@@ -0,0 +1,87 @@
+/*
+ * Copyright 2026 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+const addCommand = {
+  path: './redis-client/add-command',
+  instrumentations: [{
+    channelName: 'nr_addCommand',
+    module: { name: '@redis/client', versionRange: '>=1', filePath: 'dist/lib/client/commands-queue.js' },
+    functionQuery: {
+      className: 'RedisCommandsQueue',
+      methodName: 'addCommand',
+      kind: 'Async'
+    }
+  }]
+}
+
+const sendCommand = {
+  path: './redis-client/send-command',
+  instrumentations: [
+    {
+      channelName: 'nr_sendCommand',
+      module: { name: '@redis/client', versionRange: '>=4', filePath: 'dist/lib/client/index.js' },
+      functionQuery: {
+        className: 'RedisClient',
+        methodName: 'sendCommand',
+        kind: 'Async'
+      }
+    }
+  ]
+}
+
+const commandsExecutor = {
+  path: './redis-client/commands-executor',
+  instrumentations: [
+    {
+      channelName: 'nr_commandsExecutor',
+      module: { name: '@redis/client', versionRange: '>=1 <4', filePath: 'dist/lib/client/index.js' },
+      functionQuery: {
+        className: 'RedisClient',
+        methodName: 'commandsExecutor',
+        kind: 'Async'
+      }
+    }
+  ]
+}
+
+const clientSelect = {
+  path: './redis-client/select',
+  instrumentations: [
+    {
+      channelName: 'nr_select',
+      module: { name: '@redis/client', versionRange: '>=1', filePath: 'dist/lib/client/index.js' },
+      functionQuery: {
+        className: 'RedisClient',
+        methodName: 'SELECT',
+        kind: 'Async'
+      }
+    }
+  ]
+}
+
+const clientMulti = {
+  path: './redis-client/multi',
+  instrumentations: [
+    {
+      channelName: 'nr_multi',
+      module: { name: '@redis/client', versionRange: '>=1', filePath: 'dist/lib/client/index.js' },
+      functionQuery: {
+        className: 'RedisClient',
+        methodName: 'MULTI',
+        kind: 'Sync'
+      }
+    }
+  ]
+}
+
+module.exports = {
+  '@redis/client': [
+    addCommand,
+    sendCommand, // redis v5, @redis/client v4
+    clientSelect,
+    clientMulti,
+    commandsExecutor // redis v4, @redis/client v1
+  ]
+}

…/subscribers/redis/client-propagation.js …ibers/redis-client/client-propagation.jslib/subscribers/redis/client-propagation.js renamed to lib/subscribers/redis-client/client-propagation.js lib/subscribers/redis/client-propagation.js renamed to lib/subscribers/redis-client/client-propagation.js

@@ -3,85 +3,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-const addCommand = {
-  path: './redis/add-command',
-  instrumentations: [{
-    channelName: 'nr_addCommand',
-    module: { name: '@redis/client', versionRange: '>=1', filePath: 'dist/lib/client/commands-queue.js' },
-    functionQuery: {
-      className: 'RedisCommandsQueue',
-      methodName: 'addCommand',
-      kind: 'Async'
-    }
-  }]
-}
-
-const sendCommand = {
-  path: './redis/send-command',
-  instrumentations: [
-    {
-      channelName: 'nr_sendCommand',
-      module: { name: '@redis/client', versionRange: '>=4', filePath: 'dist/lib/client/index.js' },
-      functionQuery: {
-        className: 'RedisClient',
-        methodName: 'sendCommand',
-        kind: 'Async'
-      }
-    }
-  ]
-}
-
-const clientSelect = {
-  path: './redis/select',
+const internalSendCommand = {
+  path: './redis/internal-send-command',
   instrumentations: [
     {
-      channelName: 'nr_select',
-      module: { name: '@redis/client', versionRange: '>=1', filePath: 'dist/lib/client/index.js' },
+      channelName: 'nr_internalSendCommand',
+      module: { name: 'redis', versionRange: '>=2.6.0 <4', filePath: 'index.js' },
       functionQuery: {
-        className: 'RedisClient',
-        methodName: 'SELECT',
-        kind: 'Async'
-      }
-    }
-  ]
-}
-
-const clientMulti = {
-  path: './redis/multi',
-  instrumentations: [
-    {
-      channelName: 'nr_multi',
-      module: { name: '@redis/client', versionRange: '>=1', filePath: 'dist/lib/client/index.js' },
-      functionQuery: {
-        className: 'RedisClient',
-        methodName: 'MULTI',
+        // className: 'RedisClient',
+        methodName: 'internal_send_command',
         kind: 'Sync'
       }
     }
   ]
 }
 
-const commandsExecutor = {
-  path: './redis/commands-executor',
-  instrumentations: [
-    {
-      channelName: 'nr_commandsExecutor',
-      module: { name: '@redis/client', versionRange: '>=1 <4', filePath: 'dist/lib/client/index.js' },
-      functionQuery: {
-        className: 'RedisClient',
-        methodName: 'commandsExecutor',
-        kind: 'Async'
-      }
-    }
-  ]
-}
-
 module.exports = {
-  '@redis/client': [
-    addCommand,
-    sendCommand, // >=v5
-    clientSelect,
-    clientMulti,
-    commandsExecutor // v4
+  redis: [
+    internalSendCommand // redis v3
   ]
 }

…b/subscribers/redis/commands-executor.js …ribers/redis-client/commands-executor.jslib/subscribers/redis/commands-executor.js renamed to lib/subscribers/redis-client/commands-executor.js lib/subscribers/redis/commands-executor.js renamed to lib/subscribers/redis-client/commands-executor.js

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2026 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+const DbOperationSubscriber = require('../db-operation')
+const { redisClientOpts } = require('../../symbols')
+
+module.exports = class ClientInternalSendCommandSubscriber extends DbOperationSubscriber {
+  constructor({ agent, logger }) {
+    super({ agent, logger, channelName: 'nr_internalSendCommand', packageName: 'redis' })
+    this.events = ['start']
+  }
+
+  start(data) {
+    const { self: client } = data
+    if (!client[redisClientOpts]) {
+      client[redisClientOpts] = this.getRedisParams(client.options)
+    }
+    return super.asyncStart(data)
+  }
+
+  /**
+   * Extracts the datastore parameters from the client options
+   *
+   * @param {object} clientOpts client.options
+   * @returns {object} { host, port_path_or_id, database_name }
+   */
+  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 = Object.assign({}, clientOpts.socket, { host: parsedURL.hostname })
+      if (parsedURL.port) {
+        clientOpts.socket.port = parsedURL.port
+      }
+
+      if (parsedURL.pathname) {
+        clientOpts.database = parsedURL.pathname.substring(1)
+      }
+    }
+
+    return {
+      host: clientOpts?.host || clientOpts?.socket?.host || 'localhost',
+      port_path_or_id:
+        clientOpts?.port || clientOpts?.socket?.path || clientOpts?.socket?.port || '6379',
+      database_name: clientOpts?.database || 0
+    }
+  }
+}