newrelic 10.1.0 → 10.1.1

package/NEWS.md

@@ -1,3 +1,39 @@
+### v10.1.1 (2023-05-15)
+
+#### Bug Fixes
+
+* updated prisma instrumentation to properly parse database connection strings that work across all versions of prisma ([#1634](https://github.com/newrelic/node-newrelic/pull/1634)) ([b2101fd](https://github.com/newrelic/node-newrelic/commit/b2101fd606af43093b9caf525dbef9e122f6ca7e))
+
+#### Code Refactoring
+
+* **run-versioned-tests.sh:** added ability to run versioned tests and skip collecting coverage by passing in `SKIP_C8` env var to the job. ([#1621](https://github.com/newrelic/node-newrelic/pull/1621)) ([0ba9dcb](https://github.com/newrelic/node-newrelic/commit/0ba9dcb38654a8363732c558a0310df7bd032ab1))
+
+#### Documentation
+
+* update Contribution Guide with Conventional Commit info ([#1635](https://github.com/newrelic/node-newrelic/pull/1635)) ([f1a00e5](https://github.com/newrelic/node-newrelic/commit/f1a00e5cc4c907d046bc1f5205082761f620ecf1))
+
+#### Miscellaneous Chores
+
+* pin testdobule to 3.17.2 as 3.18.0 no longer works on node 14 ([#1628](https://github.com/newrelic/node-newrelic/pull/1628)) ([d68bd9f](https://github.com/newrelic/node-newrelic/commit/d68bd9fa3f6af974b5c978b61732491294b2e5cf))
+* remove release-please workflow and scripts ([#1624](https://github.com/newrelic/node-newrelic/pull/1624)) ([80f7eb8](https://github.com/newrelic/node-newrelic/commit/80f7eb88a4f71e44b4413e3b39c5766046e9ec8a))
+
+#### Tests
+
+* pin prisma to 4.14.0 until we fix instrumentation ([#1631](https://github.com/newrelic/node-newrelic/pull/1631)) ([a60659d](https://github.com/newrelic/node-newrelic/commit/a60659d6929be559854d01c83028d5acfbcd3603))
+* **scripts:** fix failing changelog unit test ([#1626](https://github.com/newrelic/node-newrelic/pull/1626)) ([08f48b3](https://github.com/newrelic/node-newrelic/commit/08f48b33ce1c402e4a8c42c9c02e5b22e6cbe02a))
+* **config:** increase test coverage ([#1625](https://github.com/newrelic/node-newrelic/pull/1625)) ([67f39d8](https://github.com/newrelic/node-newrelic/commit/67f39d8dc89e627d27c7fd9a9cee1ac14ab816e3))
+* **config:** revert changes to lib/config/index.js ([#1630](https://github.com/newrelic/node-newrelic/pull/1630)) ([fea1068](https://github.com/newrelic/node-newrelic/commit/fea1068281d9ce8ae966b47923aba6ecef894bc8))
+
+#### Continuous Integration
+
+* changed versioned tests script to use SKIP_C8 ([#1621](https://github.com/newrelic/node-newrelic/pull/1621)) ([83e95e3](https://github.com/newrelic/node-newrelic/commit/83e95e31365cd4d48c7ee1dbb789b58231841e41))
+* add --use-new-release functionality ([#1633](https://github.com/newrelic/node-newrelic/pull/1633)) ([d97b421](https://github.com/newrelic/node-newrelic/commit/d97b421be5acda61f0212fd49a433e58811fc27c))
+* add ability to generate release notes from conventional commits ([#1623](https://github.com/newrelic/node-newrelic/pull/1623)) ([880a88b](https://github.com/newrelic/node-newrelic/commit/880a88b6e816b8cd2694a16bfe74b37fc42231ab))
+* **create-docs-pr:** Set username/email to machine user by default ([#1627](https://github.com/newrelic/node-newrelic/pull/1627)) ([3870a1f](https://github.com/newrelic/node-newrelic/commit/3870a1ff9979e6afde669c69c443d657f1f37af9))
+* fix issue with missing type in the prep-release ([#1638](https://github.com/newrelic/node-newrelic/pull/1638)) ([9a906e8](https://github.com/newrelic/node-newrelic/commit/9a906e8e833753808ab779fdf4074aa7c90cd1fa))
+* update prep-release to fetch entire history of caller repo ([#1641](https://github.com/newrelic/node-newrelic/pull/1641)) ([428174a](https://github.com/newrelic/node-newrelic/commit/428174afd6cca482382101316b4d03c2f96f9f95))
+* update to conditionally add CLI flag to prep-release ([#1640](https://github.com/newrelic/node-newrelic/pull/1640)) ([b167c93](https://github.com/newrelic/node-newrelic/commit/b167c932659cbba073827a6936b65c0aeee98d8a))
+
 ### v10.1.0 (2023-05-04)
 
 * Added batching and compression to infinite tracing.

package/THIRD_PARTY_NOTICES.md

@@ -16,6 +16,7 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 
 * [@grpc/grpc-js](#grpcgrpc-js)
 * [@grpc/proto-loader](#grpcproto-loader)
+* [@mrleebo/prisma-ast](#mrleeboprisma-ast)
 * [@newrelic/aws-sdk](#newrelicaws-sdk)
 * [@newrelic/koa](#newrelickoa)
 * [@newrelic/superagent](#newrelicsuperagent)
@@ -42,6 +43,9 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 * [chai](#chai)
 * [clean-jsdoc-theme](#clean-jsdoc-theme)
 * [commander](#commander)
+* [conventional-changelog-conventionalcommits](#conventional-changelog-conventionalcommits)
+* [conventional-changelog-writer](#conventional-changelog-writer)
+* [conventional-commits-parser](#conventional-commits-parser)
 * [eslint-config-prettier](#eslint-config-prettier)
 * [eslint-plugin-disable](#eslint-plugin-disable)
 * [eslint-plugin-header](#eslint-plugin-header)
@@ -51,6 +55,7 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 * [eslint-plugin-sonarjs](#eslint-plugin-sonarjs)
 * [eslint](#eslint)
 * [express](#express)
+* [git-raw-commits](#git-raw-commits)
 * [glob](#glob)
 * [got](#got)
 * [husky](#husky)
@@ -500,6 +505,34 @@ This product includes source derived from [@grpc/proto-loader](https://github.co
 
 ```
 
+### @mrleebo/prisma-ast
+
+This product includes source derived from [@mrleebo/prisma-ast](https://github.com/MrLeebo/prisma-ast) ([v0.5.2](https://github.com/MrLeebo/prisma-ast/tree/v0.5.2)), distributed under the [MIT License](https://github.com/MrLeebo/prisma-ast/blob/v0.5.2/LICENSE):
+
+```
+MIT License
+
+Copyright (c) 2021 Jeremy Liberman
+
+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.
+```
+
 ### @newrelic/aws-sdk
 
 This product includes source derived from [@newrelic/aws-sdk](https://github.com/newrelic/node-newrelic-aws-sdk) ([v5.0.2](https://github.com/newrelic/node-newrelic-aws-sdk/tree/v5.0.2)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-newrelic-aws-sdk/blob/v5.0.2/LICENSE):
@@ -2233,6 +2266,87 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ```
 
+### conventional-changelog-conventionalcommits
+
+This product includes source derived from [conventional-changelog-conventionalcommits](https://github.com/conventional-changelog/conventional-changelog) ([v5.0.0](https://github.com/conventional-changelog/conventional-changelog/tree/v5.0.0)), distributed under the [ISC License](https://github.com/conventional-changelog/conventional-changelog/blob/v5.0.0/LICENSE.md):
+
+```
+### ISC License
+
+Copyright © [conventional-changelog team](https://github.com/conventional-changelog)
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE. 
+
+```
+
+### conventional-changelog-writer
+
+This product includes source derived from [conventional-changelog-writer](https://github.com/conventional-changelog/conventional-changelog) ([v5.0.1](https://github.com/conventional-changelog/conventional-changelog/tree/v5.0.1)), distributed under the [MIT License](https://github.com/conventional-changelog/conventional-changelog/blob/v5.0.1/LICENSE.md):
+
+```
+### MIT License
+
+Copyright © [conventional-changelog team](https://github.com/conventional-changelog)
+
+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.
+
+```
+
+### conventional-commits-parser
+
+This product includes source derived from [conventional-commits-parser](https://github.com/conventional-changelog/conventional-changelog) ([v3.2.4](https://github.com/conventional-changelog/conventional-changelog/tree/v3.2.4)), distributed under the [MIT License](https://github.com/conventional-changelog/conventional-changelog/blob/v3.2.4/LICENSE.md):
+
+```
+### MIT License
+
+Copyright © [conventional-changelog team](https://github.com/conventional-changelog)
+
+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.
+
+```
+
 ### eslint-config-prettier
 
 This product includes source derived from [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) ([v8.5.0](https://github.com/prettier/eslint-config-prettier/tree/v8.5.0)), distributed under the [MIT License](https://github.com/prettier/eslint-config-prettier/blob/v8.5.0/LICENSE):
@@ -2631,6 +2745,35 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ```
 
+### git-raw-commits
+
+This product includes source derived from [git-raw-commits](https://github.com/conventional-changelog/conventional-changelog) ([v2.0.11](https://github.com/conventional-changelog/conventional-changelog/tree/v2.0.11)), distributed under the [MIT License](https://github.com/conventional-changelog/conventional-changelog/blob/v2.0.11/LICENSE.md):
+
+```
+### MIT License
+
+Copyright © [conventional-changelog team](https://github.com/conventional-changelog)
+
+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.
+
+```
+
 ### glob
 
 This product includes source derived from [glob](https://github.com/isaacs/node-glob) ([v7.2.3](https://github.com/isaacs/node-glob/tree/v7.2.3)), distributed under the [ISC License](https://github.com/isaacs/node-glob/blob/v7.2.3/LICENSE):
@@ -9303,7 +9446,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ### testdouble
 
-This product includes source derived from [testdouble](https://github.com/testdouble/testdouble.js) ([v3.16.6](https://github.com/testdouble/testdouble.js/tree/v3.16.6)), distributed under the [MIT License](https://github.com/testdouble/testdouble.js/blob/v3.16.6/LICENSE.txt):
+This product includes source derived from [testdouble](https://github.com/testdouble/testdouble.js) ([v3.17.2](https://github.com/testdouble/testdouble.js/tree/v3.17.2)), distributed under the [MIT License](https://github.com/testdouble/testdouble.js/blob/v3.17.2/LICENSE.txt):
 
 ```
 The MIT License (MIT)

package/lib/config/index.js

@@ -30,7 +30,6 @@ const configDefinition = definition()
  */
 const AZURE_APP_NAME = 'APP_POOL_ID'
 const DEFAULT_MAX_PAYLOAD_SIZE_IN_BYTES = 1000000
-const DEFAULT_CONFIG_PATH = require.resolve('./default')
 const BASE_CONFIG_PATH = require.resolve('../../newrelic')
 const HAS_ARBITRARY_KEYS = new Set(['ignore_messages', 'expected_messages', 'labels'])
 
@@ -75,11 +74,7 @@ function Config(config) {
   EventEmitter.call(this)
 
   // 1. start by cloning the defaults
-  try {
-    Object.assign(this, defaultConfig())
-  } catch (err) {
-    logger.warn('Unable to clone the default config, %s: %s', DEFAULT_CONFIG_PATH, err)
-  }
+  Object.assign(this, defaultConfig())
 
   // 2. initialize undocumented, internal-only default values
 
@@ -726,11 +721,6 @@ function _validateThenUpdateErrorMessages(remote, local, remoteKey, localKey) {
     return
   }
 
-  if (!valueToTest) {
-    logger.warn('SSC ignore|expect_message is null or undefined, will not merge')
-    return
-  }
-
   let valid = true
   Object.keys(valueToTest).forEach(function validateArray(key) {
     const arrayToTest = valueToTest[key]

package/lib/instrumentation/@prisma/client.js

@@ -13,17 +13,42 @@ const parseSql = require('../../db/query-parsers/sql')
 const RAW_COMMANDS = ['executeRaw', 'queryRaw']
 
 const semver = require('semver')
+const { getSchema } = require('@mrleebo/prisma-ast')
 
 /**
- * Extracts the connection url from env var or the .value prop
- * Very similar to this helper: https://github.com/prisma/prisma/blob/main/packages/internals/src/utils/parseEnvValue.ts
+ * The library we use to parse the prisma schema retains double quotes around
+ * strings, and they need to be stripped
  *
- * @param {string} datasource object from prisma config { url, fromEnvVar }
- * @returns {string} connection string
+ * @param {string} [str=''] string to strip double-quotes from
+ * @returns {string} stripped string
  */
-function extractConnectionString(datasource = {}) {
-  return process.env[datasource.fromEnvVar] || datasource.value
+function trimQuotes(str = '') {
+  return str.match(/"(.*)"/)[1]
 }
+
+/**
+ * You can set the connection string in schema as raw string,
+ * env var mapping, or an override at client instantiation time.
+ *
+ * @param {*} url string/object value of url in datsource stanza of schema
+ * @param {string} overrideUrl value of url in overrides at client instantiation
+ * @returns {string} properly parsed connection url
+ */
+function parseDataModelUrl(url, overrideUrl) {
+  let parsedUrl = ''
+
+  if (overrideUrl) {
+    parsedUrl = overrideUrl
+  } else if (typeof url === 'string') {
+    parsedUrl = trimQuotes(url)
+  } else if (url.name && url.name === 'env') {
+    const envVar = trimQuotes(url.params[0])
+    parsedUrl = process.env[envVar]
+  }
+
+  return parsedUrl
+}
+
 /**
  * Parses a connection string. Most database engines in prisma are SQL and all
  * have similar engine strings.
@@ -31,12 +56,10 @@ function extractConnectionString(datasource = {}) {
  * **Note**: This will not parse ms sql server, instead will log a warning
  *
  * @param {string} provider prisma provider(i.e. mysql, postgres, mongodb)
- * @param {string} datasource object from prisma config { url, fromEnvVar }
+ * @param {string} connectionUrl connection string to db
  * @returns {object} { host, port, dbName }
  */
-function parseConnectionString(provider, datasource) {
-  const connectionUrl = extractConnectionString(datasource)
-
+function parseConnectionString(provider, connectionUrl) {
   let parameters = {}
   try {
     const parsedUrl = new URL(connectionUrl)
@@ -124,24 +147,23 @@ function queryParser(query) {
 }
 
 /**
- * Extracts the prisma connection information from the engine. In pre 4.11.0 this existed
- * on a different object and was also a promise.
+ * Extracts the prisma connection information from the engine. This used to use
+ * prisma functions available on engine `getConfig` but that's no longer accessible.
+ * Instead we went the route of parsing the schema DSL.
  *
  * @param {object} client prisma client instance
- * @param {string} pkgVersion prisma version
- * @returns {Promise} returns prisma connection configuration
+ * @returns {Promise} returns prisma datasource connection configuration { provider, url }
  */
-function extractPrismaConfig(client, pkgVersion) {
-  if (semver.gte(pkgVersion, '4.11.0')) {
-    // wait for the library promise to resolve before getting the config
-    return client._engine.libraryInstantiationPromise.then(() => {
-      return client._engine.library.getConfig({
-        datamodel: client._engine.datamodel,
-        ignoreEnvVarErrors: true
-      })
-    })
+function extractPrismaDatasource(client) {
+  const { datamodel, datasourceOverrides: overrides } = client._engine
+  const schema = getSchema(datamodel)
+  const datasource = schema.list.filter(({ type }) => type === 'datasource')[0]
+  const urlData = datasource.assignments.filter(({ key }) => key === 'url')[0].value
+  const url = parseDataModelUrl(urlData, overrides[datasource.name])
+  return {
+    provider: trimQuotes(datasource.assignments.filter(({ key }) => key === 'provider')[0].value),
+    url
   }
-  return client._engine.getConfig()
 }
 
 /**
@@ -179,11 +201,10 @@ module.exports = async function initialize(_agent, prisma, _moduleName, shim) {
          * Adds the relevant host, port, database_name parameters
          * to the active segment
          */
-        inContext: async function inContext() {
+        inContext: function inContext() {
           if (!client[prismaConnection]) {
             try {
-              const prismaConfig = await extractPrismaConfig(client, pkgVersion)
-              const activeDatasource = prismaConfig?.datasources[0]
+              const activeDatasource = extractPrismaDatasource(client)
               const dbParams = parseConnectionString(
                 activeDatasource?.provider,
                 activeDatasource?.url

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "10.1.0",
+  "version": "10.1.1",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [
@@ -182,6 +182,7 @@
   "dependencies": {
     "@grpc/grpc-js": "^1.8.10",
     "@grpc/proto-loader": "^0.7.5",
+    "@mrleebo/prisma-ast": "^0.5.2",
     "@newrelic/aws-sdk": "^5.0.2",
     "@newrelic/koa": "^7.1.1",
     "@newrelic/superagent": "^6.0.0",
@@ -211,6 +212,9 @@
     "chai": "^4.1.2",
     "clean-jsdoc-theme": "^4.2.4",
     "commander": "^7.0.0",
+    "conventional-changelog-conventionalcommits": "^5.0.0",
+    "conventional-changelog-writer": "^5.0.1",
+    "conventional-commits-parser": "^3.2.4",
     "eslint": "^8.24.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-disable": "^2.0.1",
@@ -220,6 +224,7 @@
     "eslint-plugin-prettier": "^3.4.0",
     "eslint-plugin-sonarjs": "^0.18.0",
     "express": "*",
+    "git-raw-commits": "^2.0.11",
     "glob": "^7.1.2",
     "got": "^11.8.5",
     "husky": "^6.0.0",
@@ -236,7 +241,7 @@
     "sinon": "^4.5.0",
     "tap": "^16.3.4",
     "temp": "^0.8.1",
-    "testdouble": "^3.16.6",
+    "testdouble": "3.17.2",
     "when": "*"
   },
   "repository": {