newrelic 12.5.2 → 12.6.1

package/NEWS.md

@@ -1,45 +1,86 @@
-### v12.5.2 (2024-10-23)
-
-#### Features
-
-* Updated shim/when instrumentation to use tracer to run in context ([#2642](https://github.com/newrelic/node-newrelic/pull/2642)) ([1a80ad5](https://github.com/newrelic/node-newrelic/commit/1a80ad56a6d502182a0db368f40443467f7943df))
-
-#### Bug fixes
-
-* Fixed amqplib instrumentation via ESM ([#2668](https://github.com/newrelic/node-newrelic/pull/2668)) ([a36deba](https://github.com/newrelic/node-newrelic/commit/a36deba7ba7b46c4947fcb83db0a4f97bd4c0bf1))
-
-#### Documentation
-
-* Remove SECURITY.md ([#2633](https://github.com/newrelic/node-newrelic/pull/2633)) ([41002cd](https://github.com/newrelic/node-newrelic/commit/41002cd1c423c378bfbe024ebe7dae03d02d2949))
-* Updated compatibility report ([#2670](https://github.com/newrelic/node-newrelic/pull/2670)) ([281c0fa](https://github.com/newrelic/node-newrelic/commit/281c0fa3be096a0ef3eef25b0f51df7ae8bf50bf))
-* Updated match custom-assertion jsdoc ([#2636](https://github.com/newrelic/node-newrelic/pull/2636)) ([c37abe5](https://github.com/newrelic/node-newrelic/commit/c37abe5eb4528493bb3950e376bf780d6cd29023))
-
-#### Miscellaneous chores
-
-* Upgraded `import-in-the-middle` to work around a bug introduced in 1.11.1 ([#2618](https://github.com/newrelic/node-newrelic/pull/2618)) ([9ad476a](https://github.com/newrelic/node-newrelic/commit/9ad476a765eee472f510239b4265d10f0a50c666))
-
-#### Tests
-
-* Migrated `aws-sdk-v2` and `aws-sdk-v3` tests to `node:test` ([#2620](https://github.com/newrelic/node-newrelic/pull/2620)) ([e0dc015](https://github.com/newrelic/node-newrelic/commit/e0dc01571087c3d53434d2d21d77206592137b66))
-* Migrated `test/unit/shim` to `node:test` ([#2599](https://github.com/newrelic/node-newrelic/pull/2599)) ([8d1acff](https://github.com/newrelic/node-newrelic/commit/8d1acffabf29ba6e0b5e20a675b87a81f893fc0a))
-* Migrated `test/versioned/amqplib` to `node:test` ([#2612](https://github.com/newrelic/node-newrelic/pull/2612)) ([7bdada6](https://github.com/newrelic/node-newrelic/commit/7bdada678c18997c268cf19c56262b870bae5673))
-* Migrated `test/versioned/express` to `node:test` ([#2609](https://github.com/newrelic/node-newrelic/pull/2609)) ([bd2f1a5](https://github.com/newrelic/node-newrelic/commit/bd2f1a53f8e03810e3c0aa5d042b6b256ec7346b))
-* Migrated bluebird versioned tests to `node:test` ([#2635](https://github.com/newrelic/node-newrelic/pull/2635)) ([6e28fad](https://github.com/newrelic/node-newrelic/commit/6e28fad70390ffaf4df7ccbc96c88f79bb5d2fe2))
-* Migrated last group of unit tests to `node:test` ([#2624](https://github.com/newrelic/node-newrelic/pull/2624)) ([386f546](https://github.com/newrelic/node-newrelic/commit/386f54682128d0dda8ad073a57cd45109c927fe1))
-* Migrated unit tests to `node:test` ([#2623](https://github.com/newrelic/node-newrelic/pull/2623)) ([86231b7](https://github.com/newrelic/node-newrelic/commit/86231b7dec5bc5807ae26a88a7b8f2ff1535d9c4))
-* Updated tests that relied on `tspl` by awating the `plan.completed` instead of calling `end` to avoid flaky tests ([#2610](https://github.com/newrelic/node-newrelic/pull/2610)) ([935ac14](https://github.com/newrelic/node-newrelic/commit/935ac14dbff7d11e797d290fb24a0d791ac9a61a))
-* Updated tests that used the context manager directly and instead use the tracer to access the segment context ([#2643](https://github.com/newrelic/node-newrelic/pull/2643)) ([b917b3e](https://github.com/newrelic/node-newrelic/commit/b917b3ea9416eaf64bf365f6f46a0d4eafdfc437))
-* Updated the mininum version of pg-native in pg-esm tests to align with the pg tests ([#2616](https://github.com/newrelic/node-newrelic/pull/2616)) ([16be714](https://github.com/newrelic/node-newrelic/commit/16be71404dcea903f3f7b7d4d238cc0a416d7b79))
-* Migrated `bunyan`, `pino`, and `winston` tests to `node:test` ([#2634](https://github.com/newrelic/node-newrelic/pull/2634)) ([69c1ab8](https://github.com/newrelic/node-newrelic/commit/69c1ab8951f8cd405986e879399dff716f839a78))
-* Migrated `fastify` tests to `node:test` ([#2632](https://github.com/newrelic/node-newrelic/pull/2632)) ([b522477](https://github.com/newrelic/node-newrelic/commit/b522477168c2049b12bcfd39ae485f9e5374f724))
-* Migrated block of unit tests to `node:test` ([#2607](https://github.com/newrelic/node-newrelic/pull/2607)) ([e33807b](https://github.com/newrelic/node-newrelic/commit/e33807b817852bb7cdc93c9b171250df17a3b867))
-* Migrated block of unit tests to `node:test` ([#2604](https://github.com/newrelic/node-newrelic/pull/2604)) ([cd90ce1](https://github.com/newrelic/node-newrelic/commit/cd90ce11908edc4376a704153f44d4f3ddfb6866))
-* Migrated block of unit tests to `node:test` ([#2593](https://github.com/newrelic/node-newrelic/pull/2593)) ([6d4d49e](https://github.com/newrelic/node-newrelic/commit/6d4d49e075d8c4c687d4730b65aa39177e384ce5))
-
-#### Continuous integration
-
-* Added delay to site extension publishing to wait for NPM ([#2665](https://github.com/newrelic/node-newrelic/pull/2665)) ([e412020](https://github.com/newrelic/node-newrelic/commit/e412020865bab187d8c7d274cdc6973946286a1f))
-
+### v12.6.1 (2024-11-07)
+
+#### Features
+
+* added `cloud.aws.account_id` to default config ([#2691](https://github.com/newrelic/node-newrelic/pull/2691)) ([0ccee8e](https://github.com/newrelic/node-newrelic/commit/0ccee8e471b5568a36a5ef755f83f0da513548c8))
+
+#### Bug fixes
+
+* Fixed issue parsing docker container id ([#2705](https://github.com/newrelic/node-newrelic/pull/2705)) ([0c897ab](https://github.com/newrelic/node-newrelic/commit/0c897ab7bea32daf0afbf75e2349f2fad008cc92))
+
+#### Documentation
+
+* Updated compatibility report ([#2679](https://github.com/newrelic/node-newrelic/pull/2679)) ([3c19cdf](https://github.com/newrelic/node-newrelic/commit/3c19cdfed751dfa20ebba471a6cdd320f0610d95))
+
+#### Miscellaneous chores
+
+* Moved recorders to `lib/metrics/recorders` ([#2666](https://github.com/newrelic/node-newrelic/pull/2666)) ([d8dfe84](https://github.com/newrelic/node-newrelic/commit/d8dfe843aebf275bda6d5c857cfe263039bc1a83))
+
+#### Tests
+
+* Fixed file extensions for aws-sdk v2 and v3 versioned tests to reflect they have been migrated to `node:test` ([#2687](https://github.com/newrelic/node-newrelic/pull/2687)) ([4ec09ba](https://github.com/newrelic/node-newrelic/commit/4ec09ba34a825fa9decdc2d854eec6d24ee37ac4))
+* Migrated elasticsearch and esm-package versioned tests to `node:test` ([#2680](https://github.com/newrelic/node-newrelic/pull/2680)) ([0e0c2b2](https://github.com/newrelic/node-newrelic/commit/0e0c2b2f15e2179def4e67741fc988b7d16248d7))
+* Updated cls and connect tests to node:test ([#2676](https://github.com/newrelic/node-newrelic/pull/2676)) ([1e74434](https://github.com/newrelic/node-newrelic/commit/1e74434efd21c13199ad12af837129d251136c76))
+* Reorganized custom assertions and improved test reporter ([#2700](https://github.com/newrelic/node-newrelic/pull/2700)) ([9e98b18](https://github.com/newrelic/node-newrelic/commit/9e98b18b0f2768df9f75348975bebe904418a4a2))
+* Updated cassandra-driver tests to node:test ([#2678](https://github.com/newrelic/node-newrelic/pull/2678)) ([bd4f7ff](https://github.com/newrelic/node-newrelic/commit/bd4f7ff9df2cd1057e21a6ba3e28aac9fe02ecc6))
+
+### v12.6.0 (2024-10-30)
+
+#### Features
+
+* Added ARN and provider to Lambda segments ([#2674](https://github.com/newrelic/node-newrelic/pull/2674)) ([a23294c](https://github.com/newrelic/node-newrelic/commit/a23294c2d2cc665de5df1a0f3c9099dedbfbb896))
+* Added IAST configurations for scan scheduling and restrictions ([#2645](https://github.com/newrelic/node-newrelic/pull/2645)) ([13a627a](https://github.com/newrelic/node-newrelic/commit/13a627a1a1529dd8f8c93d0b9f582457c019a63e))
+
+#### Documentation
+
+* Updated compatibility report ([#2673](https://github.com/newrelic/node-newrelic/pull/2673)) ([e4d0503](https://github.com/newrelic/node-newrelic/commit/e4d0503934f7de45d3cdb6dbb4640a66cf8d8421))
+
+#### Miscellaneous chores
+
+* Replaced static openssl cert usage with in-process cert ([#2671](https://github.com/newrelic/node-newrelic/pull/2671)) ([72872f4](https://github.com/newrelic/node-newrelic/commit/72872f4313fd9bc6d2b358a735dc76b9cda1a489))
+
+### v12.5.2 (2024-10-23)
+
+#### Features
+
+* Updated shim/when instrumentation to use tracer to run in context ([#2642](https://github.com/newrelic/node-newrelic/pull/2642)) ([1a80ad5](https://github.com/newrelic/node-newrelic/commit/1a80ad56a6d502182a0db368f40443467f7943df))
+
+#### Bug fixes
+
+* Fixed amqplib instrumentation via ESM ([#2668](https://github.com/newrelic/node-newrelic/pull/2668)) ([a36deba](https://github.com/newrelic/node-newrelic/commit/a36deba7ba7b46c4947fcb83db0a4f97bd4c0bf1))
+
+#### Documentation
+
+* Remove SECURITY.md ([#2633](https://github.com/newrelic/node-newrelic/pull/2633)) ([41002cd](https://github.com/newrelic/node-newrelic/commit/41002cd1c423c378bfbe024ebe7dae03d02d2949))
+* Updated compatibility report ([#2670](https://github.com/newrelic/node-newrelic/pull/2670)) ([281c0fa](https://github.com/newrelic/node-newrelic/commit/281c0fa3be096a0ef3eef25b0f51df7ae8bf50bf))
+* Updated match custom-assertion jsdoc ([#2636](https://github.com/newrelic/node-newrelic/pull/2636)) ([c37abe5](https://github.com/newrelic/node-newrelic/commit/c37abe5eb4528493bb3950e376bf780d6cd29023))
+
+#### Miscellaneous chores
+
+* Upgraded `import-in-the-middle` to work around a bug introduced in 1.11.1 ([#2618](https://github.com/newrelic/node-newrelic/pull/2618)) ([9ad476a](https://github.com/newrelic/node-newrelic/commit/9ad476a765eee472f510239b4265d10f0a50c666))
+
+#### Tests
+
+* Migrated `aws-sdk-v2` and `aws-sdk-v3` tests to `node:test` ([#2620](https://github.com/newrelic/node-newrelic/pull/2620)) ([e0dc015](https://github.com/newrelic/node-newrelic/commit/e0dc01571087c3d53434d2d21d77206592137b66))
+* Migrated `test/unit/shim` to `node:test` ([#2599](https://github.com/newrelic/node-newrelic/pull/2599)) ([8d1acff](https://github.com/newrelic/node-newrelic/commit/8d1acffabf29ba6e0b5e20a675b87a81f893fc0a))
+* Migrated `test/versioned/amqplib` to `node:test` ([#2612](https://github.com/newrelic/node-newrelic/pull/2612)) ([7bdada6](https://github.com/newrelic/node-newrelic/commit/7bdada678c18997c268cf19c56262b870bae5673))
+* Migrated `test/versioned/express` to `node:test` ([#2609](https://github.com/newrelic/node-newrelic/pull/2609)) ([bd2f1a5](https://github.com/newrelic/node-newrelic/commit/bd2f1a53f8e03810e3c0aa5d042b6b256ec7346b))
+* Migrated bluebird versioned tests to `node:test` ([#2635](https://github.com/newrelic/node-newrelic/pull/2635)) ([6e28fad](https://github.com/newrelic/node-newrelic/commit/6e28fad70390ffaf4df7ccbc96c88f79bb5d2fe2))
+* Migrated last group of unit tests to `node:test` ([#2624](https://github.com/newrelic/node-newrelic/pull/2624)) ([386f546](https://github.com/newrelic/node-newrelic/commit/386f54682128d0dda8ad073a57cd45109c927fe1))
+* Migrated unit tests to `node:test` ([#2623](https://github.com/newrelic/node-newrelic/pull/2623)) ([86231b7](https://github.com/newrelic/node-newrelic/commit/86231b7dec5bc5807ae26a88a7b8f2ff1535d9c4))
+* Updated tests that relied on `tspl` by awating the `plan.completed` instead of calling `end` to avoid flaky tests ([#2610](https://github.com/newrelic/node-newrelic/pull/2610)) ([935ac14](https://github.com/newrelic/node-newrelic/commit/935ac14dbff7d11e797d290fb24a0d791ac9a61a))
+* Updated tests that used the context manager directly and instead use the tracer to access the segment context ([#2643](https://github.com/newrelic/node-newrelic/pull/2643)) ([b917b3e](https://github.com/newrelic/node-newrelic/commit/b917b3ea9416eaf64bf365f6f46a0d4eafdfc437))
+* Updated the mininum version of pg-native in pg-esm tests to align with the pg tests ([#2616](https://github.com/newrelic/node-newrelic/pull/2616)) ([16be714](https://github.com/newrelic/node-newrelic/commit/16be71404dcea903f3f7b7d4d238cc0a416d7b79))
+* Migrated `bunyan`, `pino`, and `winston` tests to `node:test` ([#2634](https://github.com/newrelic/node-newrelic/pull/2634)) ([69c1ab8](https://github.com/newrelic/node-newrelic/commit/69c1ab8951f8cd405986e879399dff716f839a78))
+* Migrated `fastify` tests to `node:test` ([#2632](https://github.com/newrelic/node-newrelic/pull/2632)) ([b522477](https://github.com/newrelic/node-newrelic/commit/b522477168c2049b12bcfd39ae485f9e5374f724))
+* Migrated block of unit tests to `node:test` ([#2607](https://github.com/newrelic/node-newrelic/pull/2607)) ([e33807b](https://github.com/newrelic/node-newrelic/commit/e33807b817852bb7cdc93c9b171250df17a3b867))
+* Migrated block of unit tests to `node:test` ([#2604](https://github.com/newrelic/node-newrelic/pull/2604)) ([cd90ce1](https://github.com/newrelic/node-newrelic/commit/cd90ce11908edc4376a704153f44d4f3ddfb6866))
+* Migrated block of unit tests to `node:test` ([#2593](https://github.com/newrelic/node-newrelic/pull/2593)) ([6d4d49e](https://github.com/newrelic/node-newrelic/commit/6d4d49e075d8c4c687d4730b65aa39177e384ce5))
+
+#### Continuous integration
+
+* Added delay to site extension publishing to wait for NPM ([#2665](https://github.com/newrelic/node-newrelic/pull/2665)) ([e412020](https://github.com/newrelic/node-newrelic/commit/e412020865bab187d8c7d274cdc6973946286a1f))
+
 ### v12.5.1 (2024-09-23)
 
 #### Bug fixes

package/lib/collector/http-agents.js

@@ -53,11 +53,14 @@ exports.proxyAgent = function proxyAgent(config) {
   }
   const proxyUrl = proxyOptions(config)
 
+  // Tests may supply 127.0.0.1 as the host, but SNI requires a hostname.
+  const servername = config.host
   const proxyOpts = {
     secureEndpoint: config.ssl,
     auth: proxyUrl.auth,
     ca: config?.certificates?.length ? config.certificates : [],
-    keepAlive: true
+    keepAlive: true,
+    servername
   }
 
   logger.info(`using proxy: ${proxyUrl}`)

package/lib/config/default.js

@@ -413,6 +413,17 @@ defaultConfig.definition = () => ({
       default: false
     }
   },
+  cloud: {
+    aws: {
+      /**
+       * The AWS account ID for the AWS account associated with this app.
+       */
+      account_id: {
+        formatter: int,
+        default: null
+      }
+    }
+  },
   /**
    * Options regarding collecting system information. Used for system
    * utilization based pricing scheme.
@@ -1318,6 +1329,147 @@ defaultConfig.definition = () => ({
           default: true
         }
       }
+    },
+
+    /**
+     * Unique test identifier when runnning IAST with CI/CD
+     */
+    iast_test_identifier: '',
+
+    /**
+     * IAST scan controllers to get more control over IAST analysis
+     */
+    scan_controllers: {
+      /**
+       * The maximum number of analysis probes or requests
+       * that can be sent to the application in one minute.
+       */
+      iast_scan_request_rate_limit: {
+        formatter: int,
+        default: 3600
+      },
+      /**
+       * The number of application instances for a specific entity where IAST analysis is performed.
+       *  Values are 0 or 1, 0 signifies run on all application instances
+       */
+      scan_instance_count: {
+        formatter: int,
+        default: 0
+      }
+    },
+    /**
+     * Schedule start and stop of IAST scan
+     */
+    scan_schedule: {
+      /**
+       * The delay field specifies the time in minutes
+       * before an IAST scan begins after the application starts
+       */
+      delay: {
+        formatter: int,
+        default: 0
+      },
+      /**
+       * The duration field specifies the amount of
+       * time in minutes that the IAST scan will run
+       */
+      duration: {
+        formatter: int,
+        default: 0
+      },
+      /**
+       * The schedule field specifies a unix cron expression that defines when the IAST scan should run.
+       * By default, schedule is disabled
+       *
+       */
+      schedule: '',
+      /**
+       * Allows IAST to actively collect trace data in the background
+       * and the security agent will use this collected data to perform
+       * an IAST scan at the scheduled time
+       */
+      always_sample_traces: {
+        formatter: boolean,
+        default: false
+      }
+    },
+
+    /**
+     * The exclude from IAST scan setting allows to exclude specific APIs,
+     * vulnerability categories, and parameters from IAST analysis.
+     */
+    exclude_from_iast_scan: {
+      /**
+       * Ignore specific APIs from IAST analysis.
+       * The regex pattern should provide a full match for the URL without the endpoint.
+       */
+      api: {
+        formatter: array,
+        default: []
+      },
+      /**
+       * Ignore specific HTTP request parameters from IAST analysis.
+       */
+      http_request_parameters: {
+        header: {
+          formatter: array,
+          default: []
+        },
+        query: {
+          formatter: array,
+          default: []
+        },
+        body: {
+          formatter: array,
+          default: []
+        }
+      },
+      /**
+       *  Allows users to specify categories of vulnerabilities
+       *  for which IAST analysis will be applied or ignored.
+       */
+      iast_detection_category: {
+        insecure_settings: {
+          formatter: boolean,
+          default: false
+        },
+        invalid_file_access: {
+          formatter: boolean,
+          default: false
+        },
+        sql_injection: {
+          formatter: boolean,
+          default: false
+        },
+        nosql_injection: {
+          formatter: boolean,
+          default: false
+        },
+        ldap_injection: {
+          formatter: boolean,
+          default: false
+        },
+        javascript_injection: {
+          formatter: boolean,
+          default: false
+        },
+        command_injection: {
+          formatter: boolean,
+          default: false
+        },
+        xpath_injection: {
+          formatter: boolean,
+          default: false
+        },
+        ssrf: {
+          formatter: boolean,
+          default: false
+        },
+        rxss: {
+          formatter: boolean,
+          default: false
+        }
+      }
     }
   },
 

package/lib/db/parsed-statement.js

@@ -5,9 +5,6 @@
 
 'use strict'
 
-const { DB, ALL } = require('../metrics/names')
-const { DESTINATIONS } = require('../config/attribute-filter')
-
 function ParsedStatement(type, operation, collection, raw) {
   this.type = type
   this.operation = operation
@@ -21,55 +18,4 @@ function ParsedStatement(type, operation, collection, raw) {
   }
 }
 
-ParsedStatement.prototype.recordMetrics = function recordMetrics(segment, scope) {
-  const duration = segment.getDurationInMillis()
-  const exclusive = segment.getExclusiveDurationInMillis()
-  const transaction = segment.transaction
-  const type = transaction.isWeb() ? DB.WEB : DB.OTHER
-  const thisTypeSlash = this.type + '/'
-  const operation = DB.OPERATION + '/' + thisTypeSlash + this.operation
-
-  // Note, an operation metric should _always_ be created even if the action was
-  // a statement. This is part of the spec.
-
-  // Rollups
-  transaction.measure(operation, null, duration, exclusive)
-  transaction.measure(DB.PREFIX + type, null, duration, exclusive)
-  transaction.measure(DB.PREFIX + thisTypeSlash + type, null, duration, exclusive)
-  transaction.measure(DB.PREFIX + thisTypeSlash + ALL, null, duration, exclusive)
-  transaction.measure(DB.ALL, null, duration, exclusive)
-
-  // If we can parse the SQL statement, create a 'statement' metric, and use it
-  // as the scoped metric for transaction breakdowns. Otherwise, skip the
-  // 'statement' metric and use the 'operation' metric as the scoped metric for
-  // transaction breakdowns.
-  let collection
-  if (this.collection) {
-    collection = DB.STATEMENT + '/' + thisTypeSlash + this.collection + '/' + this.operation
-    transaction.measure(collection, null, duration, exclusive)
-    if (scope) {
-      transaction.measure(collection, scope, duration, exclusive)
-    }
-  } else if (scope) {
-    transaction.measure(operation, scope, duration, exclusive)
-  }
-
-  // This recorder is side-effectful Because we are depending on the recorder
-  // setting the transaction name, recorders must always be run before generating
-  // the final transaction trace
-  segment.name = collection || operation
-
-  // Datastore instance metrics.
-  const attributes = segment.attributes.get(DESTINATIONS.TRANS_SEGMENT)
-  if (attributes.host && attributes.port_path_or_id) {
-    const instanceName =
-      DB.INSTANCE + '/' + thisTypeSlash + attributes.host + '/' + attributes.port_path_or_id
-    transaction.measure(instanceName, null, duration, exclusive)
-  }
-
-  if (this.raw) {
-    transaction.agent.queries.add(segment, this.type.toLowerCase(), this.raw, this.trace)
-  }
-}
-
 module.exports = ParsedStatement

package/lib/metrics/recorders/database-operation.js

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2024 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+const metrics = require('../names')
+
+/**
+ * Records all the metrics required for database operations.
+ *
+ * - `recordOperationMetrics(segment [, scope])`
+ *
+ * @private
+ * @this DatastoreShim
+ * @implements {MetricFunction}
+ * @param {TraceSegment}  segment - The segment being recorded.
+ * @param {string}        [scope] - The scope of the segment.
+ * @see DatastoreShim#recordOperation
+ * @see MetricFunction
+ */
+function recordOperationMetrics(segment, scope) {
+  if (!segment) {
+    return
+  }
+
+  const duration = segment.getDurationInMillis()
+  const exclusive = segment.getExclusiveDurationInMillis()
+  const transaction = segment.transaction
+  const type = transaction.isWeb() ? 'allWeb' : 'allOther'
+  const operation = segment.name
+
+  if (scope) {
+    transaction.measure(operation, scope, duration, exclusive)
+  }
+
+  transaction.measure(operation, null, duration, exclusive)
+  transaction.measure(metrics.DB.PREFIX + type, null, duration, exclusive)
+  transaction.measure(metrics.DB.ALL, null, duration, exclusive)
+  transaction.measure(this._metrics.ALL, null, duration, exclusive)
+  transaction.measure(
+    metrics.DB.PREFIX + this._metrics.PREFIX + '/' + type,
+    null,
+    duration,
+    exclusive
+  )
+
+  const attributes = segment.getAttributes()
+  if (attributes.host && attributes.port_path_or_id) {
+    const instanceName = [
+      metrics.DB.INSTANCE,
+      this._metrics.PREFIX,
+      attributes.host,
+      attributes.port_path_or_id
+    ].join('/')
+
+    transaction.measure(instanceName, null, duration, exclusive)
+  }
+}
+
+module.exports = recordOperationMetrics

package/lib/metrics/recorders/database.js

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2024 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+const { DB, ALL } = require('../names')
+const { DESTINATIONS } = require('../../config/attribute-filter')
+
+/**
+ * @this ParsedStatement
+ * @param {TraceSegment}  segment - The segment being recorded.
+ * @param {string}        [scope] - The scope of the segment.
+ */
+
+function recordQueryMetrics(segment, scope) {
+  const duration = segment.getDurationInMillis()
+  const exclusive = segment.getExclusiveDurationInMillis()
+  const transaction = segment.transaction
+  const type = transaction.isWeb() ? DB.WEB : DB.OTHER
+  const thisTypeSlash = this.type + '/'
+  const operation = DB.OPERATION + '/' + thisTypeSlash + this.operation
+
+  // Note, an operation metric should _always_ be created even if the action was
+  // a statement. This is part of the spec.
+
+  // Rollups
+  transaction.measure(operation, null, duration, exclusive)
+  transaction.measure(DB.PREFIX + type, null, duration, exclusive)
+  transaction.measure(DB.PREFIX + thisTypeSlash + type, null, duration, exclusive)
+  transaction.measure(DB.PREFIX + thisTypeSlash + ALL, null, duration, exclusive)
+  transaction.measure(DB.ALL, null, duration, exclusive)
+
+  // If we can parse the SQL statement, create a 'statement' metric, and use it
+  // as the scoped metric for transaction breakdowns. Otherwise, skip the
+  // 'statement' metric and use the 'operation' metric as the scoped metric for
+  // transaction breakdowns.
+  let collection
+  if (this.collection) {
+    collection = DB.STATEMENT + '/' + thisTypeSlash + this.collection + '/' + this.operation
+    transaction.measure(collection, null, duration, exclusive)
+    if (scope) {
+      transaction.measure(collection, scope, duration, exclusive)
+    }
+  } else if (scope) {
+    transaction.measure(operation, scope, duration, exclusive)
+  }
+
+  // This recorder is side-effectful Because we are depending on the recorder
+  // setting the transaction name, recorders must always be run before generating
+  // the final transaction trace
+  segment.name = collection || operation
+
+  // Datastore instance metrics.
+  const attributes = segment.attributes.get(DESTINATIONS.TRANS_SEGMENT)
+  if (attributes.host && attributes.port_path_or_id) {
+    const instanceName =
+      DB.INSTANCE + '/' + thisTypeSlash + attributes.host + '/' + attributes.port_path_or_id
+    transaction.measure(instanceName, null, duration, exclusive)
+  }
+
+  if (this.raw) {
+    segment.transaction.agent.queries.add(segment, this.type.toLowerCase(), this.raw, this.trace)
+  }
+}
+
+module.exports = recordQueryMetrics

package/lib/metrics/recorders/middleware.js

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2024 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+/**
+ * Creates a recorder for middleware metrics.
+ *
+ * @private
+ * @param {object} _shim instance of shim
+ * @param {string} metricName name of metric
+ * @returns {Function} recorder for middleware
+ */
+function makeMiddlewareRecorder(_shim, metricName) {
+  return function middlewareMetricRecorder(segment, scope) {
+    const duration = segment.getDurationInMillis()
+    const exclusive = segment.getExclusiveDurationInMillis()
+    const transaction = segment.transaction
+
+    if (scope) {
+      transaction.measure(metricName, scope, duration, exclusive)
+    }
+    transaction.measure(metricName, null, duration, exclusive)
+  }
+}
+
+module.exports = makeMiddlewareRecorder

package/lib/serverless/aws-lambda.js

@@ -249,7 +249,9 @@ class AwsLambda {
   _getAwsAgentAttributes(event, context) {
     const attributes = {
       'aws.lambda.arn': context.invokedFunctionArn,
-      'aws.requestId': context.awsRequestId
+      'aws.requestId': context.awsRequestId,
+      'cloud.resource_id': context.invokedFunctionArn,
+      'cloud.platform': 'aws_lambda'
     }
 
     const eventSourceInfo = this._detectEventType(event)

package/lib/shim/datastore-shim.js

@@ -15,7 +15,9 @@ const Shim = require('./shim')
 const urltils = require('../util/urltils')
 const util = require('util')
 const specs = require('./specs')
+const recordOperationMetrics = require('../../lib/metrics/recorders/database-operation')
 const { DatastoreParameters } = specs.params
+const recordQueryMetrics = require('../../lib/metrics/recorders/database')
 
 /**
  * An enumeration of well-known datastores so that new instrumentations can use
@@ -284,7 +286,7 @@ function recordOperation(nodule, properties, opSpec) {
       if (!segDesc?.name?.startsWith(shim._metrics.OPERATION)) {
         segDesc.name = shim._metrics.OPERATION + segDesc.name
       }
-      segDesc.recorder = _recordOperationMetrics.bind(shim)
+      segDesc.recorder = recordOperationMetrics.bind(shim)
     }
 
     return segDesc
@@ -567,7 +569,7 @@ function _recordQuery(suffix, nodule, properties, querySpec) {
       const name = (parsed.collection || 'other') + '/' + parsed.operation + suffix
       shim.logger.trace('Found and parsed query %s -> %s', parsed.type, name)
       segDesc.name = shim._metrics.STATEMENT + name
-      segDesc.recorder = _recordQueryMetrics.bind(null, parsed)
+      segDesc.recorder = recordQueryMetrics.bind(parsed)
     }
 
     return segDesc
@@ -598,72 +600,6 @@ function _getSpec({ spec, shim, fn, fnName, args }) {
   return dsSpec
 }
 
-/**
- * Records all query metrics when a segment is active
- *
- * @private
- * @param {ParsedStatement} parsed instance of ParsedStatement
- * @param {TraceSegment} segment active segment
- * @param {string} scope scope of metrics if it exists
- */
-function _recordQueryMetrics(parsed, segment, scope) {
-  if (segment) {
-    parsed.recordMetrics(segment, scope)
-  }
-}
-
-/**
- * Records all the metrics required for database operations.
- *
- * - `_recordOperationMetrics(segment [, scope])`
- *
- * @private
- * @this DatastoreShim
- * @implements {MetricFunction}
- * @param {TraceSegment}  segment - The segment being recorded.
- * @param {string}        [scope] - The scope of the segment.
- * @see DatastoreShim#recordOperation
- * @see MetricFunction
- */
-function _recordOperationMetrics(segment, scope) {
-  if (!segment) {
-    return
-  }
-
-  const duration = segment.getDurationInMillis()
-  const exclusive = segment.getExclusiveDurationInMillis()
-  const transaction = segment.transaction
-  const type = transaction.isWeb() ? 'allWeb' : 'allOther'
-  const operation = segment.name
-
-  if (scope) {
-    transaction.measure(operation, scope, duration, exclusive)
-  }
-
-  transaction.measure(operation, null, duration, exclusive)
-  transaction.measure(metrics.DB.PREFIX + type, null, duration, exclusive)
-  transaction.measure(metrics.DB.ALL, null, duration, exclusive)
-  transaction.measure(this._metrics.ALL, null, duration, exclusive)
-  transaction.measure(
-    metrics.DB.PREFIX + this._metrics.PREFIX + '/' + type,
-    null,
-    duration,
-    exclusive
-  )
-
-  const attributes = segment.getAttributes()
-  if (attributes.host && attributes.port_path_or_id) {
-    const instanceName = [
-      metrics.DB.INSTANCE,
-      this._metrics.PREFIX,
-      attributes.host,
-      attributes.port_path_or_id
-    ].join('/')
-
-    transaction.measure(instanceName, null, duration, exclusive)
-  }
-}
-
 /**
  * Extracts the query string from the arguments according to the given spec.
  *

package/lib/shim/webframework-shim/middleware.js

@@ -13,6 +13,7 @@ const {
 } = require('./common')
 const { assignCLMSymbol } = require('../../util/code-level-metrics')
 const { RecorderSpec } = require('../specs')
+const makeMiddlewareRecorder = require('../../metrics/recorders/middleware')
 
 const MIDDLEWARE_TYPE_DETAILS = {
   APPLICATION: { name: 'Mounted App: ', path: true, record: false },
@@ -88,7 +89,7 @@ function constructRecorder({ txInfo, typeDetails, shim, metricName }) {
   let recorder = null
   if (typeDetails.record) {
     const stackPath = txInfo.transaction.nameState.getPath() || ''
-    recorder = _makeMiddlewareRecorder(shim, metricName + '/' + stackPath)
+    recorder = makeMiddlewareRecorder(shim, metricName + '/' + stackPath)
   }
   return recorder
 }
@@ -325,27 +326,6 @@ module.exports._recordMiddleware = function _recordMiddleware(shim, middleware,
   )
 }
 
-/**
- * Creates a recorder for middleware metrics.
- *
- * @private
- * @param {object} _shim instance of shim
- * @param {string} metricName name of metric
- * @returns {Function} recorder for middleware
- */
-function _makeMiddlewareRecorder(_shim, metricName) {
-  return function middlewareMetricRecorder(segment, scope) {
-    const duration = segment.getDurationInMillis()
-    const exclusive = segment.getExclusiveDurationInMillis()
-    const transaction = segment.transaction
-
-    if (scope) {
-      transaction.measure(metricName, scope, duration, exclusive)
-    }
-    transaction.measure(metricName, null, duration, exclusive)
-  }
-}
-
 /**
  * Wrap the `next` middleware function and push on our name state if we find it. We only want to
  * push the name state if there is a next so that we can safely remove it

package/lib/utilization/docker-info.js

@@ -116,11 +116,27 @@ function fetchDockerVendorInfo(agent, callback, logger = log) {
       logger.debug(
         `${CGROUPS_V2_PATH} not found, trying to parse container id from ${CGROUPS_V1_PATH}`
       )
-      findCGroupsV1(callback)
+      findCGroupsV1(callback, logger)
       return
     }
 
-    parseCGroupsV2(data, callback)
+    parseCGroupsV2(
+      data,
+      (_, v2Data) => {
+        if (v2Data !== null) {
+          // We found a valid Docker identifier in the v2 file, so we are going
+          // to prioritize it.
+          return callback(null, v2Data)
+        }
+
+        // For some reason, we have a /proc/self/mountinfo but it does not have
+        // any Docker information in it (that we have detected). So we will
+        // fall back to trying the cgroups v1 file.
+        logger.debug(`Attempting to fall back to cgroups v1 parsing.`)
+        findCGroupsV1(callback, logger)
+      },
+      logger
+    )
   })
 }
 
@@ -136,6 +152,7 @@ function parseCGroupsV2(data, callback, logger = log) {
   const containerLine = new RegExp('/docker/containers/([0-9a-f]{64})/')
   const line = containerLine.exec(data)
   if (line) {
+    logger.debug(`Found docker id from cgroups v2: ${line[1]}`)
     callback(null, { id: line[1] })
   } else {
     logger.debug(`Found ${CGROUPS_V2_PATH} but failed to parse Docker container id.`)
@@ -169,7 +186,8 @@ function findCGroupsV1(callback, logger = log) {
     })
 
     if (id) {
-      vendorInfo = { id: id }
+      vendorInfo = { id }
+      logger.debug(`Found docker id from cgroups v1: ${id}`)
       callback(null, vendorInfo)
     } else {
       logger.debug('No matching cpu group found.')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "12.5.2",
+  "version": "12.6.1",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [
@@ -163,15 +163,14 @@
     "docs": "rm -rf ./out && jsdoc -c ./jsdoc-conf.jsonc --private -r .",
     "integration": "npm run prepare-test && npm run sub-install && BORP_CONF_FILE=.borp.int.yaml time c8 -o ./coverage/integration borp --timeout 600000 --reporter ./test/lib/test-reporter.mjs",
     "integration:esm": "NODE_OPTIONS='--loader=./esm-loader.mjs' BORP_CONF_FILE=.borp.int-esm.yaml time c8 -o ./coverage/integration-esm borp --reporter ./test/lib/test-reporter.mjs",
-    "prepare-test": "npm run ssl && npm run docker-env",
+    "prepare-test": "npm run docker-env",
     "lint": "eslint ./*.{js,mjs} lib test bin",
     "lint:fix": "eslint --fix, ./*.{js,mjs} lib test bin",
     "public-docs": "jsdoc -c ./jsdoc-conf.jsonc",
     "publish-docs": "./bin/publish-docs.sh",
     "services": "DOCKER_PLATFORM=linux/$(uname -m) docker compose up -d --wait",
     "services:stop": "docker compose down",
-    "smoke": "npm run ssl && time borp --timeout 180000 --reporter ./test/lib/test-reporter.mjs 'test/smoke/**/*.tap.js'",
-    "ssl": "./bin/ssl.sh",
+    "smoke": "time borp --timeout 180000 --reporter ./test/lib/test-reporter.mjs 'test/smoke/**/*.{test,tap}.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",
@@ -195,7 +194,7 @@
     "newrelic-naming-rules": "./bin/test-naming-rules.js"
   },
   "dependencies": {
-    "@grpc/grpc-js": "^1.9.4",
+    "@grpc/grpc-js": "^1.12.2",
     "@grpc/proto-loader": "^0.7.5",
     "@newrelic/security-agent": "^2.0.0",
     "@tyriar/fibonacci-heap": "^2.0.7",
@@ -253,7 +252,6 @@
     "lint-staged": "^11.0.0",
     "lockfile-lint": "^4.9.6",
     "nock": "11.8.0",
-    "proxy": "^2.1.1",
     "proxyquire": "^1.8.0",
     "rimraf": "^2.6.3",
     "self-cert": "^2.0.0",