newrelic 11.23.0 → 11.23.2

package/NEWS.md

@@ -1,3 +1,45 @@
+### v11.23.2 (2024-07-22)
+
+#### Features
+
+* Added support for `fs.glob` in Node 22+ ([#2369](https://github.com/newrelic/node-newrelic/pull/2369)) ([1791a4e](https://github.com/newrelic/node-newrelic/commit/1791a4ef4a31e36757c47a9947ef8840fdd995c2))
+
+#### Bug fixes
+
+* Updated aws-sdk v3 instrumentation to load custom middleware last to properly get the external http span to add `aws.*` attributes ([#2382](https://github.com/newrelic/node-newrelic/pull/2382)) ([751801b](https://github.com/newrelic/node-newrelic/commit/751801be814343c9ddcee3dd7e83f87a1c6786d4))
+* Updated cassandra-driver instrumentation to properly trace promise based executions ([#2351](https://github.com/newrelic/node-newrelic/pull/2351)) ([bab9a8b](https://github.com/newrelic/node-newrelic/commit/bab9a8bab4ab6af8efa70d8559bdcc7ca6f5df32))
+
+#### Documentation
+
+* Removed examples/api/ ([#2381](https://github.com/newrelic/node-newrelic/pull/2381)) ([fb964de](https://github.com/newrelic/node-newrelic/commit/fb964de863f8989161f9a780f9eddc6e3ec91138))
+* Removed out of date `ROADMAP_Node.md` from root of project ([#2367](https://github.com/newrelic/node-newrelic/pull/2367)) ([4be870c](https://github.com/newrelic/node-newrelic/commit/4be870c758d9b931866ef3e6781d01bf176671a9))
+* Updated compatibility report ([#2345](https://github.com/newrelic/node-newrelic/pull/2345)) ([f08adc3](https://github.com/newrelic/node-newrelic/commit/f08adc3a30bdf3e5d23bd00efeb3b16ac06cd3e5))
+
+#### Miscellaneous chores
+
+* Always upload status logs in compatibility report CI ([#2341](https://github.com/newrelic/node-newrelic/pull/2341)) ([b3f1ee3](https://github.com/newrelic/node-newrelic/commit/b3f1ee3fe40c38c7484661dfb2e599df4f31003e))
+
+#### Tests
+
+* Removed `server.start` in grpc tests as it is deprecated and no longer needed ([#2372](https://github.com/newrelic/node-newrelic/pull/2372)) ([d212b15](https://github.com/newrelic/node-newrelic/commit/d212b15c929ebca22881f3d41a8d7f99033847a8))
+* Updated benchmark test results to output result files ([#2350](https://github.com/newrelic/node-newrelic/pull/2350)) ([1b51a68](https://github.com/newrelic/node-newrelic/commit/1b51a68200dae14b865a6db06d62655a25a62c2d))
+
+#### Continuous integration
+
+* Added benchmark test GitHub Action ([#2366](https://github.com/newrelic/node-newrelic/pull/2366)) ([afd3ab4](https://github.com/newrelic/node-newrelic/commit/afd3ab48611ec8409be1472ebbc63db24cff8e73))
+* Increased the limit of installs from 2 to a bigger number for versioned tests ([#2346](https://github.com/newrelic/node-newrelic/pull/2346)) ([f85a385](https://github.com/newrelic/node-newrelic/commit/f85a38524f1d41e82b2c5085c41d79d1263b63c3))
+* Updated `bin/create-docs-pr` to create an empty array if changelog.json is missing security ([#2348](https://github.com/newrelic/node-newrelic/pull/2348)) ([7d5368c](https://github.com/newrelic/node-newrelic/commit/7d5368ce873affbf2593bd6b1cc32259da852e1d))
+
+### 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

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/common.js

@@ -95,6 +95,7 @@ module.exports.middlewareConfig = [
     config: {
       name: 'NewRelicDeserialize',
       step: 'deserialize',
+      priority: 'low',
       override: true
     }
   }

package/lib/instrumentation/cassandra-driver.js

@@ -29,7 +29,7 @@ module.exports = function initialize(_agent, cassandra, _moduleName, shim) {
     ClientProto,
     ['connect', 'shutdown'],
     function operationSpec(shim, _fn, name) {
-      return new OperationSpec({ callback: shim.LAST, name })
+      return new OperationSpec({ callback: shim.LAST, name, promise: true })
     }
   )
 
@@ -39,7 +39,8 @@ module.exports = function initialize(_agent, cassandra, _moduleName, shim) {
       '_execute',
       new QuerySpec({
         query: shim.FIRST,
-        callback: shim.LAST
+        callback: shim.LAST,
+        promise: true
       })
     )
 
@@ -64,7 +65,8 @@ module.exports = function initialize(_agent, cassandra, _moduleName, shim) {
       '_innerExecute',
       new QuerySpec({
         query: shim.FIRST,
-        callback: shim.LAST
+        callback: shim.LAST,
+        promise: true
       })
     )
 
@@ -109,7 +111,8 @@ module.exports = function initialize(_agent, cassandra, _moduleName, shim) {
     'batch',
     new QuerySpec({
       query: findBatchQueryArg,
-      callback: shim.LAST
+      callback: shim.LAST,
+      promise: true
     })
   )
 }

package/lib/instrumentation/core/fs.js

@@ -45,6 +45,11 @@ function initialize(agent, fs, moduleName, shim) {
     'ftruncate'
   ]
 
+  if (Object.hasOwnProperty.call(fs, 'glob') === true) {
+    // The `glob` method was added in Node 22.
+    methods.push('glob')
+  }
+
   const nonRecordedMethods = ['write', 'read']
 
   shim.record(fs, methods, recordFs)

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.23.0",
+  "version": "11.23.2",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [