newrelic 9.7.3 → 9.7.5

package/NEWS.md

@@ -1,3 +1,15 @@
+### v9.7.5 (2023-01-03)
+
+* Added a check to the code level metrics utility to ensure filePath was set before adding the `code.*` attributes.
+
+* Updated to latest version of `@newrelic/test-utilities`
+
+* Fixed issue where listing of dependencies and packages from symlinked nested directories created an infinite loop which caused the agent to never connect.
+
+### v9.7.4 (2022-12-15)
+
+* Fixed system info gathering to prevent unhandled promise rejection when an error occurs reading `/proc` information.
+
 ### v9.7.3 (2022-12-12)
 
 * Added support for Code Level Metrics on API methods: `startSegment`, `startBackgroundTransaction`, and `startWebTransaction`.

package/THIRD_PARTY_NOTICES.md

@@ -1771,7 +1771,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ### @newrelic/test-utilities
 
-This product includes source derived from [@newrelic/test-utilities](https://github.com/newrelic/node-test-utilities) ([v7.1.1](https://github.com/newrelic/node-test-utilities/tree/v7.1.1)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-test-utilities/blob/v7.1.1/LICENSE):
+This product includes source derived from [@newrelic/test-utilities](https://github.com/newrelic/node-test-utilities) ([v7.2.0](https://github.com/newrelic/node-test-utilities/tree/v7.2.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-test-utilities/blob/v7.2.0/LICENSE):
 
 ```
                                  Apache License

package/lib/environment.js

@@ -139,7 +139,9 @@ async function listDependencies(root, children = [], visited = Object.create(nul
       // Make sure we haven't been to this directory before.
       if (visited[realCandidate]) {
         logger.trace('Not revisiting %s (from %s)', realCandidate, candidate)
+        return
       }
+
       visited[realCandidate] = true
 
       // Load the packages and dependencies for this directory.

package/lib/system-info.js

@@ -214,7 +214,7 @@ module.exports._getProcessorStats = async function getProcessorStats() {
 
     return processorStats
   } else if (platform.match(/linux/i)) {
-    const data = await readProc('/proc/cpuinfo')
+    const data = await getProcInfo('/proc/cpuinfo')
 
     return parseCpuInfo(data)
   }
@@ -237,7 +237,7 @@ module.exports._getMemoryStats = async function getMemoryStats() {
     const memory = await getSysctlValue(['hw.realmem'])
     return parseInt(memory, 10) / (1024 * 1024)
   } else if (platform.match(/linux/i)) {
-    const data = await readProc('/proc/meminfo')
+    const data = await getProcInfo('/proc/meminfo')
     return parseMemInfo(data)
   }
 
@@ -254,7 +254,7 @@ async function getKernelVersion() {
   if (platform.match(/darwin/i) || platform.match(/bsd/i)) {
     return await getSysctlValue(['kern.version'])
   } else if (platform.match(/linux/i)) {
-    return await readProc('/proc/version')
+    return await getProcInfo('/proc/version')
   }
 
   logger.debug('Unknown platform: %s; could not read kernel version', platform)
@@ -294,3 +294,18 @@ async function getSysctlValue(names = []) {
 
   return returnValue
 }
+
+/**
+ * Helper method for getting /proc/* file information in Linux environments
+ *
+ * @param {string} procPath - the proc file to read
+ * @returns {*} null if the lookup fails, otherwise the proc file information
+ */
+async function getProcInfo(procPath) {
+  try {
+    return await readProc(procPath)
+  } catch (err) {
+    // swallow the error if reading fails, logging handled in readProc()
+    return null
+  }
+}

package/lib/util/code-level-metrics.js

@@ -56,7 +56,7 @@ clmUtils.addCLMAttributes = function addCLMAttributes(fn, segment) {
     const { lineNumber, method, file: filePath, column } = funcInfo(fn)
     const fnName = setFunctionName(method)
 
-    if (isValidLength(fnName, 255) && isValidLength(filePath, 255)) {
+    if (isValidLength(fnName, 255) && filePath && isValidLength(filePath, 255)) {
       segment.addAttribute('code.filepath', filePath)
       segment.addAttribute('code.function', fnName)
       // both line numbers and columns start at 0 in v8, add 1 to reflect js code

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "9.7.3",
+  "version": "9.7.5",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [
@@ -200,7 +200,7 @@
     "@newrelic/eslint-config": "^0.2.0",
     "@newrelic/newrelic-oss-cli": "^0.1.2",
     "@newrelic/proxy": "^2.0.0",
-    "@newrelic/test-utilities": "^7.1.1",
+    "@newrelic/test-utilities": "^7.2.0",
     "@octokit/rest": "^18.0.15",
     "@slack/bolt": "^3.7.0",
     "ajv": "^6.12.6",