newrelic 13.1.0 → 13.2.0

package/lib/subscribers/elasticsearch/elasticsearch.js

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2025 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+const DbQuerySubscriber = require('../db-query')
+const stringify = require('json-stringify-safe')
+const { queryParser } = require('../../db/query-parsers/elasticsearch')
+
+class ElasticSearchSubscriber extends DbQuerySubscriber {
+  constructor({ agent, logger, packageName = '@elastic/elasticsearch', channelName = 'nr_request', system = 'ElasticSearch' } = {}) {
+    super({ agent, logger, packageName, channelName, system })
+    this.events = ['asyncEnd']
+    this.opaque = true
+  }
+
+  handler(data, ctx) {
+    const { self, arguments: args } = data
+    this.queryString = stringify(args?.[0])
+    this.setParameters(self)
+    return super.handler(data, ctx)
+  }
+
+  setParameters(self) {
+    this.parameters = {}
+    this.parameters.product = this.system
+    const connectionPool = self?.connectionPool?.connections?.[0]
+    if (connectionPool) {
+      const host = connectionPool?.url?.host?.split(':')
+      const port = connectionPool?.url?.port || host?.[1]
+      this.parameters.host = host?.[0]
+      this.parameters.port_path_or_id = port
+    }
+  }
+
+  parseQuery(queryString) {
+    return queryParser(queryString)
+  }
+}
+
+module.exports = ElasticSearchSubscriber

package/lib/subscribers/elasticsearch/opensearch.js

