newrelic 7.3.1 → 7.5.2

package/NEWS.md

@@ -1,3 +1,67 @@
+### v7.5.2 (2021-07-07)
+
+* Fixed bug where promise-based cursor methods would not properly measure the duration of execution.
+
+### v7.5.1 (2021-06-21)
+
+* Fixed loading config from the main module's directory. Thank you @alexpls for the contribution.
+
+* Moved all integration tests that required secrets to the smoke folder.
+
+* Fixed LASP/CSP tests so they don't skip on runs where secrets are available.
+
+* Modified self-signed SSL cert to use 'localhost' instead of 'ssl.lvh.me' for SSL testing.
+
+* Removed unnecessary trace observer configuration validation for host and port.
+
+### v7.5.0 (2021-06-01)
+
+* Added default support for config files with a 'cjs' extension (`newrelic.cjs`) in addition to `newrelic.js`.
+
+  Thank you to @Maddemacher for the contribution!
+
+* Added ability to specify a custom config file name with the `NEW_RELIC_CONFIG_FILENAME` environment variable.
+
+  Thank you to @Maddemacher for the contribution!
+
+* Fixed issue when using the 'new_promise_tracking' feature flag where segment mapping may not get cleaned up for promises which never resolve but have all references removed (and thus get cleaned up by GC).
+
+  Adds segment cleanup on 'destroy' when using 'new_promise_tracking' feature flag in addition to the existing 'promiseResolve' hook. Unfortunately, preventing leaks for this edge-case does come with additional overhead due to adding another hook. Memory gains from feature flag usage should still be worth the trade-off and reduced garbage collection may offset perf/CPU impacts or event still result in net gain, depending on the application.
+
+* Bumped `@newrelic/test-utilities` to ^5.1.0.
+
+* Replaced deprecated `util.isArray` with `Array.isArray`.
+
+* Removed unused `listenerCount` method on `Shim`.
+
+* Properly bootstraped husky as a `prepare` script.
+
+* Removed commented-out console log from fastify instrumentation.
+
+### v7.4.0 (2021-05-11)
+
+* Updated third party notices and manifest for husky and lint-staged.
+
+* Updated redis versioned tests to use unique DB indexes per file to avoid collisions and flushing of in-progress tests.
+
+* Pinned hapi 17 versioned tests to only minor/patch versions within 17.x.
+
+* Bumped timeout for redis versioned tests.
+
+* Wired up husky + lint staged to execute linting on all changed files in pre-commit hook.
+
+* Handled a proxy misconfiguration of collector and log an actionable warning message.
+
+* Added `flaky_code` and `success_delay_ms` handling of flaky grpc connections to infinite tracing.
+
+* Added resources to README to highlight external modules that customers should be aware of and possibly use for their applications.
+
+* Logged all New Relic metadata env vars at startup.
+
+* Fixed images for improved reader experience.
+
+  Thank you to @henryjw for the contribution.
+
 ### v7.3.1 (2021-04-14)
 
 * Fixed issue with 'new_promise_tracking' feature flag functionality where segments for ended transactions would get propagated in certain cases by promises that had no continuations scheduled (via await or manually).

package/README.md

