newrelic 10.6.1 → 10.6.2

package/NEWS.md

@@ -1,35 +1,51 @@
-### v10.6.1 (2023-08-01)
-
-#### Security Improvements
-
-* updated ESM loader to track instrumentation by url in a map instead of in url to avoid remote code execution. ([#1741](https://github.com/newrelic/node-newrelic/pull/1741)) ([c8dc779](https://github.com/newrelic/node-newrelic/commit/c8dc779c7799b234290b6f7eb1d0a4e07d692ef9))
-
-### 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.6.2 (2023-08-07)
+
+#### Bug Fixes
+
+* added defensive code around JSON.parse in formatting pino log lines because pino can return invalid json ([#1750](https://github.com/newrelic/node-newrelic/pull/1750)) ([8f2e11a](https://github.com/newrelic/node-newrelic/commit/8f2e11ab0d018d2a99b928cd3ec189a74ff8d6d6))
+
+#### Miscellaneous Chores
+
+* **deps:** Updated @newrelic/security-agent to v0.2.1 ([#1754](https://github.com/newrelic/node-newrelic/pull/1754)) ([0d04f14](https://github.com/newrelic/node-newrelic/commit/0d04f14f1383d903b4c30a787c4079b3dec01323))
+* Fix smoke tests node 20 ([#1745](https://github.com/newrelic/node-newrelic/pull/1745)) ([8c053e0](https://github.com/newrelic/node-newrelic/commit/8c053e00e289f214105fc3919b206ac160e81a2d))
+* fixed typos in lib/config/index.js comments ([#1749](https://github.com/newrelic/node-newrelic/pull/1749)) ([9000a14](https://github.com/newrelic/node-newrelic/commit/9000a14a48ba6c29ac6b7f0ffeb94eace9d4a37a))
+
+#### Tests
+
+* Added a full suite of unit tests for the collector/http-agents ([#1748](https://github.com/newrelic/node-newrelic/pull/1748)) ([9d4201b](https://github.com/newrelic/node-newrelic/commit/9d4201b9035dc629bd4f4a1c0ea72a6e14172356))
+
+### v10.6.1 (2023-08-01)
+
+#### Security Improvements
+
+* updated ESM loader to track instrumentation by url in a map instead of in url to avoid remote code execution. ([#1741](https://github.com/newrelic/node-newrelic/pull/1741)) ([c8dc779](https://github.com/newrelic/node-newrelic/commit/c8dc779c7799b234290b6f7eb1d0a4e07d692ef9))
+
+### 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

@@ -34,7 +34,6 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 
 * [@newrelic/eslint-config](#newreliceslint-config)
 * [@newrelic/newrelic-oss-cli](#newrelicnewrelic-oss-cli)
-* [@newrelic/proxy](#newrelicproxy)
 * [@newrelic/test-utilities](#newrelictest-utilities)
 * [@octokit/rest](#octokitrest)
 * [@slack/bolt](#slackbolt)
@@ -66,6 +65,7 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 * [memcached](#memcached)
 * [nock](#nock)
 * [prettier](#prettier)
+* [proxy](#proxy)
 * [proxyquire](#proxyquire)
 * [q](#q)
 * [rimraf](#rimraf)
@@ -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.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):
+This product includes source derived from [@newrelic/security-agent](https://github.com/newrelic/csec-node-agent) ([v0.2.1](https://github.com/newrelic/csec-node-agent/tree/v0.2.1)), distributed under the [New Relic Pre-Release License](https://github.com/newrelic/csec-node-agent/blob/v0.2.1/LICENSE):
 
 ```
 ## New Relic Pre-Release Software Notice
@@ -1273,7 +1273,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ### https-proxy-agent
 
-This product includes source derived from [https-proxy-agent](https://github.com/TooTallNate/node-https-proxy-agent) ([v5.0.1](https://github.com/TooTallNate/node-https-proxy-agent/tree/v5.0.1)), distributed under the [MIT License](https://github.com/TooTallNate/node-https-proxy-agent/blob/v5.0.1/README.md):
+This product includes source derived from [https-proxy-agent](https://github.com/TooTallNate/proxy-agents) ([v7.0.1](https://github.com/TooTallNate/proxy-agents/tree/v7.0.1)), distributed under the [MIT License](https://github.com/TooTallNate/proxy-agents/blob/v7.0.1/README.md):
 
 ```
 MIT License
@@ -1395,7 +1395,7 @@ IN THE SOFTWARE.
 
 ### semver
 
-This product includes source derived from [semver](https://github.com/npm/node-semver) ([v7.5.3](https://github.com/npm/node-semver/tree/v7.5.3)), distributed under the [ISC License](https://github.com/npm/node-semver/blob/v7.5.3/LICENSE):
+This product includes source derived from [semver](https://github.com/npm/node-semver) ([v7.5.4](https://github.com/npm/node-semver/tree/v7.5.4)), distributed under the [ISC License](https://github.com/npm/node-semver/blob/v7.5.4/LICENSE):
 
 ```
 The ISC License
@@ -1866,22 +1866,6 @@ This product includes source derived from [@newrelic/newrelic-oss-cli](https://g
    limitations under the License.
 ```
 
-### @newrelic/proxy
-
-This product includes source derived from [@newrelic/proxy](https://github.com/newrelic/proxy) ([v2.0.0](https://github.com/newrelic/proxy/tree/v2.0.0)), distributed under the [MIT License](https://github.com/newrelic/proxy/blob/v2.0.0/README.md):
-
-```
-MIT License
-
-Copyright (c) <year> <copyright holders>
-
-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/test-utilities
 
 This product includes source derived from [@newrelic/test-utilities](https://github.com/newrelic/node-test-utilities) ([v7.3.2](https://github.com/newrelic/node-test-utilities/tree/v7.3.2)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-test-utilities/blob/v7.3.2/LICENSE):
@@ -9271,6 +9255,22 @@ By: Ika
 
 ```
 
+### proxy
+
+This product includes source derived from [proxy](https://github.com/TooTallNate/proxy-agents) ([v2.1.1](https://github.com/TooTallNate/proxy-agents/tree/v2.1.1)), distributed under the [MIT License](https://github.com/TooTallNate/proxy-agents/blob/v2.1.1/README.md):
+
+```
+MIT License
+
+Copyright (c) <year> <copyright holders>
+
+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.
+```
+
 ### proxyquire
 
 This product includes source derived from [proxyquire](https://github.com/thlorenz/proxyquire) ([v1.8.0](https://github.com/thlorenz/proxyquire/tree/v1.8.0)), distributed under the [MIT License](https://github.com/thlorenz/proxyquire/blob/v1.8.0/LICENSE):

package/lib/aggregators/log-aggregator.js

@@ -41,13 +41,21 @@ class LogAggregator extends EventAggregator {
      *  some "log lines" are a function that formats the
      *  data accordingly into an Object, I know, this sucks.
      */
-    const formattedLogs = logs.map((logLine) => {
-      if (typeof logLine === 'function') {
-        return logLine()
-      }
+    const formattedLogs = logs
+      .map((logLine) => {
+        if (typeof logLine === 'function') {
+          return logLine()
+        }
+
+        return logLine
+      })
+      .filter(Boolean)
+
+    if (!formattedLogs.length) {
+      logger.debug('No log events to send after formatting.')
+      return
+    }
 
-      return logLine
-    })
     return [{ logs: formattedLogs }]
   }
 

package/lib/collector/http-agents.js

@@ -5,8 +5,7 @@
 
 'use strict'
 
-const parse = require('url').parse
-const ProxyAgent = require('https-proxy-agent')
+const { HttpsProxyAgent } = require('https-proxy-agent')
 const logger = require('../logger').child({ component: 'http-agent' })
 const https = require('https')
 
@@ -52,66 +51,34 @@ exports.proxyAgent = function proxyAgent(config) {
   if (null !== agentProxyWithKeepAlive) {
     return agentProxyWithKeepAlive
   }
-  const opts = proxyOptions(config)
-  const proxyUrl = opts.proxy_url
+  const proxyUrl = proxyOptions(config)
 
   const proxyOpts = {
-    host: proxyUrl.host,
-    port: proxyUrl.port,
-    protocol: proxyUrl.protocol,
     secureEndpoint: config.ssl,
     auth: proxyUrl.auth,
-    ca: opts.certificates,
+    ca: config?.certificates?.length ? config.certificates : [],
     keepAlive: true
   }
 
-  logger.info(
-    {
-      host: proxyOpts.host,
-      port: proxyOpts.port,
-      auth: !!proxyOpts.auth,
-      protocol: proxyUrl.protocol
-    },
-    'using proxy'
-  )
-
-  agentProxyWithKeepAlive = new ProxyAgent(proxyOpts)
+  logger.info(`using proxy: ${proxyUrl}`)
+  agentProxyWithKeepAlive = new HttpsProxyAgent(proxyUrl, proxyOpts)
   return agentProxyWithKeepAlive
 }
 
 function proxyOptions(config) {
   let proxyUrl
   if (config.proxy) {
-    const parsedUrl = parse(config.proxy)
-
-    proxyUrl = {
-      protocol: parsedUrl.protocol || 'https:',
-      host: parsedUrl.hostname,
-      port: parsedUrl.port || 80,
-      auth: parsedUrl.auth
-    }
+    proxyUrl = config.proxy
   } else {
+    proxyUrl = 'https://'
     let proxyAuth = config.proxy_user
     if (config.proxy_pass !== '') {
       proxyAuth += ':' + config.proxy_pass
+      proxyUrl += `${proxyAuth}@`
     }
 
-    // Unless a proxy config is provided, default to HTTP.
-    proxyUrl = {
-      protocol: 'https:',
-      host: config.proxy_host || 'localhost',
-      port: config.proxy_port || 80,
-      auth: proxyAuth
-    }
-  }
-
-  const opts = {
-    proxy_url: proxyUrl
-  }
-
-  if (config.certificates && config.certificates.length > 0) {
-    opts.certificates = config.certificates
+    proxyUrl += `${config.proxy_host || 'localhost'}:${config.proxy_port || 80}`
   }
 
-  return opts
+  return proxyUrl
 }

package/lib/config/index.js

@@ -833,7 +833,7 @@ Config.prototype.logUnknown = function logUnknown(json, key) {
 /**
  * Gets the user set host display name. If not provided, it returns the default value.
  *
- * This function is written is this strange way becauase of the use of caching variables.
+ * This function is written is this strange way because of the use of caching variables.
  * I wanted to cache the DisplayHost, but if I attached the variable to the config object,
  * it sends the extra variable to New Relic, which is not desired.
  *
@@ -869,9 +869,9 @@ function getDisplayHost() {
 
 /**
  * Gets the system's host name. If that fails, it just returns ipv4/6 based on the user's
- * process_host.ipv_preferenece setting.
+ * process_host.ipv_preference setting.
  *
- * This function is written is this strange way becauase of the use of caching variables.
+ * This function is written is this strange way because of the use of caching variables.
  * I wanted to cache the Hostname, but if I attached the variable to the config object,
  * it sends the extra variable to New Relic, which is not desired.
  *
@@ -1235,7 +1235,7 @@ Config.prototype._serverlessDT = function _serverlessDT() {
 /**
  * In serverless mode we allow defer auth to the downstream serverless entities.
  * This means we set account_id, primary_application_id, and trusted_account_key in configuration.
- * This function sets all those to null because this.serverles_mode.enabled is falsey.
+ * This function sets all those to null because this.serverless_mode.enabled is falsey.
  *
  * @returns {void}
  */
@@ -1654,7 +1654,7 @@ Config.prototype._warnDeprecations = function _warnDeprecations() {
  *   5. If this module is installed as a dependency, the directory above the
  *      node_modules folder in which newrelic is installed.
  *
- * When node process environment varaibles and a config file are used,
+ * When node process environment variables and a config file are used,
  * the environment variables will override their corresponding
  * configuration file settings.
  *
@@ -1711,7 +1711,7 @@ function initialize(config) {
         `Unable to read existing configuration file "${filepath}".`,
         'To allow reading of the file (if desired),',
         'please ensure the application has read access and the file is exporting valid JSON.',
-        'Attempting to start agent using enviornment variables.'
+        'Attempting to start agent using environment variables.'
       ].join(' ')
     )
   }

package/lib/instrumentation/pino/pino.js

@@ -81,7 +81,14 @@ module.exports = function instrument(shim) {
 
       if (isLogForwardingEnabled(config, agent)) {
         const chindings = this[symbols.chindingsSym]
-        const formatLogLine = reformatLogLine({ msg: args[1], logLine, agent, chindings, levelMap })
+        const formatLogLine = reformatLogLine({
+          msg: args[1],
+          logLine,
+          agent,
+          chindings,
+          levelMap,
+          logger: shim.logger
+        })
 
         agent.logs.add(formatLogLine)
       }
@@ -104,8 +111,9 @@ module.exports = function instrument(shim) {
  * @param logLine.chindings
  * @param logLine.msg
  * @param logLine.levelMap
+ * @param logLine.logger
  */
-function reformatLogLine({ logLine, msg, agent, chindings = '', levelMap }) {
+function reformatLogLine({ logLine, msg, agent, chindings = '', levelMap, logger }) {
   const metadata = agent.getLinkingMetadata()
 
   /**
@@ -125,7 +133,14 @@ function reformatLogLine({ logLine, msg, agent, chindings = '', levelMap }) {
    * context metadata and rename the time/msg keys to timestamp/message
    */
   return function formatLogLine() {
-    const formattedLog = JSON.parse(logLine)
+    let formattedLog
+    try {
+      formattedLog = JSON.parse(logLine)
+    } catch (err) {
+      logger.error('Failed to parse log line as json: %s', err.message)
+      return
+    }
+
     if (formattedLog.err) {
       reformatError(formattedLog)
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "10.6.1",
+  "version": "10.6.2",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [
@@ -185,11 +185,11 @@
     "@mrleebo/prisma-ast": "^0.5.2",
     "@newrelic/aws-sdk": "^6.0.0",
     "@newrelic/koa": "^7.1.1",
-    "@newrelic/security-agent": "0.2.0",
+    "@newrelic/security-agent": "0.2.1",
     "@newrelic/superagent": "^6.0.0",
     "@tyriar/fibonacci-heap": "^2.0.7",
     "concat-stream": "^2.0.0",
-    "https-proxy-agent": "^5.0.0",
+    "https-proxy-agent": "^7.0.1",
     "json-bigint": "^1.0.0",
     "json-stringify-safe": "^5.0.0",
     "readable-stream": "^3.6.1",
@@ -203,7 +203,6 @@
   "devDependencies": {
     "@newrelic/eslint-config": "^0.3.0",
     "@newrelic/newrelic-oss-cli": "^0.1.2",
-    "@newrelic/proxy": "^2.0.0",
     "@newrelic/test-utilities": "^7.3.2",
     "@octokit/rest": "^18.0.15",
     "@slack/bolt": "^3.7.0",
@@ -235,6 +234,7 @@
     "memcached": ">=0.2.8",
     "nock": "11.8.0",
     "prettier": "^2.3.2",
+    "proxy": "^2.1.1",
     "proxyquire": "^1.8.0",
     "q": "*",
     "rimraf": "^2.6.3",