@@ -0,0 +1,15 @@
+/*
+ * Copyright 2025 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+const ElasticSearchSubscriber = require('./elasticsearch.js')
+class OpenSearchSubscriber extends ElasticSearchSubscriber {
+  constructor({ agent, logger }) {
+    super({ agent, logger, packageName: '@opensearch-project/opensearch', channelName: 'nr_request', system: 'OpenSearch' })
+  }
+}
+
+module.exports = OpenSearchSubscriber

package/lib/subscribers/elasticsearch/transport.js

@@ -0,0 +1,14 @@
+/*
+ * Copyright 2025 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+const ElasticSearchSubscriber = require('./elasticsearch')
+
+class ElasticSearchTransportSubscriber extends ElasticSearchSubscriber {
+  constructor({ agent, logger }) {
+    super({ agent, logger, packageName: '@elastic/transport' })
+  }
+}
+
+module.exports = ElasticSearchTransportSubscriber

package/lib/subscribers/ioredis/config.js

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2025 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+module.exports = {
+  ioredis: [{
+    path: './ioredis',
+    instrumentations: [
+      {
+        channelName: 'nr_sendCommand',
+        module: { name: 'ioredis', versionRange: '>=4', filePath: 'built/Redis.js' },
+        functionQuery: {
+          className: 'Redis',
+          methodName: 'sendCommand',
+          kind: 'Async'
+        }
+      },
+      {
+        channelName: 'nr_sendCommand',
+        module: { name: 'ioredis', versionRange: '>=4', filePath: 'built/redis.js' },
+        functionQuery: {
+          expressionName: 'sendCommand',
+          kind: 'Async'
+        }
+      },
+      {
+        channelName: 'nr_sendCommand',
+        module: { name: 'ioredis', versionRange: '>=4', filePath: 'built/redis/index.js' },
+        functionQuery: {
+          expressionName: 'sendCommand',
+          kind: 'Async'
+        }
+      }
+    ]
+  }]
+}

package/lib/subscribers/ioredis/index.js

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2025 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+const DbOperationSubscriber = require('../db-operation')
+const stringify = require('json-stringify-safe')
+
+class IoRedisSubscriber extends DbOperationSubscriber {
+  constructor({ agent, logger }) {
+    super({ agent, logger, packageName: 'ioredis', channelName: 'nr_sendCommand', system: 'Redis' })
+    this.events = ['asyncEnd']
+  }
+
+  handler(data, ctx) {
+    const { self, arguments: args } = data
+    const [command] = args
+    this.operation = command.name
+    this.setParameters(self, command)
+    return super.handler(data, ctx)
+  }
+
+  setParameters(self, command) {
+    this.parameters = {}
+    this.parameters.product = this.system
+    this.parameters.host = self?.connector?.options?.host
+    this.parameters.port_path_or_id = self?.connector?.options?.port
+    this.parameters.key = this.parseKey(command.args)
+    this.parameters.database_name = self?.condition?.select
+  }
+
+  parseKey(keys) {
+    let key
+    if (keys && typeof keys !== 'function') {
+      try {
+        key = stringify(keys[0])
+      } catch (err) {
+        this.logger.debug(err, 'Failed to stringify ioredis key')
+        key = '<unknown>'
+      }
+    }
+
+    return key
+  }
+}
+
+module.exports = IoRedisSubscriber

package/lib/subscribers/mcp-sdk/client-prompt.js

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2025 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+const McpClientSubscriber = require('./client')
+const { MCP } = require('../../metrics/names')
+
+class McpClientPromptSubscriber extends McpClientSubscriber {
+  constructor({ agent, logger }) {
+    super({ agent, logger, channelName: 'nr_getPrompt' })
+  }
+
+  handler(data, ctx) {
+    const promptName = data?.arguments?.[0]?.name
+    this.segmentName = `${MCP.PROMPT}/getPrompt/${promptName}`
+    return super.handler(ctx)
+  }
+}
+
+module.exports = McpClientPromptSubscriber

package/lib/subscribers/mcp-sdk/client-resource.js

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2025 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+const McpClientSubscriber = require('./client')
+const { MCP } = require('../../metrics/names')
+
+class McpClientResourceSubscriber extends McpClientSubscriber {
+  constructor({ agent, logger }) {
+    super({ agent, logger, channelName: 'nr_readResource' })
+  }
+
+  handler(data, ctx) {
+    const uri = data?.arguments?.[0]?.uri
+    const scheme = typeof uri === 'string' ? uri.split('://')[0] : undefined
+    this.segmentName = `${MCP.RESOURCE}/readResource/${scheme}`
+    return super.handler(ctx)
+  }
+}
+
+module.exports = McpClientResourceSubscriber

package/lib/subscribers/mcp-sdk/client-tool.js

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2025 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+const McpClientSubscriber = require('./client')
+const { MCP } = require('../../metrics/names')
+
+class McpClientToolSubscriber extends McpClientSubscriber {
+  constructor({ agent, logger }) {
+    super({ agent, logger, channelName: 'nr_callTool' })
+  }
+
+  handler(data, ctx) {
+    const toolName = data?.arguments?.[0]?.name
+    this.segmentName = `${MCP.TOOL}/callTool/${toolName}`
+    return super.handler(ctx)
+  }
+}
+
+module.exports = McpClientToolSubscriber

package/lib/subscribers/mcp-sdk/client.js

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2025 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+const Subscriber = require('../base')
+
+class McpClientSubscriber extends Subscriber {
+  constructor({ agent, logger, channelName }) {
+    super({ agent, logger, packageName: '@modelcontextprotocol/sdk', channelName })
+    this.events = ['asyncEnd']
+    this.segmentName = 'Unknown'
+  }
+
+  get enabled() {
+    return super.enabled && this.config.ai_monitoring.enabled === true
+  }
+
+  handler(ctx) {
+    return this.createSegment({
+      name: this.segmentName,
+      ctx
+    })
+  }
+}
+
+module.exports = McpClientSubscriber

package/lib/subscribers/mcp-sdk/config.js

@@ -0,0 +1,104 @@
+/*
+ * Copyright 2025 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+const mcpClientToolConfig = {
+  path: './mcp-sdk/client-tool',
+  instrumentations: [
+    {
+      channelName: 'nr_callTool',
+      module: {
+        name: '@modelcontextprotocol/sdk',
+        versionRange: '>=1.13.0',
+        filePath: 'dist/cjs/client/index.js'
+      },
+      functionQuery: {
+        className: 'Client',
+        methodName: 'callTool', // must be methodName, not functionName
+        kind: 'Async'
+      }
+    },
+    {
+      channelName: 'nr_callTool',
+      module: {
+        name: '@modelcontextprotocol/sdk',
+        versionRange: '>=1.13.0',
+        filePath: 'dist/esm/client/index.js'
+      },
+      functionQuery: {
+        className: 'Client',
+        methodName: 'callTool',
+        kind: 'Async'
+      }
+    },
+  ]
+}
+
+const mcpClientResourceConfig = {
+  path: './mcp-sdk/client-resource',
+  instrumentations: [
+    {
+      channelName: 'nr_readResource',
+      module: {
+        name: '@modelcontextprotocol/sdk',
+        versionRange: '>=1.13.0',
+        filePath: 'dist/cjs/client/index.js'
+      },
+      functionQuery: {
+        className: 'Client',
+        methodName: 'readResource',
+        kind: 'Async'
+      }
+    },
+    {
+      channelName: 'nr_readResource',
+      module: {
+        name: '@modelcontextprotocol/sdk',
+        versionRange: '>=1.13.0',
+        filePath: 'dist/esm/client/index.js'
+      },
+      functionQuery: {
+        className: 'Client',
+        methodName: 'readResource',
+        kind: 'Async'
+      }
+    },
+  ]
+}
+
+const mcpClientPromptConfig = {
+  path: './mcp-sdk/client-prompt',
+  instrumentations: [
+    {
+      channelName: 'nr_getPrompt',
+      module: {
+        name: '@modelcontextprotocol/sdk',
+        versionRange: '>=1.13.0',
+        filePath: 'dist/cjs/client/index.js'
+      },
+      functionQuery: {
+        className: 'Client',
+        methodName: 'getPrompt',
+        kind: 'Async'
+      }
+    },
+    {
+      channelName: 'nr_getPrompt',
+      module: {
+        name: '@modelcontextprotocol/sdk',
+        versionRange: '>=1.13.0',
+        filePath: 'dist/esm/client/index.js'
+      },
+      functionQuery: {
+        className: 'Client',
+        methodName: 'getPrompt',
+        kind: 'Async'
+      }
+    },
+  ]
+}
+
+module.exports = {
+  '@modelcontextprotocol/sdk': [mcpClientToolConfig, mcpClientResourceConfig, mcpClientPromptConfig],
+}

package/lib/subscribers/pino/config.js

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2025 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+module.exports = {
+  pino: [{
+    path: './pino',
+    instrumentations: [
+      {
+        channelName: 'nr_asJson',
+        module: { name: 'pino', versionRange: '>=8.0.0', filePath: 'lib/tools.js' },
+        functionQuery: {
+          functionName: 'asJson',
+          kind: 'Sync'
+        }
+      }
+    ]
+  }]
+}

package/lib/subscribers/pino/index.js

@@ -0,0 +1,102 @@
+/*
+ * Copyright 2025 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+const ApplicationLogsSubscriber = require('../application-logs')
+const { truncate } = require('../../util/application-logging')
+
+class PinoSubscriber extends ApplicationLogsSubscriber {
+  constructor({ agent, logger }) {
+    super({ agent, logger, packageName: 'pino', channelName: 'nr_asJson' })
+    this.events = ['end']
+  }
+
+  handler(data, ctx) {
+    this.createModuleUsageMetric('pino')
+    const { self, arguments: args } = data
+    const level = self?.levels?.labels?.[args[2]]
+    this.incrementLinesMetric(level)
+    const useMergeObj = this.decorateLogLine(data)
+    ctx.extras = { useMergeObj }
+    return ctx
+  }
+
+  decorateLogLine(data) {
+    // Pino log methods accept a singular object (a merging object) that can
+    // have a `msg` property for the log message. In such cases, we need to
+    // update that log property instead of the second parameter.
+    const useMergeObj = data.arguments[1] === undefined && Object.hasOwn(data.arguments[0], 'msg')
+    const meta = super.decorateLogLine()
+    if (meta) {
+      if (useMergeObj === true) {
+        data.arguments[0].msg += this.agent.getNRLinkingMetadata()
+      } else {
+        data.arguments[1] += this.agent.getNRLinkingMetadata()
+      }
+    }
+    return useMergeObj
+  }
+
+  end(data) {
+    this.forwardLogLine(data)
+  }
+
+  /**
+   * reformats error and assigns NR context data
+   * to log line
+   *
+   * @param {object} data event passed to the end handler
+   * @param {object} ctx agent context object
+   * @returns {function} wrapped log formatter function
+   */
+  reformatLogLine(data, ctx) {
+    const subscriber = this
+    const { self, result: logLine, arguments: args } = data
+    const msg = ctx?.extras?.useMergeObj === true ? args[0].msg : args[1]
+    const level = self?.levels?.labels?.[args[2]]
+    const metadata = this.agent.getLinkingMetadata(true)
+
+    const agentMeta = Object.assign({}, { timestamp: Date.now() }, metadata)
+    // eslint-disable-next-line eqeqeq
+    if (msg != undefined) {
+      // The spec lists `message` as "MUST" under the required column, but then
+      // details that it "MUST be omitted" if the value is "empty". Additionally,
+      // if someone has logged only a merging object, and that object contains a
+      // message key, we do not want to overwrite their value. See issue 2595.
+      agentMeta.message = msg
+    }
+
+    /**
+     * A function that gets executed in `_toPayloadSync` of log aggregator.
+     * This will parse the serialized log line and then add the relevant NR
+     * context metadata and rename the time/msg keys to timestamp/message
+     * @returns {object} formatted log line
+     */
+    return function formatLogLine() {
+      let formattedLog
+      try {
+        formattedLog = JSON.parse(logLine)
+      } catch (err) {
+        subscriber.logger.error('Failed to parse log line as json: %s', err.message)
+        return
+      }
+
+      if (formattedLog.err) {
+        formattedLog['error.message'] = truncate(formattedLog.err.message)
+        formattedLog['error.stack'] = truncate(formattedLog.err.stack)
+        formattedLog['error.class'] = formattedLog.err.type
+        delete formattedLog.err
+      }
+
+      Object.assign(formattedLog, agentMeta)
+      formattedLog.level = level
+      delete formattedLog.time
+      delete formattedLog.msg
+      return formattedLog
+    }
+  }
+}
+
+module.exports = PinoSubscriber

