Instrument MULTI instead

Author: amychisholm03

lib/subscribers/redis/config.js

@@ -33,46 +33,31 @@ const sendCommand = {
   ]
 }
 
-const executeMulti = {
-  path: './redis/execute-multi',
-  instrumentations: [
-    {
-      channelName: 'nr_executeMulti',
-      module: { name: '@redis/client', versionRange: '>=4', filePath: 'dist/lib/client/index.js' },
-      functionQuery: {
-        className: 'RedisClient',
-        methodName: '_executeMulti',
-        kind: 'Async'
-      }
-    },
-  ]
-}
-
-const executePipeline = {
-  path: './redis/execute-multi',
+const clientSelect = {
+  path: './redis/select',
   instrumentations: [
     {
-      channelName: 'nr_executePipeline',
+      channelName: 'nr_select',
       module: { name: '@redis/client', versionRange: '>=4', filePath: 'dist/lib/client/index.js' },
       functionQuery: {
         className: 'RedisClient',
-        methodName: '_executePipeline',
+        methodName: 'SELECT',
         kind: 'Async'
       }
-    },
+    }
   ]
 }
 
-const clientSelect = {
-  path: './redis/select',
+const clientMulti = {
+  path: './redis/multi',
   instrumentations: [
     {
-      channelName: 'nr_select',
+      channelName: 'nr_multi',
       module: { name: '@redis/client', versionRange: '>=4', filePath: 'dist/lib/client/index.js' },
       functionQuery: {
         className: 'RedisClient',
-        methodName: 'SELECT',
-        kind: 'Async'
+        methodName: 'MULTI',
+        kind: 'Sync'
       }
     }
   ]
@@ -83,7 +68,6 @@ module.exports = {
     addCommand,
     sendCommand,
     clientSelect,
-    executeMulti,
-    executePipeline
+    clientMulti
   ]
 }

lib/subscribers/redis/execute-multi.js

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2026 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+const ClientPropagationSubscriber = require('./client-propagation')
+const { redisClientOpts } = require('../../symbols')
+
+/**
+ * Propagates the context in `RedisClient.MULTI` and
+ * `RedisClient[redisClientOpts]` into `RedisCommandQueue.addCommand`.
+ */
+module.exports = class ClientMultiSubscriber extends ClientPropagationSubscriber {
+  constructor({ agent, logger }) {
+    super({ agent, logger, channelName: 'nr_multi' })
+    this.events = ['start']
+  }
+
+  start(data) {
+    const { self: client } = data
+    if (!client[redisClientOpts]) {
+      client[redisClientOpts] = this.getRedisParams(client.options)
+    }
+  }
+}