newrelic 10.4.2 → 10.6.0

package/NEWS.md

@@ -1,3 +1,29 @@
+### v10.6.0 (2023-07-26)
+
+#### Miscellaneous Chores
+
+* **deps:** Updated @newrelic/security-agent to v0.2.0 ([#1737](https://github.com/newrelic/node-newrelic/pull/1737)) ([9bf2a01](https://github.com/newrelic/node-newrelic/commit/9bf2a011aed846a024d6445f557eb8eb7d2e5efe))
+* restored engines to >=14 until we actually drop support for Node 14 ([#1738](https://github.com/newrelic/node-newrelic/pull/1738)) ([8d66123](https://github.com/newrelic/node-newrelic/commit/8d66123105d25a3f949f0f5c2db53ecb7e9f2df0))
+
+#### Continuous Integration
+
+* Add Node.js 20.x to CI and remove 14.x ([#1603](https://github.com/newrelic/node-newrelic/pull/1603)) ([c4b008c](https://github.com/newrelic/node-newrelic/commit/c4b008c98c758ba3e669768a840e40dd8fe3e681))
+* update support statement ([#1733](https://github.com/newrelic/node-newrelic/pull/1733)) ([3013da9](https://github.com/newrelic/node-newrelic/commit/3013da977ed6dae70bef81b1f1cf0dbf4acbb37b))
+
+### v10.5.0 (2023-07-20)
+
+#### Features
+
+* enabled code_level_metrics by default ([#1723](https://github.com/newrelic/node-newrelic/pull/1723)) ([0b96de3](https://github.com/newrelic/node-newrelic/commit/0b96de3fbf8db7be7d3673e29bab706d1d67de42))
+
+#### Bug Fixes
+
+* prevent ESM loader from loading instrumentation multiple times ([#1729](https://github.com/newrelic/node-newrelic/pull/1729)) ([962d172](https://github.com/newrelic/node-newrelic/commit/962d172aa5a9496041fe40e73ab8d183db94bae7))
+
+#### Miscellaneous Chores
+
+* **deps-dev:** bump word-wrap from 1.2.3 to 1.2.4 ([#1730](https://github.com/newrelic/node-newrelic/pull/1730)) ([500a69e](https://github.com/newrelic/node-newrelic/commit/500a69e6c9e94e4073805630e6d380f349d91689))
+
 ### v10.4.2 (2023-07-13)
 
 #### Bug Fixes

package/THIRD_PARTY_NOTICES.md

@@ -953,7 +953,7 @@ Apache License
 
 ### @newrelic/security-agent
 
-This product includes source derived from [@newrelic/security-agent](https://github.com/newrelic/csec-node-agent) ([v0.1.3](https://github.com/newrelic/csec-node-agent/tree/v0.1.3)), distributed under the [New Relic Pre-Release License](https://github.com/newrelic/csec-node-agent/blob/v0.1.3/LICENSE):
+This product includes source derived from [@newrelic/security-agent](https://github.com/newrelic/csec-node-agent) ([v0.2.0](https://github.com/newrelic/csec-node-agent/tree/v0.2.0)), distributed under the [New Relic Pre-Release License](https://github.com/newrelic/csec-node-agent/blob/v0.2.0/LICENSE):
 
 ```
 ## New Relic Pre-Release Software Notice

package/esm-loader.mjs

@@ -66,9 +66,16 @@ export async function resolve(specifier, context, nextResolve) {
     const { url, format } = resolvedModule
     logger.debug(`Instrumentation exists for ${specifier} ${format} package.`)
 
-    if (format === 'commonjs') {
+    if (registeredSpecifiers.get(url)) {
+      logger.debug(
+        `Instrumentation already registered for ${specifier} under ${fileURLToPath(
+          url
+        )}, skipping resolve hook...`
+      )
+    } else if (format === 'commonjs') {
       // ES Modules translate import statements into fully qualified filepaths, so we create a copy of our instrumentation under this filepath
       const instrumentationDefinitionCopy = [...instrumentationDefinition]
+
       instrumentationDefinitionCopy.forEach((copy) => {
         // Stripping the prefix is necessary because the code downstream gets this url without it
         copy.moduleName = fileURLToPath(url)
@@ -80,6 +87,9 @@ export async function resolve(specifier, context, nextResolve) {
           `Registered CommonJS instrumentation for ${specifier} under ${copy.moduleName}`
         )
       })
+
+      // Keep track of what we've registered so we don't double register (see: https://github.com/newrelic/node-newrelic/issues/1646)
+      registeredSpecifiers.set(url, specifier)
     } else if (format === 'module') {
       registeredSpecifiers.set(url, specifier)
       const modifiedUrl = new URL(url)

package/index.js

@@ -53,8 +53,8 @@ function initialize() {
       throw new Error(message)
     }
 
-    // TODO: Update this check when Node v20 support is added
-    if (psemver.satisfies('>=19.0.0')) {
+    // TODO: Update this check when Node v22 support is added
+    if (psemver.satisfies('>=21.0.0')) {
       logger.warn(
         'New Relic for Node.js %s has not been tested on Node.js %s. Please ' +
           'update the agent or downgrade your version of Node.js',

package/lib/config/default.js

@@ -1221,7 +1221,7 @@ defaultConfig.definition = () => ({
   code_level_metrics: {
     enabled: {
       formatter: boolean,
-      default: false
+      default: true
     }
   },
 

package/lib/environment.js

@@ -12,6 +12,7 @@ const logger = require('./logger').child({ component: 'environment' })
 const stringify = require('json-stringify-safe')
 const asyncEachLimit = require('./util/async-each-limit')
 const DISPATCHER_VERSION = 'Dispatcher Version'
+const semver = require('semver')
 
 // As of 1.7.0 you can no longer dynamically link v8
 // https://github.com/nodejs/io.js/commit/d726a177ed
@@ -260,7 +261,7 @@ function flattenVersions(packages) {
       try {
         return stringify(pair)
       } catch (err) {
-        logger.debug(err, 'Unabled to stringify package version')
+        logger.debug(err, 'Unable to stringify package version')
         return '<unknown>'
       }
     })
@@ -291,6 +292,19 @@ function remapConfigSettings() {
         addSetting(remapping[key], value)
       }
     })
+
+    maybeAddMissingProcessVars()
+  }
+}
+
+/**
+ * As of Node 19 DTrace and ETW are no longer bundled
+ * see: https://nodejs.org/en/blog/announcements/v19-release-announce#dtrace/systemtap/etw-support
+ */
+function maybeAddMissingProcessVars() {
+  if (semver.gte(process.version, '19.0.0')) {
+    addSetting(remapping.node_use_dtrace, 'no')
+    addSetting(remapping.node_use_etw, 'no')
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "10.4.2",
+  "version": "10.6.0",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [
@@ -168,13 +168,11 @@
     "versioned-tests": "./bin/run-versioned-tests.sh",
     "update-changelog-version": "node ./bin/update-changelog-version",
     "checkout-external-versioned": "node ./test/versioned-external/checkout-external-tests.js",
-    "versioned": "npm run versioned:npm7",
-    "versioned:major": "VERSIONED_MODE=--major npm run versioned:npm7",
-    "versioned:npm6": "npm run checkout-external-versioned && npm run prepare-test && time ./bin/run-versioned-tests.sh",
-    "versioned:npm7": "npm run checkout-external-versioned && npm run prepare-test && NPM7=1 time ./bin/run-versioned-tests.sh",
-    "versioned:async-local": "NEW_RELIC_FEATURE_FLAG_ASYNC_LOCAL_CONTEXT=1 npm run versioned:npm7",
+    "versioned:major": "VERSIONED_MODE=--major npm run versioned",
+    "versioned": "npm run checkout-external-versioned && npm run prepare-test && NPM7=1 time ./bin/run-versioned-tests.sh",
+    "versioned:async-local": "NEW_RELIC_FEATURE_FLAG_ASYNC_LOCAL_CONTEXT=1 npm run versioned",
     "versioned:async-local:major": "NEW_RELIC_FEATURE_FLAG_ASYNC_LOCAL_CONTEXT=1 npm run versioned:major",
-    "versioned:security": "NEW_RELIC_SECURITY_AGENT_ENABLED=true npm run versioned:npm7",
+    "versioned:security": "NEW_RELIC_SECURITY_AGENT_ENABLED=true npm run versioned",
     "versioned:security:major": "NEW_RELIC_SECURITY_AGENT_ENABLED=true npm run versioned:major",
     "prepare": "husky install"
   },
@@ -187,7 +185,7 @@
     "@mrleebo/prisma-ast": "^0.5.2",
     "@newrelic/aws-sdk": "^6.0.0",
     "@newrelic/koa": "^7.1.1",
-    "@newrelic/security-agent": "0.1.3",
+    "@newrelic/security-agent": "0.2.0",
     "@newrelic/superagent": "^6.0.0",
     "@tyriar/fibonacci-heap": "^2.0.7",
     "concat-stream": "^2.0.0",