package/lib/transaction/trace/aggregator.js

@@ -190,16 +190,14 @@ class TransactionTraceAggregator extends TraceAggregator {
       return callback(null, traces)
     }
 
-    const tracePromises = traces.map((trace) => {
-      return new Promise((resolve, reject) => {
-        trace.generateJSON((err, data) => {
-          if (err) {
-            reject(err)
-          }
-          resolve(data)
-        })
+    const tracePromises = traces.map((trace) => new Promise((resolve, reject) => {
+      trace.generateJSON((err, data) => {
+        if (err) {
+          reject(err)
+        }
+        resolve(data)
       })
-    })
+    }))
 
     try {
       const encodedTraces = await Promise.all(tracePromises)

package/lib/util/camel-case.js

@@ -19,8 +19,6 @@ const words = (string) => string.match(wordPattern) || []
  */
 module.exports = function toCamelCase(string) {
   return words(string)
-    .map((word, index) =>
-      index === 0 ? word.toLowerCase() : word.slice(0, 1).toUpperCase() + word.slice(1)
-    )
+    .map((word, index) => (index === 0 ? word.toLowerCase() : word.slice(0, 1).toUpperCase() + word.slice(1)))
     .join('')
 }

package/lib/util/get-package-version.js

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2025 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+const { readFileSync } = require('node:fs')
+const { join } = require('node:path')
+
+const packageVersions = new Map()
+
+/**
+ * Retrieves the version of a package from its package.json file.
+ * If the package.json file cannot be read, it defaults to the Node.js version.
+ * @param {string} baseDir - The base directory where the package.json file is located.
+ * @returns {string} The version of the package or the Node.js version if the package.json cannot be read.
+ */
+function getPackageVersion(baseDir) {
+  if (packageVersions.has(baseDir)) {
+    return packageVersions.get(baseDir)
+  }
+
+  try {
+    const packageJsonPath = join(baseDir, 'package.json')
+    const jsonFile = readFileSync(packageJsonPath)
+    const { version } = JSON.parse(jsonFile)
+    packageVersions.set(baseDir, version)
+    return version
+  } catch {
+    return process.version.slice(1)
+  }
+}
+
+module.exports = getPackageVersion

package/lib/w3c/tracestate.js

@@ -69,7 +69,7 @@ class Tracestate {
     const vendors = new Set()
     const listMembers = new Map()
     for (const listMember of kvPairs) {
-      const parts = listMember.split('=', 2).filter(v => Boolean(v))
+      const parts = listMember.split('=', 2).filter((v) => Boolean(v))
       if (parts.length !== 2) {
         this.#logger.debug('Unable to parse tracestate list members.')
         this.#agent.recordSupportability('TraceContext/TraceState/Parse/Exception/ListMember')
@@ -94,7 +94,7 @@ class Tracestate {
     let intrinsics
     if (nrTraceStateValue) {
       intrinsics = new TracestateIntrinsics()
-      const values = nrTraceStateValue.split('-').map(v => v === '' ? null : v)
+      const values = nrTraceStateValue.split('-').map((v) => (v === '' ? null : v))
       intrinsics.version = values[0]
       intrinsics.parentType = values[1]
       intrinsics.accountId = values[2]
@@ -150,7 +150,7 @@ class Tracestate {
     if (typeof header !== 'string') {
       throw Error('header value must be a string')
     }
-    const kvPairs = header.split(',').map(item => item.trim()).filter(Boolean)
+    const kvPairs = header.split(',').map((item) => item.trim()).filter(Boolean)
     return new Tracestate({ agent, logger, kvPairs })
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "13.1.0",
+  "version": "13.2.0",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [
@@ -172,11 +172,11 @@
     "services": "DOCKER_PLATFORM=linux/$(uname -m) docker compose up -d --wait",
     "services:start": "npm run services",
     "services:stop": "docker compose down",
-    "smoke": "time borp --timeout 180000 --reporter ./test/lib/test-reporter.mjs 'test/smoke/**/*.{test,tap}.js'",
+    "smoke": "time borp --timeout 180000 --reporter ./test/lib/test-reporter.mjs 'test/smoke/**/*.test.js'",
     "sub-install": "node test/bin/install_sub_deps",
     "test": "npm run integration && npm run unit",
     "third-party-updates": "oss third-party manifest --includeOptDeps && oss third-party notices --includeOptDeps && git add THIRD_PARTY_NOTICES.md third_party_manifest.json",
-    "unit": "rm -f newrelic_agent.log && time c8 -o ./coverage/unit borp --timeout 180000 --reporter ./test/lib/test-reporter.mjs 'test/unit/**/*.test.js'",
+    "unit": "rm -f newrelic_agent.log && time c8 -o ./coverage/unit borp --timeout 180000 --reporter ./test/lib/test-reporter.mjs 'test/unit/**/*.test.{js,mjs}'",
     "unit:scripts": "time c8 -o ./coverage/scripts-unit borp --reporter ./test/lib/test-reporter.mjs 'bin/test/*.test.js'",
     "update-cross-agent-tests": "./bin/update-cats.sh",
     "versioned-tests": "./bin/run-versioned-tests.sh",
@@ -201,6 +201,7 @@
     "#test/assert": "./test/lib/custom-assertions/index.js"
   },
   "dependencies": {
+    "@apm-js-collab/code-transformer": "^0.6.0",
     "@grpc/grpc-js": "^1.13.2",
     "@grpc/proto-loader": "^0.7.5",
     "@newrelic/security-agent": "^2.4.2",
@@ -234,7 +235,7 @@
     "@aws-sdk/s3-request-presigner": "^3.556.0",
     "@koa/router": "^12.0.1",
     "@matteo.collina/tspl": "^0.1.1",
-    "@newrelic/eslint-config": "^0.5.0",
+    "@newrelic/eslint-config": "^0.6.0",
     "@newrelic/newrelic-oss-cli": "^0.1.2",
     "@newrelic/test-utilities": "^10.0.0",
     "@octokit/rest": "^18.0.15",
@@ -271,7 +272,8 @@
     "self-cert": "^2.0.0",
     "should": "*",
     "sinon": "^5.1.1",
-    "superagent": "^9.0.1"
+    "superagent": "^9.0.1",
+    "testdouble": "^3.20.2"
   },
   "repository": {
     "type": "git",