newrelic 7.5.0 → 7.5.1

package/NEWS.md

@@ -1,3 +1,15 @@
+### 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`.

package/lib/config/index.js

@@ -56,14 +56,13 @@ const getConfigFileLocations = () => [
   process.env.NEW_RELIC_HOME,
   process.cwd(),
   process.env.HOME,
-  path.join(__dirname, '../../../..') // above node_modules
+  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)
 
-// the REPL has no main module
-if (process.mainModule && process.mainModule.filename) {
-  getConfigFileLocations().splice(2, 0, path.dirname(process.mainModule.filename))
-}
-
 function isTruthular(setting) {
   if (setting == null) {
     return false

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "7.5.0",
+  "version": "7.5.1",
   "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",