newrelic 12.6.1 → 12.7.0

package/NEWS.md

@@ -1,3 +1,24 @@
+### v12.7.0 (2024-11-11)
+
+#### Features
+
+* Added `cloud.resource_id` attribute to dynamo spans ([#2701](https://github.com/newrelic/node-newrelic/pull/2701)) ([904f41b](https://github.com/newrelic/node-newrelic/commit/904f41b26637394a24aa13f31ff94b100ae6d090))
+* Enhance Proxy Request Handling to Display Actual External URLs ([#2698](https://github.com/newrelic/node-newrelic/pull/2698)) ([3ef7bbe](https://github.com/newrelic/node-newrelic/commit/3ef7bbe595860234c021a02235e6fd0615da5f69))
+    * Thanks for the contribution @mstarzec386
+
+#### Documentation
+
+* Updated compatibility report ([#2712](https://github.com/newrelic/node-newrelic/pull/2712)) ([82f0e98](https://github.com/newrelic/node-newrelic/commit/82f0e9806c88d14cba2e0cdf47593e036107bd7d)) ([#2699](https://github.com/newrelic/node-newrelic/pull/2699)) ([4432c42](https://github.com/newrelic/node-newrelic/commit/4432c4215d68cc79333ee3828f1ecd55476c63d8))
+
+#### Miscellaneous chores
+
+* Added a benchmark script for our sql parser ([#2708](https://github.com/newrelic/node-newrelic/pull/2708)) ([9b6de68](https://github.com/newrelic/node-newrelic/commit/9b6de6852747230b87a9873faffba6e5b39669f3))
+* Updated express-esm, generic-pool, grpc, & grpc-esm tests to node:test ([#2702](https://github.com/newrelic/node-newrelic/pull/2702)) ([a229bbf](https://github.com/newrelic/node-newrelic/commit/a229bbf0dd92c43fb2da077d8dce831b84c0c972))
+
+#### Tests
+
+* Migrated `mysql` and `mysql2` versioned tests to `node:test` ([#2711](https://github.com/newrelic/node-newrelic/pull/2711)) ([fc767e0](https://github.com/newrelic/node-newrelic/commit/fc767e08d8b546d14c53c07bc2cfe65f3fb55368))
+
 ### v12.6.1 (2024-11-07)
 
 #### Features

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

@@ -72,21 +72,66 @@ function dynamoMiddleware(shim, config, next, context) {
   }
 }
 
-const dynamoMiddlewareConfig = {
-  middleware: dynamoMiddleware,
-  init(shim) {
-    shim.setDatastore(shim.DYNAMODB)
-    return true
-  },
-  type: InstrumentationDescriptor.TYPE_DATASTORE,
-  config: {
-    name: 'NewRelicDynamoMiddleware',
-    step: 'initialize',
-    priority: 'high',
-    override: true
+/**
+ * Wraps the deserialize middleware step to add the
+ * cloud.resource_id segment attributes for the AWS command
+ *
+ * @param {Shim} shim
+ * @param {Object} config AWS command configuration
+ * @param {function} next next function in middleware chain
+ * @returns {function}
+ */
+function resourceIdMiddlerware(shim, config, next) {
+  return async function wrappedResourceIdMiddlerware(args) {
+    let region
+    try {
+      region = await config.region()
+      const segment = shim.getSegment()
+
+      const accountId = shim.agent.config.cloud.aws.account_id
+
+      if (accountId) {
+        const attributes = segment.getAttributes()
+        segment.addAttribute(
+          'cloud.resource_id',
+          `arn:aws:dynamodb:${region}:${accountId}:table/${attributes.collection}`
+        )
+      }
+    } catch (err) {
+      shim.logger.debug(err, 'Failed to add AWS cloud resource id to segment')
+    }
+
+    return next(args)
   }
 }
 
+const dynamoMiddlewareConfig = [
+  {
+    middleware: dynamoMiddleware,
+    init(shim) {
+      shim.setDatastore(shim.DYNAMODB)
+      return true
+    },
+    type: InstrumentationDescriptor.TYPE_DATASTORE,
+    config: {
+      name: 'NewRelicDynamoMiddleware',
+      step: 'initialize',
+      priority: 'high',
+      override: true
+    }
+  },
+  {
+    middleware: resourceIdMiddlerware,
+    type: InstrumentationDescriptor.TYPE_GENERIC,
+    config: {
+      name: 'NewRelicCloudResource',
+      step: 'deserialize',
+      priority: 'low',
+      override: true
+    }
+  }
+]
+
 module.exports = {
   dynamoMiddlewareConfig
 }

package/lib/instrumentation/aws-sdk/v3/smithy-client.js

@@ -17,8 +17,8 @@ const middlewareByClient = {
   BedrockRuntime: [...middlewareConfig, bedrockMiddlewareConfig],
   SNS: [...middlewareConfig, snsMiddlewareConfig],
   SQS: [...middlewareConfig, sqsMiddlewareConfig],
-  DynamoDB: [...middlewareConfig, dynamoMiddlewareConfig],
-  DynamoDBDocument: [...middlewareConfig, dynamoMiddlewareConfig]
+  DynamoDB: [...middlewareConfig, ...dynamoMiddlewareConfig],
+  DynamoDBDocument: [...middlewareConfig, ...dynamoMiddlewareConfig]
 }
 
 module.exports = function instrumentSmithyClient(shim, smithyClientExport) {

package/lib/instrumentation/core/http-outbound.js

@@ -15,6 +15,7 @@ const copy = require('../../util/copy')
 const symbols = require('../../symbols')
 const http = require('http')
 const synthetics = require('../../synthetics')
+const { URL } = require('node:url')
 
 const NAMES = require('../../metrics/names')
 const DEFAULT_HOST = 'localhost'
@@ -93,6 +94,27 @@ function extractHostPort(opts) {
   return { host, hostname, port }
 }
 
+/**
+ * Extracts the host, hostname, and port from HTTP request options when using a proxy
+ *
+ * @param {object} opts HTTP request options
+ * @returns {object|null} { host, hostname, port } if proxy request is detected, or null otherwise.
+ */
+function extractHostPortViaProxy(opts) {
+  const pathname = opts.pathname || opts.path
+
+  if (pathname && (pathname.startsWith('https://') || pathname.startsWith('http://'))) {
+    const url = new URL(pathname)
+    return {
+      host: url.host,
+      hostname: url.hostname,
+      port: url.port || url.protocol === 'https:' ? '443' : '80'
+    }
+  }
+
+  return null
+}
+
 /**
  * Instruments an outbound HTTP request.
  *
@@ -103,7 +125,9 @@ function extractHostPort(opts) {
  */
 module.exports = function instrumentOutbound(agent, opts, makeRequest) {
   opts = parseOpts(opts)
-  const { host, hostname, port } = extractHostPort(opts)
+
+  const viaProxy = extractHostPortViaProxy(opts)
+  const { host, hostname, port } = viaProxy ? viaProxy : extractHostPort(opts)
 
   if (!hostname || port < 1) {
     logger.warn('Invalid host name (%s) or port (%s) for outbound request.', hostname, port)

package/lib/instrumentation/express.js

@@ -127,7 +127,7 @@ function wrapResponse(shim, response) {
         if (!shim.isFunction(cb)) {
           ++cbIdx
           cb = function defaultRenderCB(err, str) {
-            // https://github.com/expressjs/express/blob/4.x/lib/response.js#L961-L962
+            // https://github.com/expressjs/express/blob/4.x/lib/response.js#L961-L962
             if (err) {
               return res.req.next(err)
             }

package/package.json

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