newrelic 12.8.0 → 12.8.1

package/NEWS.md

@@ -1,12 +1,50 @@
+### v12.8.1 (2024-12-04)
+
+#### Bug fixes
+
+* Fixed matching for ALB and API Gateway (v1 & v2) events for Lambda ([#2780](https://github.com/newrelic/node-newrelic/pull/2780)) ([2f1a6c6](https://github.com/newrelic/node-newrelic/commit/2f1a6c6dc6e4408c62b074d71a95b67cc0926785))
+* Updated `mysql2` instrumentation to work with 3.11.5+ ([#2811](https://github.com/newrelic/node-newrelic/pull/2811)) ([3ec4fee](https://github.com/newrelic/node-newrelic/commit/3ec4fee486c6f609426deddb7cee8372e4dc1192))
+
+#### Documentation
+
+* Fixed changelog to group the labels in logs work ([#2776](https://github.com/newrelic/node-newrelic/pull/2776)) ([04271da](https://github.com/newrelic/node-newrelic/commit/04271dae2306f54d885aa723eebc3041edee2575))
+* Fixed links to next.js apps ([#2812](https://github.com/newrelic/node-newrelic/pull/2812)) ([834440c](https://github.com/newrelic/node-newrelic/commit/834440caee017fe632b354d20112c3016587064b))
+* Updated compatibility report ([#2809](https://github.com/newrelic/node-newrelic/pull/2809)) ([fc1fbda](https://github.com/newrelic/node-newrelic/commit/fc1fbdaf69c82caf4d7933c7fdd4eec395648e63))
+
+#### Tests
+
+* Migrated `test/integration/api` tests to `node:test` ([#2787](https://github.com/newrelic/node-newrelic/pull/2787)) ([03b01a3](https://github.com/newrelic/node-newrelic/commit/03b01a3bf40c8902c29c772aee4d70af8020ae62))
+* Migrated `test/integration/core` tests to `node:test` ([#2781](https://github.com/newrelic/node-newrelic/pull/2781)) ([36bc0e7](https://github.com/newrelic/node-newrelic/commit/36bc0e7f97f1bbde522031942ec0cc7c1d4c1349))
+* Migrated `test/integration/instrumentation` tests to `node:test` ([#2784](https://github.com/newrelic/node-newrelic/pull/2784)) ([963fb30](https://github.com/newrelic/node-newrelic/commit/963fb30087e1b9a7bf12c4ae71b8252a872e90e5))
+* Migrated `test/integration/transaction` tests to `node:test` ([#2783](https://github.com/newrelic/node-newrelic/pull/2783)) ([68e1a0c](https://github.com/newrelic/node-newrelic/commit/68e1a0c8c529702fafb29a7684f6982b0d3c48cb))
+* Migrated `test/integration/utilization` tests to node `node:test` ([#2794](https://github.com/newrelic/node-newrelic/pull/2794)) ([db237e9](https://github.com/newrelic/node-newrelic/commit/db237e9b8811554472b4f83100b3266ce52dc38b))
+* Migrated `test/smoke/api` tests to `node:test` ([#2772](https://github.com/newrelic/node-newrelic/pull/2772)) ([af3bbcd](https://github.com/newrelic/node-newrelic/commit/af3bbcddd1e9ed28fdea32b2837bf509737181cc))
+* Migrated CAT integration tests to `node:test` ([#2778](https://github.com/newrelic/node-newrelic/pull/2778)) ([bd9df5f](https://github.com/newrelic/node-newrelic/commit/bd9df5f0def633391762a191c16886735cddf9d2))
+* Migrated integration tests at root to `node:test` ([#2803](https://github.com/newrelic/node-newrelic/pull/2803)) ([a7ef080](https://github.com/newrelic/node-newrelic/commit/a7ef080296b79d5fb8d313aa2bd9d474904e0a22))
+* Migrated root smoke tests to `node:test` ([#2771](https://github.com/newrelic/node-newrelic/pull/2771)) ([78f2709](https://github.com/newrelic/node-newrelic/commit/78f2709a24328225f0c3c2392cf0a3b8072a877f))
+* Migrated smoke tests in `test/smoke/agent`, `test/smoke/e2e`, and `test/smoke/index` to `node:test` ([#2774](https://github.com/newrelic/node-newrelic/pull/2774)) ([440a0af](https://github.com/newrelic/node-newrelic/commit/440a0af5545c0585d1bb5036b950f201444566db))
+* Removed `t.diagnostic` as they are better suited as code comments ([#2786](https://github.com/newrelic/node-newrelic/pull/2786)) ([ee24027](https://github.com/newrelic/node-newrelic/commit/ee24027539aa2a6b5c8ab4c49529ff7f4fb8f269))
+* Fixed flaky test on macOS ([#2790](https://github.com/newrelic/node-newrelic/pull/2790)) ([eebf06b](https://github.com/newrelic/node-newrelic/commit/eebf06b16c86cd40402c8d5566e01ca140802b24))
+* Removed reference to `pino` internals ([#2805](https://github.com/newrelic/node-newrelic/pull/2805)) ([0382ee2](https://github.com/newrelic/node-newrelic/commit/0382ee26342546467f2f3b93be1c82d74e9d0123))
+* Restricted `mysql2` version to get CI working ([#2808](https://github.com/newrelic/node-newrelic/pull/2808)) ([ad60ed4](https://github.com/newrelic/node-newrelic/commit/ad60ed4faf69d7c7938d63f335186323327e350f))
+* Updated agent integration tests to `node:test` ([#2782](https://github.com/newrelic/node-newrelic/pull/2782)) ([d556512](https://github.com/newrelic/node-newrelic/commit/d556512ffebe3f38887aae65706dc5f1da4122d8))
+* Updated config integration tests to `node:test` ([#2777](https://github.com/newrelic/node-newrelic/pull/2777)) ([fe8d2df](https://github.com/newrelic/node-newrelic/commit/fe8d2df36ccc7d818bbc7350985034767ca221b5))
+* Updated distributed-tracing integration tests to `node:test` ([#2798](https://github.com/newrelic/node-newrelic/pull/2798)) ([83ad1f3](https://github.com/newrelic/node-newrelic/commit/83ad1f3e72f06211993b5dcbc2a5af4a27b259fe))
+* Updated `grpc` integration tests to `node:test` ([#2789](https://github.com/newrelic/node-newrelic/pull/2789)) ([ea8f743](https://github.com/newrelic/node-newrelic/commit/ea8f743c7ef0d8bad0aa25f77b239ea18da59368))
+* Updated index, issue-2155, and metric integration tests to `node:test` ([#2801](https://github.com/newrelic/node-newrelic/pull/2801)) ([80b55c2](https://github.com/newrelic/node-newrelic/commit/80b55c211aa9712ba79e39b236257583d4ccffd3))
+* Updated `q`, `superagent`, and `when` tests to `node:test` ([#2773](https://github.com/newrelic/node-newrelic/pull/2773)) ([ff2d8d0](https://github.com/newrelic/node-newrelic/commit/ff2d8d02df8f602adbed3e361763ed406b891d21))
+* Updated shimmer, uninstrumented, environment, flatten, and logger integration tests to `node:test` ([#2802](https://github.com/newrelic/node-newrelic/pull/2802)) ([83fd7ee](https://github.com/newrelic/node-newrelic/commit/83fd7ee912f5548b651bfa4c1ad7d7cbbc304092))
+* Added per test file timing to test reporter ([#2785](https://github.com/newrelic/node-newrelic/pull/2785)) ([00d9940](https://github.com/newrelic/node-newrelic/commit/00d994086a228a096aaabb1f7f8af1f2f5ffc954))
+
 ### v12.8.0 (2024-11-19)
 
 #### Features
 
-* Added `labels.enabled` and `labels.exclude` to config defaults ([#2727](https://github.com/newrelic/node-newrelic/pull/2727)) ([36adb13](https://github.com/newrelic/node-newrelic/commit/36adb13caad41a5df5a5fa9345b9dcb9061db969))
 * Added new configuration options to add custom tags (labels) to logs ([#2743](https://github.com/newrelic/node-newrelic/pull/2743)) ([d20c874](https://github.com/newrelic/node-newrelic/commit/d20c874638ebb19f8888003d4402bce17e56360f))
     * With custom tags on logs, platform engineers can easily filter, search, and correlate log data for faster and more efficient troubleshooting, improved performance, and optimized resource utilization. To learn more about this feature see the [documentation](https://docs.newrelic.com/docs/logs/logs-context/custom-tags-agent-forwarder-logs/)
+    * To enable set `config.application_logging.forwarding.labels.enabled` to `true` or the environment variable `NEW_RELIC_APPLICATION_LOGGING_FORWARDING_LABELS_ENABLED` to `true` ([#2727](https://github.com/newrelic/node-newrelic/pull/2727)) ([36adb13](https://github.com/newrelic/node-newrelic/commit/36adb13caad41a5df5a5fa9345b9dcb9061db969))
+    * To exclude labels that were set on application from logs use `config.application_logging.forwarding.labels.exclude` or the environment variable `NEW_RELIC_APPLICATION_LOGGING_FORWARDING_LABELS_EXCLUDE`
 * Added support for Bedrock Claude 3.5 invoke model user request ([#2721](https://github.com/newrelic/node-newrelic/pull/2721)) ([a901a24](https://github.com/newrelic/node-newrelic/commit/a901a2499e73e0f1142054ead53e7b99df94b201))
-
 * Moved `entity.guid`, `entity.name`, `entity.type`, and `hostname` to `common.attributes` on logs payload instead of in every log message ([#2736](https://github.com/newrelic/node-newrelic/pull/2736)) ([a7f14de](https://github.com/newrelic/node-newrelic/commit/a7f14def489000ab7492b01155069b1a084eeb36))
 
 #### Bug fixes

package/README.md

@@ -81,8 +81,8 @@ If you are having trouble getting the `newrelic` package to instrument Next.js,
 ### Next.js example projects
 The following example applications show how to load the `newrelic` instrumentation, inject browser agent, and handle errors:
 
- * [Pages Router example](https://github.com/newrelic/newrelic-node-examples/tree/58f760e828c45d90391bda3f66764d4420ba4990/nextjs-legacy)
- * [App Router example](https://github.com/newrelic/newrelic-node-examples/tree/58f760e828c45d90391bda3f66764d4420ba4990/nextjs-app-router)
+ * [Pages Router example](https://github.com/newrelic/newrelic-node-examples/tree/9415503f3bd78fa5d87a7214596d51c946199474/nextjs/nextjs-legacy)
+ * [App Router example](https://github.com/newrelic/newrelic-node-examples/tree/9415503f3bd78fa5d87a7214596d51c946199474/nextjs/nextjs-app-router)
 
 ### Custom Next.js servers
 

package/THIRD_PARTY_NOTICES.md

@@ -75,7 +75,6 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 * [sinon](#sinon)
 * [superagent](#superagent)
 * [tap](#tap)
-* [temp](#temp)
 
 **[optionalDependencies](#optionalDependencies)**
 
@@ -1042,7 +1041,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ### winston-transport
 
-This product includes source derived from [winston-transport](https://github.com/winstonjs/winston-transport) ([v4.8.0](https://github.com/winstonjs/winston-transport/tree/v4.8.0)), distributed under the [MIT License](https://github.com/winstonjs/winston-transport/blob/v4.8.0/LICENSE):
+This product includes source derived from [winston-transport](https://github.com/winstonjs/winston-transport) ([v4.7.1](https://github.com/winstonjs/winston-transport/tree/v4.7.1)), distributed under the [MIT License](https://github.com/winstonjs/winston-transport/blob/v4.7.1/LICENSE):
 
 ```
 The MIT License (MIT)
@@ -1075,7 +1074,7 @@ SOFTWARE.
 
 ### @aws-sdk/client-s3
 
-This product includes source derived from [@aws-sdk/client-s3](https://github.com/aws/aws-sdk-js-v3) ([v3.676.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.676.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.676.0/LICENSE):
+This product includes source derived from [@aws-sdk/client-s3](https://github.com/aws/aws-sdk-js-v3) ([v3.621.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.621.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.621.0/LICENSE):
 
 ```
                                 Apache License
@@ -1284,7 +1283,7 @@ This product includes source derived from [@aws-sdk/client-s3](https://github.co
 
 ### @aws-sdk/s3-request-presigner
 
-This product includes source derived from [@aws-sdk/s3-request-presigner](https://github.com/aws/aws-sdk-js-v3) ([v3.676.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.676.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.676.0/LICENSE):
+This product includes source derived from [@aws-sdk/s3-request-presigner](https://github.com/aws/aws-sdk-js-v3) ([v3.621.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.621.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.621.0/LICENSE):
 
 ```
                                 Apache License
@@ -1493,7 +1492,7 @@ This product includes source derived from [@aws-sdk/s3-request-presigner](https:
 
 ### @koa/router
 
-This product includes source derived from [@koa/router](https://github.com/koajs/router) ([v12.0.2](https://github.com/koajs/router/tree/v12.0.2)), distributed under the [MIT License](https://github.com/koajs/router/blob/v12.0.2/LICENSE):
+This product includes source derived from [@koa/router](https://github.com/koajs/router) ([v12.0.1](https://github.com/koajs/router/tree/v12.0.1)), distributed under the [MIT License](https://github.com/koajs/router/blob/v12.0.1/LICENSE):
 
 ```
 The MIT License (MIT)
@@ -2207,7 +2206,7 @@ THE SOFTWARE.
 
 ### @slack/bolt
 
-This product includes source derived from [@slack/bolt](https://github.com/slackapi/bolt) ([v3.22.0](https://github.com/slackapi/bolt/tree/v3.22.0)), distributed under the [MIT License](https://github.com/slackapi/bolt/blob/v3.22.0/LICENSE):
+This product includes source derived from [@slack/bolt](https://github.com/slackapi/bolt) ([v3.19.0](https://github.com/slackapi/bolt/tree/v3.19.0)), distributed under the [MIT License](https://github.com/slackapi/bolt/blob/v3.19.0/LICENSE):
 
 ```
 The MIT License (MIT)
@@ -2684,7 +2683,7 @@ SOFTWARE.
 
 ### async
 
-This product includes source derived from [async](https://github.com/caolan/async) ([v3.2.6](https://github.com/caolan/async/tree/v3.2.6)), distributed under the [MIT License](https://github.com/caolan/async/blob/v3.2.6/LICENSE):
+This product includes source derived from [async](https://github.com/caolan/async) ([v3.2.5](https://github.com/caolan/async/tree/v3.2.5)), distributed under the [MIT License](https://github.com/caolan/async/blob/v3.2.5/LICENSE):
 
 ```
 Copyright (c) 2010-2018 Caolan McMahon
@@ -2711,7 +2710,7 @@ THE SOFTWARE.
 
 ### aws-sdk
 
-This product includes source derived from [aws-sdk](https://github.com/aws/aws-sdk-js) ([v2.1691.0](https://github.com/aws/aws-sdk-js/tree/v2.1691.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js/blob/v2.1691.0/LICENSE.txt):
+This product includes source derived from [aws-sdk](https://github.com/aws/aws-sdk-js) ([v2.1665.0](https://github.com/aws/aws-sdk-js/tree/v2.1665.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js/blob/v2.1665.0/LICENSE.txt):
 
 ```
 
@@ -2921,7 +2920,7 @@ This product includes source derived from [aws-sdk](https://github.com/aws/aws-s
 
 ### borp
 
-This product includes source derived from [borp](https://github.com/mcollina/borp) ([v0.18.0](https://github.com/mcollina/borp/tree/v0.18.0)), distributed under the [MIT License](https://github.com/mcollina/borp/blob/v0.18.0/LICENSE):
+This product includes source derived from [borp](https://github.com/mcollina/borp) ([v0.19.0](https://github.com/mcollina/borp/tree/v0.19.0)), distributed under the [MIT License](https://github.com/mcollina/borp/blob/v0.19.0/LICENSE):
 
 ```
 MIT License
@@ -3139,7 +3138,7 @@ THE SOFTWARE.
 
 ### eslint-plugin-jsdoc
 
-This product includes source derived from [eslint-plugin-jsdoc](https://github.com/gajus/eslint-plugin-jsdoc) ([v48.11.0](https://github.com/gajus/eslint-plugin-jsdoc/tree/v48.11.0)), distributed under the [BSD-3-Clause License](https://github.com/gajus/eslint-plugin-jsdoc/blob/v48.11.0/LICENSE):
+This product includes source derived from [eslint-plugin-jsdoc](https://github.com/gajus/eslint-plugin-jsdoc) ([v48.10.2](https://github.com/gajus/eslint-plugin-jsdoc/tree/v48.10.2)), distributed under the [BSD-3-Clause License](https://github.com/gajus/eslint-plugin-jsdoc/blob/v48.10.2/LICENSE):
 
 ```
 Copyright (c) 2018, Gajus Kuizinas (http://gajus.com/)
@@ -3344,7 +3343,7 @@ Library.
 
 ### eslint
 
-This product includes source derived from [eslint](https://github.com/eslint/eslint) ([v8.57.1](https://github.com/eslint/eslint/tree/v8.57.1)), distributed under the [MIT License](https://github.com/eslint/eslint/blob/v8.57.1/LICENSE):
+This product includes source derived from [eslint](https://github.com/eslint/eslint) ([v8.57.0](https://github.com/eslint/eslint/tree/v8.57.0)), distributed under the [MIT License](https://github.com/eslint/eslint/blob/v8.57.0/LICENSE):
 
 ```
 Copyright OpenJS Foundation and other contributors, <www.openjsf.org>
@@ -3371,7 +3370,7 @@ THE SOFTWARE.
 
 ### express
 
-This product includes source derived from [express](https://github.com/expressjs/express) ([v4.21.1](https://github.com/expressjs/express/tree/v4.21.1)), distributed under the [MIT License](https://github.com/expressjs/express/blob/v4.21.1/LICENSE):
+This product includes source derived from [express](https://github.com/expressjs/express) ([v4.19.2](https://github.com/expressjs/express/tree/v4.19.2)), distributed under the [MIT License](https://github.com/expressjs/express/blob/v4.19.2/LICENSE):
 
 ```
 (The MIT License)
@@ -3507,7 +3506,7 @@ SOFTWARE.
 
 ### jsdoc
 
-This product includes source derived from [jsdoc](https://github.com/jsdoc/jsdoc) ([v4.0.4](https://github.com/jsdoc/jsdoc/tree/v4.0.4)), distributed under the [Apache-2.0 License](https://github.com/jsdoc/jsdoc/blob/v4.0.4/LICENSE.md):
+This product includes source derived from [jsdoc](https://github.com/jsdoc/jsdoc) ([v4.0.3](https://github.com/jsdoc/jsdoc/tree/v4.0.3)), distributed under the [Apache-2.0 License](https://github.com/jsdoc/jsdoc/blob/v4.0.3/LICENSE.md):
 
 ```
 # License
@@ -4002,7 +4001,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ### self-cert
 
-This product includes source derived from [self-cert](https://github.com/jsumners/self-cert) ([v2.0.1](https://github.com/jsumners/self-cert/tree/v2.0.1)), distributed under the [MIT License](https://github.com/jsumners/self-cert/blob/v2.0.1/Readme.md):
+This product includes source derived from [self-cert](https://github.com/jsumners/self-cert) ([v2.0.0](https://github.com/jsumners/self-cert/tree/v2.0.0)), distributed under the [MIT License](https://github.com/jsumners/self-cert/blob/v2.0.0/Readme.md):
 
 ```
 MIT License
@@ -4132,34 +4131,6 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ```
 
-### temp
-
-This product includes source derived from [temp](https://github.com/bruce/node-temp) ([v0.8.4](https://github.com/bruce/node-temp/tree/v0.8.4)), distributed under the [MIT License](https://github.com/bruce/node-temp/blob/v0.8.4/LICENSE):
-
-```
-The MIT License (MIT)
-
-Copyright (c) 2010-2014 Bruce Williams
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-```
-
 
 ## optionalDependencies
 

package/lib/instrumentation/mysql/mysql.js

@@ -11,63 +11,116 @@ const symbols = require('../../symbols')
 const { QuerySpec } = require('../../shim/specs')
 const DatastoreParameters = require('../../shim/specs/params/datastore')
 
+/**
+ * Used to instrument `mysql` and `mysql2` packages
+ * the `mysql2/promise` instrumentation is below in `promiseInitialize`
+ *
+ * @param {Shim} shim instance of shim
+ * @param {object} mysql package to instrument
+ */
 function callbackInitialize(shim, mysql) {
   shim.setDatastore(shim.MYSQL)
   shim[symbols.wrappedPoolConnection] = false
 
   shim.wrapReturn(mysql, 'createConnection', wrapCreateConnection)
-  function wrapCreateConnection(shim, fn, fnName, connection) {
-    if (shim[symbols.unwrapConnection]) {
-      return
-    }
-    shim.logger.debug('Wrapping Connection#query')
-    if (wrapQueryable(shim, connection, false)) {
-      const connProto = Object.getPrototypeOf(connection)
-      connProto[symbols.storeDatabase] = true
-      shim[symbols.unwrapConnection] = true
+  shim.wrapReturn(mysql, 'createPool', wrapCreatePool)
+  shim.wrapReturn(mysql, 'createPoolCluster', wrapCreatePoolCluster)
+}
+
+/**
+ * Used to instrument `mysql2/promise`
+ *
+ * @param {Shim} shim instance of shim
+ * @param {object} mysql2 package to instrument
+ */
+function promiseInitialize(shim, mysql2) {
+  shim.setDatastore(shim.MYSQL)
+  shim[symbols.wrappedPoolConnection] = false
+  shim.wrap(
+    mysql2,
+    'createConnection',
+    function wrapPromiseCreateConnection(shim, createConnection) {
+      return async function wrappedPromiseCreateConnection() {
+        const promiseConnection = await createConnection.apply(this, arguments)
+        wrapCreateConnection(
+          shim,
+          createConnection,
+          'createConnection',
+          promiseConnection.connection
+        )
+        return promiseConnection
+      }
     }
-  }
+  )
 
-  shim.wrapReturn(mysql, 'createPool', wrapCreatePool)
-  function wrapCreatePool(shim, fn, fnName, pool) {
-    if (shim[symbols.unwrapPool]) {
-      return
+  shim.wrap(mysql2, 'createPool', function wrapPromiseCreatePool(shim, createPool) {
+    return async function wrappedPromiseCreatePool() {
+      const promisePool = await createPool.apply(this, arguments)
+      wrapCreatePool(shim, createPool, 'createPool', promisePool.pool)
+      return promisePool
     }
-    shim.logger.debug('Wrapping Pool#query and Pool#getConnection')
-    if (wrapQueryable(shim, pool, true) && wrapGetConnection(shim, pool)) {
-      shim[symbols.unwrapPool] = true
+  })
+
+  shim.wrap(
+    mysql2,
+    'createPoolCluster',
+    function wrapPromiseCreatePoolCluster(shim, createPoolCluster) {
+      return async function wrappedPromiseCreatePoolCluster() {
+        const promisePoolCluster = await createPoolCluster.apply(this, arguments)
+        wrapCreatePoolCluster(
+          shim,
+          createPoolCluster,
+          'createPoolCluster',
+          promisePoolCluster.poolCluster
+        )
+        return promisePoolCluster
+      }
     }
+  )
+}
+
+function wrapCreateConnection(shim, fn, fnName, connection) {
+  if (shim[symbols.unwrapConnection]) {
+    return
   }
+  shim.logger.debug('Wrapping Connection#query')
+  if (wrapQueryable(shim, connection, false)) {
+    const connProto = Object.getPrototypeOf(connection)
+    connProto[symbols.storeDatabase] = true
+    shim[symbols.unwrapConnection] = true
+  }
+}
 
-  shim.wrapReturn(mysql, 'createPoolCluster', wrapCreatePoolCluster)
-  function wrapCreatePoolCluster(shim, fn, fnName, poolCluster) {
-    if (shim[symbols.createPoolCluster]) {
-      return
-    }
-    shim.logger.debug('Wrapping PoolCluster#of')
-    const proto = Object.getPrototypeOf(poolCluster)
-    shim.wrapReturn(proto, 'of', wrapPoolClusterOf)
-    function wrapPoolClusterOf(shim, of, _n, poolNamespace) {
-      if (poolNamespace[symbols.clusterOf]) {
-        return
-      }
+function wrapCreatePool(shim, fn, fnName, pool) {
+  if (shim[symbols.unwrapPool]) {
+    return
+  }
+  shim.logger.debug('Wrapping Pool#query and Pool#getConnection')
+  if (wrapQueryable(shim, pool, true) && wrapGetConnection(shim, pool)) {
+    shim[symbols.unwrapPool] = true
+  }
+}
 
-      if (wrapGetConnection(shim, poolNamespace) && wrapQueryable(shim, poolNamespace, false)) {
-        poolNamespace[symbols.clusterOf] = true
-      }
+function wrapCreatePoolCluster(shim, fn, fnName, poolCluster) {
+  if (shim[symbols.createPoolCluster]) {
+    return
+  }
+  shim.logger.debug('Wrapping PoolCluster#of')
+  const proto = Object.getPrototypeOf(poolCluster)
+  shim.wrapReturn(proto, 'of', wrapPoolClusterOf)
+  function wrapPoolClusterOf(shim, of, _n, poolNamespace) {
+    if (poolNamespace[symbols.clusterOf]) {
+      return
     }
 
-    shim.logger.debug('Wrapping PoolCluster#getConnection')
-    if (wrapGetConnection(shim, poolCluster)) {
-      shim[symbols.createPoolCluster] = true
+    if (wrapGetConnection(shim, poolNamespace) && wrapQueryable(shim, poolNamespace, false)) {
+      poolNamespace[symbols.clusterOf] = true
     }
   }
-}
 
-function promiseInitialize(shim) {
-  const callbackAPI = shim.require('./index')
-  if (callbackAPI && !shim.isWrapped(callbackAPI.createConnection)) {
-    callbackInitialize(shim, callbackAPI)
+  shim.logger.debug('Wrapping PoolCluster#getConnection')
+  if (wrapGetConnection(shim, poolCluster)) {
+    shim[symbols.createPoolCluster] = true
   }
 }
 

package/lib/serverless/api-gateway.js

@@ -22,7 +22,7 @@ class LambdaProxyWebRequest {
     }
     this.method = ''
 
-    if (isGatewayV1Event(event) === true) {
+    if (isGatewayV1Event(event) === true || isAlbEvent(event) === true) {
       this.url.path = event.path
       this.method = event.httpMethod
     } else if (isGatewayV2Event(event) === true) {
@@ -54,7 +54,10 @@ class LambdaProxyWebResponse {
  * @returns {Object<string, string>} The normalized query string map
  */
 function normalizeQueryStringParameters(event) {
-  if (!event.multiValueQueryStringParameters) {
+  if (
+    !event.multiValueQueryStringParameters ||
+    Object.keys(event.multiValueQueryStringParameters).length === 0
+  ) {
     return event.queryStringParameters
   }
   return Object.fromEntries(
@@ -107,56 +110,87 @@ function normalizeHeaders(event, lowerCaseKey = false) {
  *                    to create a web transaction.
  */
 function isLambdaProxyEvent(event) {
-  return isGatewayV1Event(event) || isGatewayV2Event(event)
+  return isGatewayV1Event(event) || isGatewayV2Event(event) || isAlbEvent(event)
+}
+
+/**
+ * Iterates over the minimum signature properties of an event received by this Lambda function
+ * to determine if this request is triggered from a proxy (API Gateway V1, V2, ALB) or some other service.
+ * If API Gateway, we need to determine which version: V1 and V2 have a lot of overlap, but some signature
+ * differences for which we can test.
+ *
+ * The test is designed to look only at signature properties used by each version, and returns true with the first
+ * top-level match. Each test array has only four elements, and each invocation should incur
+ * only five comparisons: one match for its matching type, and four comparisons for the non-matching type.
+ *
+ * API Gateway v2 HTTP: top-level 'rawPath', 'rawQueryString', 'routeKey'. Possibly 'cookies'
+ * API Gateway v1 HTTP: top-level 'httpMethod', 'resource'. Possibly 'multiValueHeaders', 'multiValueQueryStringParameters'
+ * API Gateway v1 REST same as HTTP, but without top-level `version`
+ * ALB: very similar to API Gateway v1, but requestContext contains an elb property
+ *
+ * In tests, this set of required API Gateway v1 properties has consistently been delivered in event payloads.
+ * Similar tests with API Gateway V2 shows that the cookies property is *only* defined if cookies are present.
+ * If `cookies` is present as a top-level property, the event is surely triggered by API Gateway V2. Its absence,
+ * though, is *not* a certain indicator of v1. As such, it's the last property considered in our test.
+ *
+ * @param {object} targetEvent The event to inspect.
+ * @param {Array} searchFor An array of keys unique to this proxy type
+ * @returns {boolean} Whether this event has matches for the keys we're checking
+ */
+function eventHasRequiredKeys(targetEvent, searchFor) {
+  const keys = Object.keys(targetEvent)
+  for (const el of searchFor) {
+    if (keys.indexOf(el) > -1) {
+      return true
+    }
+  }
+  return false
 }
 
 // See https://docs.aws.amazon.com/apigateway/latest/developerguide/set-up-lambda-proxy-integrations.html#api-gateway-simple-proxy-for-lambda-input-format
-const restApiV1Keys = [
-  'body',
-  'headers',
+const requiredHttpApiV1Keys = [
   'httpMethod',
-  'isBase64Encoded',
-  'multiValueHeaders',
-  'multiValueQueryStringParameters',
   'path',
-  'pathParameters',
-  'queryStringParameters',
-  'requestContext',
   'resource',
-  'stageVariables'
-].join(',')
+  'multiValueHeaders',
+  'multiValueQueryStringParameters'
+]
 
 // See https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html
-const httpApiV1Keys = [...restApiV1Keys.split(','), 'version'].join(',')
-
 function isGatewayV1Event(event) {
-  const keys = Object.keys(event).sort().join(',')
-  if (keys === httpApiV1Keys && event?.version === '1.0') {
+  if (event?.requestContext?.elb !== undefined) {
+    return false
+  }
+  const hasKeys = eventHasRequiredKeys(event, requiredHttpApiV1Keys)
+  if (hasKeys && event?.version === '1.0') {
     return true
   }
-
-  return keys === restApiV1Keys
+  // Rest API doesn't have version, but we can check on the key matching:
+  return hasKeys
 }
 
 // See https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html
-const httpApiV2Keys = [
-  'body',
-  'cookies',
-  'headers',
-  'isBase64Encoded',
-  'pathParameters',
-  'queryStringParameters',
-  'rawPath',
-  'rawQueryString',
-  'requestContext',
-  'routeKey',
-  'stageVariables',
-  'version'
-].join(',')
+const requiredHttpApiV2Keys = ['rawPath', 'rawQueryString', 'routeKey', 'cookies']
 
 function isGatewayV2Event(event) {
-  const keys = Object.keys(event).sort().join(',')
-  return keys === httpApiV2Keys && event?.version === '2.0'
+  if (event?.requestContext?.elb !== undefined) {
+    return false
+  }
+  return eventHasRequiredKeys(event, requiredHttpApiV2Keys) && event?.version === '2.0'
+}
+
+/**
+ * ALB can act as a proxy for Lambda. Properties have commonalities with API GateWay v1, though ALB-triggered events
+ * consistently carry an ARN at requestContext.elb. See
+ * https://docs.aws.amazon.com/elasticloadbalancing/latest/application/lambda-functions.html#receive-event-from-load-balancer
+ * and https://docs.aws.amazon.com/lambda/latest/dg/services-alb.html
+ *
+ * If we check for that property, we can accept variation in other properties.
+ * @param {object} event The event property supplied to the Lambda handler
+ * @returns {boolean} Whether or not the event was triggered by ALB
+ */
+function isAlbEvent(event) {
+  return event?.requestContext?.elb !== undefined
 }
 
 /**
@@ -176,5 +210,6 @@ module.exports = {
   isLambdaProxyEvent,
   isValidLambdaProxyResponse,
   isGatewayV1Event,
-  isGatewayV2Event
+  isGatewayV2Event,
+  isAlbEvent
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "12.8.0",
+  "version": "12.8.1",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [
@@ -229,7 +229,7 @@
     "ajv": "^6.12.6",
     "async": "^3.2.4",
     "aws-sdk": "^2.1604.0",
-    "borp": "^0.18.0",
+    "borp": "^0.19.0",
     "c8": "^8.0.1",
     "clean-jsdoc-theme": "^4.2.18",
     "commander": "^7.0.0",
@@ -258,8 +258,7 @@
     "should": "*",
     "sinon": "^5.1.1",
     "superagent": "^9.0.1",
-    "tap": "^16.3.4",
-    "temp": "^0.8.1"
+    "tap": "^16.3.4"
   },
   "repository": {
     "type": "git",