@@ -52,7 +52,7 @@ To use New Relic's Node.js agent entails these three steps, which are described
     /* ... the rest of your program ... */
 ```
 
-If you're compiling your JavaScript and can't control the final `require` order, the Node,js agent will work with node's `-r/--require` flag.
+If you're compiling your JavaScript and can't control the final `require` order, the Node.js agent will work with node's `-r/--require` flag.
 
     $ node -r newrelic your-program.js
     $ node --require newrelic your-program.js
@@ -61,11 +61,26 @@ If you're compiling your JavaScript and can't control the final `require` order,
 
 For more information on getting started, [check the Node.js docs](https://docs.newrelic.com/docs/agents/nodejs-agent/getting-started/introduction-new-relic-nodejs).
 
+### External Modules
+
+There are several modules that can be installed and configured to accompany the Node.js agent:
+
+ * [@newrelic/apollo-server-plugin](https://github.com/newrelic/newrelic-node-apollo-server-plugin): New Relic's official Apollo Server plugin for use with the Node.js agent.
+ * [@newrelic/winston-enricher](https://github.com/newrelic/newrelic-winston-logenricher-node): Provides distributed trace and span information output as JSON-formatted log messages.  This is most commonly used with the New Relic Logs product.
+ * [@newrelic/mysql](https://github.com/newrelic/node-newrelic-mysql)(**Experimental**): Standalone instrumentation for [mysql2](https://github.com/sidorares/node-mysql2#readme) and [mysql2/promise](https://github.com/sidorares/node-mysql2/blob/master/documentation/Promise-Wrapper.md) as well as the same instrumentation for [mysql](https://github.com/mysqljs/mysql#readme) within the Node.js agent.
+
+There are several modules included within the Node.js agent to add more instrumentation for 3rd party modules:
+
+ * [@newrelic/aws-sdk](https://github.com/newrelic/node-newrelic-aws-sdk):  Provides instrumentation for the [AWS SDK](https://www.npmjs.com/package/aws-sdk) npm package.
+ * [@newrelic/koa](https://github.com/newrelic/node-newrelic-koa): Provides instrumentation for [koa](https://koajs.com/), [koa-router](https://github.com/ZijianHe/koa-router), [@koa/router](https://github.com/koajs/router), and [koa-route](https://github.com/koajs/route) npm packages.
+ * [@newrelic/superagent](https://github.com/newrelic/node-newrelic-superagent): Provides instrumentation for [superagent](https://github.com/visionmedia/superagent) npm package.
+ * [@newrelic/native-metrics](https://github.com/newrelic/node-native-metrics): Provides hooks into the native v8 layer of Node.js to provide metrics to the Node.js agent.
+
 ## Usage
 
 ### Using the API
 
-The `newrelic` module returns an object with the Node agent's API methods attached.
+The `newrelic` module returns an object with the Node.js agent's API methods attached.
 
 ```js
     const newrelic = require('newrelic')

package/THIRD_PARTY_NOTICES.md

@@ -49,7 +49,9 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 * [glob](#glob)
 * [got](#got)
 * [http-errors](#http-errors)
+* [husky](#husky)
 * [jsdoc](#jsdoc)
+* [lint-staged](#lint-staged)
 * [memcached](#memcached)
 * [minami](#minami)
 * [mongodb](#mongodb)
@@ -1927,7 +1929,7 @@ SOFTWARE.
 
 ### commander
 
-This product includes source derived from [commander](https://github.com/tj/commander.js) ([v7.0.0](https://github.com/tj/commander.js/tree/v7.0.0)), distributed under the [MIT License](https://github.com/tj/commander.js/blob/v7.0.0/LICENSE):
+This product includes source derived from [commander](https://github.com/tj/commander.js) ([v7.2.0](https://github.com/tj/commander.js/tree/v7.2.0)), distributed under the [MIT License](https://github.com/tj/commander.js/blob/v7.2.0/LICENSE):
 
 ```
 (The MIT License)
@@ -2016,7 +2018,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ### fastify
 
-This product includes source derived from [fastify](https://github.com/fastify/fastify) ([v2.14.1](https://github.com/fastify/fastify/tree/v2.14.1)), distributed under the [MIT License](https://github.com/fastify/fastify/blob/v2.14.1/LICENSE):
+This product includes source derived from [fastify](https://github.com/fastify/fastify) ([v2.15.3](https://github.com/fastify/fastify/tree/v2.15.3)), distributed under the [MIT License](https://github.com/fastify/fastify/blob/v2.15.3/LICENSE):
 
 ```
 MIT License
@@ -2139,6 +2141,35 @@ THE SOFTWARE.
 
 ```
 
+### husky
+
+This product includes source derived from [husky](https://github.com/typicode/husky) ([v6.0.0](https://github.com/typicode/husky/tree/v6.0.0)), distributed under the [MIT License](https://github.com/typicode/husky/blob/v6.0.0/LICENSE):
+
+```
+MIT License
+
+Copyright (c) 2021 typicode
+
+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.
+
+```
+
 ### jsdoc
 
 This product includes source derived from [jsdoc](https://github.com/jsdoc/jsdoc) ([v3.6.3](https://github.com/jsdoc/jsdoc/tree/v3.6.3)), distributed under the [Apache-2.0 License](https://github.com/jsdoc/jsdoc/blob/v3.6.3/LICENSE.md):
@@ -2249,6 +2280,35 @@ https://github.com/jmblog/color-themes-for-google-code-prettify
 
 ```
 
+### lint-staged
+
+This product includes source derived from [lint-staged](https://github.com/okonet/lint-staged) ([v11.0.0](https://github.com/okonet/lint-staged/tree/v11.0.0)), distributed under the [MIT License](https://github.com/okonet/lint-staged/blob/v11.0.0/LICENSE):
+
+```
+The MIT License (MIT)
+
+Copyright (c) 2016 Andrey Okonetchnikov
+
+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.
+
+```
+
 ### memcached
 
 This product includes source derived from [memcached](https://github.com/3rd-Eden/node-memcached) ([v2.2.2](https://github.com/3rd-Eden/node-memcached/tree/v2.2.2)), distributed under the [MIT License](https://github.com/3rd-Eden/node-memcached/blob/v2.2.2/LICENSE):

package/lib/collector/api.js

@@ -117,6 +117,22 @@ CollectorAPI.prototype.connect = function connect(callback) {
     this._reqHeadersMap = null
   }
 
+  /**
+   * Checks if proxy is configured to connect via `proxy_host` and `proxy_port`
+   * and if error code is EPROTO or ECONNRESET. This is an indication their proxy
+   * server only accepts HTTP connections, and we should provide an actionable warning to
+   * fix the misconfiguration by setting `proxy` to a fully qualified URL
+   *
+   * @param {Error} error
+   * @returns {Boolean}
+   */
+  function isProxyMisconfigured(error) {
+    const config = api._agent.config
+    return error &&
+      ['EPROTO', 'ECONNRESET'].includes(error.code) &&
+      config.proxy_host && config.proxy_port && !config.proxy
+  }
+
   function retry(error, response) {
     metric.incrementCallCount()
 
@@ -142,6 +158,14 @@ CollectorAPI.prototype.connect = function connect(callback) {
         ' (status code %s)',
         response.status
       )
+    } else if (isProxyMisconfigured(error)) {
+      logger.warn(
+        error,
+        'Your proxy server appears to be configured to accept connections over http. ' +
+        'When setting `proxy_host` and `proxy_port` New Relic attempts to connect over ' +
+        'SSL(https). If your proxy is configured to accept connections over http, try ' +
+        'setting `proxy` to a fully qualified URL(e.g http://proxy-host:8080).'
+      )
     }
 
     let backoff = BACKOFFS[Math.min(attempts, max) - 1]

package/lib/collector/facts.js

@@ -55,6 +55,8 @@ function facts(agent, callback) {
       }, {})
     }
 
+    logger.debug('New Relic metadata %o', results.metadata)
+
     results.event_harvest_config = {
       harvest_limits: {
         analytic_event_data: agent.config.transaction_events.max_samples_stored,

package/lib/config/index.js

@@ -32,14 +32,6 @@ const DEFAULT_MAX_PAYLOAD_SIZE_IN_BYTES = 1000000
 const DEFAULT_CONFIG_PATH = require.resolve('./default')
 const SPAN_EVENT_LIMIT = 1000
 const BASE_CONFIG_PATH = require.resolve('../../newrelic')
-const DEFAULT_FILENAME = 'newrelic.js'
-const CONFIG_FILE_LOCATIONS = [
-  process.env.NEW_RELIC_HOME,
-  process.cwd(),
-  process.env.HOME,
-  path.join(__dirname, '../../../..') // above node_modules
-]
-
 const HAS_ARBITRARY_KEYS = new Set([
   'ignore_messages',
   'expected_messages',
@@ -54,10 +46,22 @@ const exists = fs.existsSync || path.existsSync
 let logger = null // Lazy-loaded in `initialize`.
 let _configInstance = null
 
-// the REPL has no main module
-if (process.mainModule && process.mainModule.filename) {
-  CONFIG_FILE_LOCATIONS.splice(2, 0, path.dirname(process.mainModule.filename))
-}
+const getConfigFileNames = () => [
+  process.env.NEW_RELIC_CONFIG_FILENAME,
+  'newrelic.js',
+  'newrelic.cjs'
+].filter(Boolean)
+
+const getConfigFileLocations = () => [
+  process.env.NEW_RELIC_HOME,
+  process.cwd(),
+  process.env.HOME,
+  path.join(__dirname, '../../../..'), // above node_modules
+  // the REPL has no main module
+  process.mainModule && process.mainModule.filename
+    ? path.dirname(process.mainModule.filename)
+    : undefined
+].filter(Boolean)
 
 function isTruthular(setting) {
   if (setting == null) {
@@ -89,19 +93,15 @@ function fromObjectList(setting) {
 }
 
 function _findConfigFile() {
-  var candidate
-  var filepath
-
-
-  for (var i = 0; i < CONFIG_FILE_LOCATIONS.length; i++) {
-    candidate = CONFIG_FILE_LOCATIONS[i]
-    if (!candidate) continue
+  const configFileCandidates = getConfigFileLocations().reduce((files, configPath) => {
+    const configFiles = getConfigFileNames().map(filename => 
+      path.join(path.resolve(configPath), filename)
+    )
 
-    filepath = path.join(path.resolve(candidate), DEFAULT_FILENAME)
-    if (!exists(filepath)) continue
+    return files.concat(configFiles)
+  }, [])
 
-    return fs.realpathSync(filepath)
-  }
+  return configFileCandidates.find(exists)
 }
 
 function Config(config) {

package/lib/grpc/connection.js

@@ -11,6 +11,12 @@ const logger = require('../logger').child({component: 'grpc_connection'})
 const EventEmitter = require('events')
 const NAMES = require('../metrics/names')
 const util = require('util')
+const GRPC_TEST_META = {
+  flaky: 'NEWRELIC_GRPCCONNECTION_METADATA_FLAKY',
+  delay: 'NEWRELIC_GRPCCONNECTION_METADATA_DELAY',
+  flaky_code: 'NEWRELIC_GRPCCONNECTION_METADATA_FLAKY_CODE',
+  success_delay_ms: 'NEWRELIC_GRPCCONNECTION_METADATA_SUCCESS_DELAY_MS'
+}
 
 const connectionStates = require('./connection/states')
 
@@ -163,22 +169,27 @@ class GrpcConnection extends EventEmitter {
       }
     }
 
-    // check environment variables for testing parameters and
-    // pass to server via meta-data.
-    const flaky = parseInt(env.NEWRELIC_GRPCCONNECTION_METADATA_FLAKY, 10)
-    const delay = parseInt(env.NEWRELIC_GRPCCONNECTION_METADATA_DELAY, 10)
-    if (flaky) {
-      logger.trace('Adding flaky metadata: %s', flaky)
-      metadata.add('flaky', flaky)
-    }
-    if (delay) {
-      logger.trace('Adding delay metadata: %s', delay)
-      metadata.add('delay',delay)
-    }
+    this._setTestMetadata(metadata, env)
 
     return metadata
   }
 
+  /**
+   * Adds test metadata used to simulate connectivity issues
+   * when appropriate env vars are set
+   *
+   * @param {Metadata} metadata
+   */
+  _setTestMetadata(metadata, env) {
+    for (const [key, envVar] of Object.entries(GRPC_TEST_META)) {
+      const value = parseInt(env[envVar], 10)
+      if (value) {
+        logger.trace('Adding %s metadata: %s', key, value)
+        metadata.add(key, value)
+      }
+    }
+  }
+
   /**
    * Disconnects from gRPC endpoint and schedules establishing a new connection.
    * @param {number} reconnectDelayMs number of milliseconds to wait before reconnecting.

package/lib/instrumentation/core/async_hooks.js

@@ -191,6 +191,10 @@ function getPromiseResolveStyleHooks(segmentMap, agent, shim) {
       if (hookSegment === null) {
         shim.setActiveSegment(hookSegment)
       }
+    },
+    destroy: function destroyHandler(id) {
+      // Clean up any unresolved promises that have been destroyed.
+      segmentMap.delete(id)
     }
   }
 

package/lib/instrumentation/core/http-outbound.js

@@ -10,7 +10,6 @@ var urltils = require('../../util/urltils')
 var hashes = require('../../util/hashes')
 var logger = require('../../logger').child({component: 'outbound'})
 var shimmer = require('../../shimmer')
-var util = require('util')
 var url = require('url')
 var copy = require('../../util/copy')
 
@@ -110,7 +109,7 @@ module.exports = function instrumentOutbound(agent, opts, makeRequest) {
       logger.trace('CAT disabled, not adding headers!')
     }
 
-    if (util.isArray(opts.headers)) {
+    if (Array.isArray(opts.headers)) {
       opts.headers = opts.headers.slice()
       Array.prototype.push.apply(
         opts.headers,
@@ -203,7 +202,7 @@ function handleResponse(segment, hostname, req, res) {
   // Add response attributes for spans
   segment.addSpanAttribute('http.statusCode', res.statusCode)
   segment.addSpanAttribute('http.statusText', res.statusMessage)
-  
+
   // If CAT is enabled, grab those headers!
   const agent = segment.transaction.agent
   if (

package/lib/instrumentation/core/http.js

@@ -11,7 +11,6 @@ const recordWeb = require('../../metrics/recorders/http')
 const hashes = require('../../util/hashes')
 const cat = require('../../util/cat')
 const instrumentOutbound = require('./http-outbound')
-const util = require('util')
 const url = require('url')
 const urltils = require('../../util/urltils')
 const properties = require('../../util/properties')
@@ -606,7 +605,7 @@ function parseSyntheticsHeader(header, encKey, trustedIds) {
     return
   }
 
-  if (!util.isArray(synthData)) {
+  if (!Array.isArray(synthData)) {
     logger.trace(
       'Synthetics data is not an array: %s (%s)',
       synthData,

package/lib/instrumentation/fastify.js

@@ -54,7 +54,7 @@ const setupMiddlewareHandlers = (shim, fastify) => {
       )
       // replace original function with our function
       args[0] = newMiddlewareFunction
-      // console.log(middlewareFunction.__NR_original)
+
       return fn.apply(this, args)
     }
   })

package/lib/instrumentation/mongodb.js

@@ -288,7 +288,7 @@ function makeQueryDescFunc(shim, methodName) {
     // segment name does not actually use query string
     // method name is set as query so the query parser has access to the op name
     const parameters = getInstanceAttributeParameters(shim, this)
-    return {query: methodName, parameters, callback: shim.LAST}
+    return {query: methodName, parameters, promise: true, callback: shim.LAST}
   }
 }
 

package/lib/shim/shim.js

@@ -7,7 +7,6 @@
 
 const arity = require('../util/arity')
 const constants = require('./constants')
-const events = require('events')
 const hasOwnProperty = require('../util/properties').hasOwn
 const logger = require('../logger').child({component: 'Shim'})
 const path = require('path')
@@ -127,7 +126,6 @@ Shim.prototype.isNull = isNull
 Shim.prototype.toArray = toArray
 Shim.prototype.argsToArray = argsToArray
 Shim.prototype.normalizeIndex = normalizeIndex
-Shim.prototype.listenerCount = listenerCount
 Shim.prototype.once = once
 
 Shim.prototype.setInternalProperty = setInternalProperty
@@ -1695,23 +1693,6 @@ function normalizeIndex(arrayLength, idx) {
   return (idx < 0 || idx >= arrayLength) ? null : idx
 }
 
-/**
- * Retrieves the number of listeners for the given event.
- *
- * @memberof Shim.prototype
- *
- * @param {object} emitter  - The emitter to count the listeners on.
- * @param {string} event    - The event to count.
- *
- * @return {number} The number of listeners on the given event for this emitter.
- */
-function listenerCount(emitter, evnt) {
-  if (events.EventEmitter.listenerCount) {
-    return events.EventEmitter.listenerCount(emitter, evnt)
-  }
-  return emitter.listeners(evnt).length
-}
-
 /**
  * Wraps a function such that it will only be executed once.
  *

package/lib/spans/create-span-event-aggregator.js

@@ -11,22 +11,31 @@ const SpanEventAggregator = require('./span-event-aggregator')
 const StreamingSpanEventAggregator = require('./streaming-span-event-aggregator')
 
 function createSpanEventAggregator(config, collector, metrics) {
+  const trace_observer = config.infinite_tracing.trace_observer
+
   let shouldCreateStreaming = false
-  if (config.infinite_tracing.trace_observer.host) {
+  if (trace_observer.host) {
     // TODO: ideally this validation and configuration clearing would happen
     // in the config. Since we don't currently have a way to generate
     // support metrics in the config, keeping this related logic together here.
     // If logic happened prior, could merely check for existence of trace_observer.host.
-    shouldCreateStreaming = validateInfiniteTracing(config.infinite_tracing.trace_observer)
+    shouldCreateStreaming = validateInfiniteTracing()
 
     if (!shouldCreateStreaming) {
       // Explicitly disable for any downstream consumers
-      config.infinite_tracing.trace_observer.host = ''
-      config.infinite_tracing.trace_observer.port = ''
+      trace_observer.host = ''
+      trace_observer.port = ''
     }
   }
 
   if (shouldCreateStreaming) {
+    trace_observer.host = trace_observer.host.trim()
+
+    if (typeof trace_observer.port !== 'string') {
+      trace_observer.port = String(trace_observer.port)
+    }
+    trace_observer.port = trace_observer.port.trim()
+
     return createStreamingAggregator(config, collector, metrics)
   }
 
@@ -71,7 +80,7 @@ function createStandardAggregator(config, collector, metrics) {
   return aggregator
 }
 
-function validateInfiniteTracing(trace_observer) {
+function validateInfiniteTracing() {
   // TODO: Remove semver check when Node 10 support dropped.
   if (!psemver.satisfies('>=10.10.0')) {
     logger.warn(
@@ -80,40 +89,7 @@ function validateInfiniteTracing(trace_observer) {
     return false
   }
 
-  trace_observer.host = trace_observer.host.trim()
-
-  if (!validateHostName(trace_observer.host)) {
-    logger.warn('Infinite tracing disabled: invalid infinite_tracing.trace_observer.host value')
-
-    return false
-  }
-
-  if (typeof trace_observer.port !== 'string') {
-    trace_observer.port = String(trace_observer.port)
-  }
-
-  trace_observer.port = trace_observer.port.trim()
-
-  if (!validatePortValue(trace_observer.port)) {
-    logger.warn('Infinite tracing disabled: invalid infinite_tracing.trace_observer.port value')
-
-    return false
-  }
-
   return true
 }
 
-function validateHostName(host) {
-  // Regular expression for validating a hostname
-  const hostReg = /(?=^.{4,253}$)(^((?!-)[a-zA-Z0-9-]{0,62}[a-zA-Z0-9]\.)+[a-zA-Z]{2,63}$)/
-
-  return hostReg.test(host)
-}
-
-function validatePortValue(port) {
-  if (port.length === 0) return false
-
-  return !isNaN(port)
-}
-
 module.exports = createSpanEventAggregator

package/lib/util/cat.js

@@ -5,9 +5,8 @@
 
 'use strict'
 
-var util = require('util')
-var hashes = require('./hashes')
-var logger = require('../logger').child({component: 'cat'})
+const hashes = require('./hashes')
+const logger = require('../logger').child({component: 'cat'})
 
 module.exports.handleCatHeaders = handleCatHeaders
 module.exports.parsedHeadersToTrans = parsedHeadersToTrans
@@ -43,7 +42,7 @@ function parsedHeadersToTrans(parsedCatId, externalTrans, transaction) {
     transaction.incomingCatId = parsedCatId
   }
 
-  if (util.isArray(externalTrans)) {
+  if (Array.isArray(externalTrans)) {
     transaction.referringTransactionGuid = externalTrans[0]
     if (typeof externalTrans[2] === 'string') {
       transaction.tripId = externalTrans[2]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "7.3.1",
+  "version": "7.5.2",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [
@@ -120,16 +120,15 @@
   "scripts": {
     "bench": "node ./bin/run-bench.js",
     "ca-gen": "./bin/update-ca-bundle.sh",
-    "clean": "./bin/clean.sh",
     "docker-env": "./bin/docker-env-vars.sh",
     "docs": "npm ci && jsdoc -c ./jsdoc-conf.json --private -r .",
     "integration": "npm run prepare-test && npm run sub-install && time tap --no-esm test/integration/**/**/*.tap.js --timeout=180 --no-coverage",
-    "prepare-test": "npm ci && npm run ca-gen && npm run ssl && npm run docker-env",
+    "prepare-test": "npm run ca-gen && npm run ssl && npm run docker-env",
     "lint": "eslint ./*.js lib test bin",
     "public-docs": "npm ci && jsdoc -c ./jsdoc-conf.json --tutorials examples/shim api.js lib/shim/ lib/transaction/handle.js && cp examples/shim/*.png out/",
     "publish-docs": "./bin/publish-docs.sh",
     "services": "./bin/docker-services.sh",
-    "smoke": "npm run clean && ./bin/smoke.sh",
+    "smoke": "npm run ssl && time tap test/smoke/**/**/*.tap.js --timeout=180 --no-coverage",
     "ssl": "./bin/ssl.sh",
     "sub-install": "node test/bin/install_sub_deps",
     "test": "npm run integration && npm run unit",
@@ -137,7 +136,8 @@
     "update-cross-agent-tests": "./bin/update-cats.sh",
     "versioned-tests": "./bin/run-versioned-tests.sh",
     "update-changelog-version": "node ./bin/update-changelog-version",
-    "versioned": "npm run prepare-test && time ./bin/run-versioned-tests.sh"
+    "versioned": "npm run prepare-test && time ./bin/run-versioned-tests.sh",
+    "prepare": "husky install"
   },
   "bin": {
     "newrelic-naming-rules": "./bin/test-naming-rules.js"
@@ -161,7 +161,7 @@
   },
   "devDependencies": {
     "@newrelic/proxy": "^2.0.0",
-    "@newrelic/test-utilities": "^5.0.0",
+    "@newrelic/test-utilities": "^5.1.0",
     "@octokit/rest": "^18.0.15",
     "JSV": "~4.0.2",
     "architect": "*",
@@ -176,7 +176,9 @@
     "glob": "^7.1.2",
     "got": "^8.0.1",
     "http-errors": "^1.7.3",
+    "husky": "^6.0.0",
     "jsdoc": "^3.6.3",
+    "lint-staged": "^11.0.0",
     "memcached": ">=0.2.8",
     "minami": "^1.1.1",
     "mongodb": "^3.3.3",