newrelic 8.17.1 → 9.0.2

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

@@ -17,7 +17,7 @@ const NAMES = require('../../metrics/names')
 const SHIM_SYMBOLS = require('../../shim/constants').SYMBOLS
 
 const DEFAULT_HOST = 'localhost'
-const DEFAULT_PORT = 80
+const DEFAULT_HTTP_PORT = 80
 const DEFAULT_SSL_PORT = 443
 
 const NEWRELIC_SYNTHETICS_HEADER = 'x-newrelic-synthetics'
@@ -27,9 +27,8 @@ const NEWRELIC_SYNTHETICS_HEADER = 'x-newrelic-synthetics'
  *
  * @param {Agent} agent
  * @param {object} opts
- * @param {function} makeRequest
- *
- * @return {http.ClientRequest} The instrumented outbound request.
+ * @param {Function} makeRequest
+ * @returns {http.ClientRequest} The instrumented outbound request.
  */
 module.exports = function instrumentOutbound(agent, opts, makeRequest) {
   if (typeof opts === 'string') {
@@ -38,10 +37,12 @@ module.exports = function instrumentOutbound(agent, opts, makeRequest) {
     opts = copy.shallow(opts)
   }
 
+  const defaultPort =
+    !opts.protocol || opts.protocol === 'http:' ? DEFAULT_HTTP_PORT : DEFAULT_SSL_PORT
   let hostname = opts.hostname || opts.host || DEFAULT_HOST
   let port = opts.port || opts.defaultPort
   if (!port) {
-    port = !opts.protocol || opts.protocol === 'http:' ? DEFAULT_PORT : DEFAULT_SSL_PORT
+    port = defaultPort
   }
 
   if (!hostname || port < 1) {
@@ -49,11 +50,7 @@ module.exports = function instrumentOutbound(agent, opts, makeRequest) {
     return makeRequest(opts)
   }
 
-  // Technically we shouldn't append the port if this is an https request on 443
-  // but due to legacy issues we can't do that without moving customer's cheese.
-  //
-  // TODO: Move customers cheese by not appending the default port for https.
-  if (port && port !== DEFAULT_PORT) {
+  if (port && port !== defaultPort) {
     hostname += ':' + port
   }
 
@@ -159,8 +156,7 @@ module.exports = function instrumentOutbound(agent, opts, makeRequest) {
  * @param {TraceSegment} segment
  * @param {http.ClientRequest} req
  * @param {Error} error
- *
- * @return {bool} True if the error will be collected by New Relic.
+ * @returns {bool} True if the error will be collected by New Relic.
  */
 function handleError(segment, req, error) {
   if (req.listenerCount('error') > 0) {

package/lib/instrumentation/hapi.js

@@ -27,16 +27,7 @@ module.exports = function initialize(agent, hapi, moduleName, shim) {
   } else if (hapi.Server) {
     // Server.connection was removed in v17
     if (!hapi.Server.prototype.connection) {
-      return require('./hapi/hapi-17')(agent, hapi, moduleName, shim)
-    }
-
-    // See if we can find the plugin class. This should be the super class of
-    // Server and will cover more scenarios.
-    const Plugin = hapi.Server.super_
-    if (_isPluginClass(Plugin)) {
-      wrapServer(shim, Plugin)
-    } else {
-      wrapServer(shim, hapi.Server)
+      return require('./hapi/hapi')(agent, hapi, moduleName, shim)
     }
   }
 }
@@ -251,19 +242,6 @@ function wrapMiddleware(shim, middleware, event) {
   return shim.recordMiddleware(middleware, spec)
 }
 
-function _isPluginClass(Plugin) {
-  if (typeof Plugin !== 'function' || !Plugin.prototype) {
-    return false
-  }
-
-  const proto = Plugin.prototype
-  return (
-    typeof proto.handler === 'function' &&
-    typeof proto.route === 'function' &&
-    typeof proto.ext === 'function'
-  )
-}
-
 function wrapReply(wrap, reply, isPreHandler) {
   const isFinal = !isPreHandler
   // The only reply method that is actually used by pre-handlers is `response`. All

package/lib/instrumentation/pg.js

@@ -5,8 +5,6 @@
 
 'use strict'
 
-const semver = require('semver')
-
 function getQuery(shim, original, name, args) {
   const config = args[0]
   let statement
@@ -22,12 +20,10 @@ function getQuery(shim, original, name, args) {
 }
 
 module.exports = function initialize(agent, pgsql, moduleName, shim) {
-  const pgVersion = shim.require('./package.json').version
-
   shim.setDatastore(shim.POSTGRES)
+
   // allows for native wrapping to not happen if not necessary
   // when env var is true
-
   if (process.env.NODE_PG_FORCE_NATIVE) {
     return instrumentPGNative(pgsql)
   }
@@ -36,7 +32,7 @@ module.exports = function initialize(agent, pgsql, moduleName, shim) {
     // As of pg v7.0.0, Client.query returns a Promise from an async call.
     // pg supports event based Client.query when a Query object is passed in,
     // and works similarly in pg version <7.0.0
-    if (semver.satisfies(pgVersion, '>=7.0.0') && typeof queryArgs[0] === 'string') {
+    if (typeof queryArgs[0] === 'string') {
       return {
         callback: shim.LAST,
         query: getQuery,
@@ -58,18 +54,7 @@ module.exports = function initialize(agent, pgsql, moduleName, shim) {
   // wrapping for native
   function instrumentPGNative(pg) {
     shim.wrapReturn(pg, 'Client', clientFactoryWrapper)
-    shim.wrapReturn(pg.pools, 'Client', clientFactoryWrapper)
-
-    // In pg v5 the Client class used by pg-pool is the same Client
-    // class as pg.Client.  Since querying through the Pool class just
-    // defers to Client.query in this case we should skip instrumenting
-    // the Client class on Pool.
-    // Note: pg v5 was the only version to have both the Pool
-    // constructor and pg.pools so we can check against pg.pools to only
-    // instrument pg.Pool on v6 and later.
-    if (!pg.pools) {
-      shim.wrapClass(pg, 'Pool', { post: poolPostConstructor, es6: true })
-    }
+    shim.wrapClass(pg, 'Pool', { post: poolPostConstructor, es6: true })
   }
 
   function poolPostConstructor(shim) {

package/lib/instrumentations.js

@@ -21,7 +21,6 @@ module.exports = function instrumentations() {
     'generic-pool': { type: MODULE_TYPE.GENERIC },
     '@grpc/grpc-js': { module: './instrumentation/grpc-js' },
     '@hapi/hapi': { type: MODULE_TYPE.WEB_FRAMEWORK },
-    'hapi': { type: MODULE_TYPE.WEB_FRAMEWORK },
     'ioredis': { type: MODULE_TYPE.DATASTORE },
     'koa': { module: '@newrelic/koa' },
     'memcached': { type: MODULE_TYPE.DATASTORE },
@@ -36,7 +35,6 @@ module.exports = function instrumentations() {
     'restify': { type: MODULE_TYPE.WEB_FRAMEWORK },
     'superagent': { module: '@newrelic/superagent' },
     'undici': { type: MODULE_TYPE.TRANSACTION },
-    'oracle': { type: null },
     'vision': { type: MODULE_TYPE.WEB_FRAMEWORK },
     'when': { type: null },
     'winston': { type: MODULE_TYPE.GENERIC }

package/lib/metrics/names.js

@@ -147,13 +147,6 @@ const CASSANDRA = {
   ALL: DB.PREFIX + 'Cassandra/' + ALL
 }
 
-const ORACLE = {
-  PREFIX: 'Oracle',
-  STATEMENT: DB.STATEMENT + '/Oracle/',
-  OPERATION: DB.OPERATION + '/Oracle/',
-  INSTANCE: DB.INSTANCE + '/Oracle/'
-}
-
 const EXPRESS = {
   PREFIX: 'Expressjs/',
   MIDDLEWARE: MIDDLEWARE.PREFIX + 'Expressjs/',
@@ -280,7 +273,8 @@ const LOGGING = {
     WARN: `${LOGGING_LINES_PREFIX}/WARN`,
     ERROR: `${LOGGING_LINES_PREFIX}/ERROR`,
     DEBUG: `${LOGGING_LINES_PREFIX}/DEBUG`,
-    TRACE: `${LOGGING_LINES_PREFIX}/TRACE`
+    TRACE: `${LOGGING_LINES_PREFIX}/TRACE`,
+    UNKNOWN: `${LOGGING_LINES_PREFIX}/UNKNOWN`
   },
   LIBS: {
     PINO: `${SUPPORTABILITY.LOGGING}/${NODEJS.PREFIX}pino/enabled`,
@@ -329,7 +323,6 @@ module.exports = {
   MYSQL: MYSQL,
   NODEJS: NODEJS,
   NORMALIZED: 'NormalizedUri',
-  ORACLE: ORACLE,
   OTHER_TRANSACTION: OTHER_TRANSACTION,
   POSTGRES: POSTGRES,
   QUEUETIME: 'WebFrontend/QueueTime',

package/lib/transaction/trace/aggregator.js

@@ -4,7 +4,6 @@
  */
 
 'use strict'
-const a = require('async')
 const logger = require('../../logger').child({ component: 'Transaction Trace Aggregator' })
 
 /*
@@ -185,16 +184,29 @@ class TransactionTraceAggregator extends TraceAggregator {
     return [this.runId, traces.map((trace) => trace.generateJSONSync())]
   }
 
-  _toPayload(callback) {
+  async _toPayload(callback) {
     const traces = this.getTraces()
     if (!traces) {
       return callback(null, traces)
     }
-    return a.map(
-      traces,
-      (trace, cb) => trace.generateJSON(cb),
-      (err, encodedTraces) => callback(err, [this.runId, encodedTraces])
-    )
+
+    const tracePromises = traces.map((trace) => {
+      return new Promise((resolve, reject) => {
+        trace.generateJSON((err, data) => {
+          if (err) {
+            reject(err)
+          }
+          resolve(data)
+        })
+      })
+    })
+
+    try {
+      const encodedTraces = await Promise.all(tracePromises)
+      callback(null, [this.runId, encodedTraces])
+    } catch (err) {
+      callback(err)
+    }
   }
 
   _afterSend(successful) {

package/lib/transaction/transaction-event-aggregator.js

@@ -5,7 +5,6 @@
 
 'use strict'
 
-const async = require('async')
 const logger = require('../logger').child({ component: 'transaction-event-aggregator' })
 const EventAggregator = require('../aggregators/event-aggregator')
 
@@ -100,20 +99,19 @@ class TransactionEventAggregator extends EventAggregator {
     return rawEvent.value
   }
 
-  _sendMultiple(eventPayloadPairs, sendCallback) {
+  async _sendMultiple(eventPayloadPairs, sendCallback) {
     const self = this
 
     // Send payloads one at a time
-    async.eachOfSeries(
-      eventPayloadPairs,
-      (payloadPair, index, asyncCallback) => {
-        logger.debug(
-          'Sending payload %d of %d to %s',
-          index + 1,
-          eventPayloadPairs.length,
-          self.method
-        )
-
+    const promises = eventPayloadPairs.map((payloadPair, index) => {
+      logger.debug(
+        'Sending payload %d of %d to %s',
+        index + 1,
+        eventPayloadPairs.length,
+        self.method
+      )
+
+      return new Promise((resolve) => {
         self._sendSplitPayload(payloadPair.rawData, payloadPair.payload, (error) => {
           if (error) {
             logger.warn(error, 'An error occurred sending payload')
@@ -126,16 +124,16 @@ class TransactionEventAggregator extends EventAggregator {
             self.method
           )
 
-          // don't pass on error, allow next payload to attempt to send
-          asyncCallback()
+          // swallow error, allow all payloads to attempt to send
+          resolve()
         })
-      },
-      function afterAllPayloadsSent() {
-        logger.debug('Finished sending %d payloads to %s', eventPayloadPairs.length, self.method)
+      })
+    })
 
-        sendCallback()
-      }
-    )
+    await Promise.all(promises)
+    logger.debug('Finished sending %d payloads to %s', eventPayloadPairs.length, self.method)
+
+    sendCallback()
   }
 
   _sendSplitPayload(rawData, payload, callback) {

package/lib/util/application-logging.js

@@ -82,8 +82,10 @@ utils.isLogForwardingEnabled = function isLogForwardingEnabled(config, agent) {
  * @param {object} metrics metrics module
  */
 utils.incrementLoggingLinesMetrics = function incrementLoggingLinesMetrics(level, metrics) {
+  const levelMetric = getLogLevel(level)
+
   metrics.getOrCreateMetric(LOGGING.LINES).incrementCallCount()
-  metrics.getOrCreateMetric(LOGGING.LEVELS[level.toUpperCase()]).incrementCallCount()
+  metrics.getOrCreateMetric(levelMetric).incrementCallCount()
 }
 
 /**
@@ -95,3 +97,14 @@ utils.incrementLoggingLinesMetrics = function incrementLoggingLinesMetrics(level
 utils.createModuleUsageMetric = function createModuleUsageMetric(lib, metrics) {
   metrics.getOrCreateMetric(LOGGING.LIBS[lib.toUpperCase()]).incrementCallCount()
 }
+
+function getLogLevel(level) {
+  if (!level) {
+    return LOGGING.LEVELS.UNKNOWN
+  }
+  const logLevel = LOGGING.LEVELS[level.toUpperCase()]
+  if (!logLevel) {
+    return LOGGING.LEVELS.UNKNOWN
+  }
+  return logLevel
+}

package/lib/util/unwrapped-core.js

@@ -7,5 +7,7 @@
 
 const copy = require('./copy')
 const fs = require('fs')
+const fsPromises = require('fs/promises')
 
 exports.fs = copy.shallow(fs)
+exports.fsPromises = copy.shallow(fsPromises)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "8.17.1",
+  "version": "9.0.2",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [
@@ -108,6 +108,11 @@
       "name": "Diana Thayer",
       "email": "dthayer@newrelic.com",
       "web": "https://newrelic.com"
+    },
+    {
+      "name": "Jordi Gutiérrez Hermoso",
+      "email": "jgutierrezhermoso@newrelic.com",
+      "web": "https://newrelic.com"
     }
   ],
   "description": "New Relic agent",
@@ -121,7 +126,7 @@
   ],
   "homepage": "https://github.com/newrelic/node-newrelic",
   "engines": {
-    "node": ">=12.0.0",
+    "node": ">=14",
     "npm": ">=6.0.0"
   },
   "directories": {
@@ -129,11 +134,10 @@
   },
   "scripts": {
     "bench": "node ./bin/run-bench.js",
-    "ca-gen": "./bin/update-ca-bundle.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 test/integration/**/**/*.tap.js --timeout=180 --no-coverage --reporter classic",
-    "prepare-test": "npm run ca-gen && npm run ssl && npm run docker-env",
+    "prepare-test": "npm run ssl && npm run docker-env",
     "lint": "eslint ./*.js lib test bin examples",
     "lint:fix": "eslint --fix, ./*.js lib test bin examples",
     "public-docs": "jsdoc -c ./jsdoc-conf.json --tutorials examples/shim api.js lib/shim/ lib/transaction/handle.js && cp examples/shim/*.png out/",
@@ -161,11 +165,10 @@
   "dependencies": {
     "@grpc/grpc-js": "^1.5.5",
     "@grpc/proto-loader": "^0.6.13",
-    "@newrelic/aws-sdk": "^4.1.1",
-    "@newrelic/koa": "^6.1.1",
-    "@newrelic/superagent": "^5.1.0",
+    "@newrelic/aws-sdk": "^5.0.0",
+    "@newrelic/koa": "^7.0.0",
+    "@newrelic/superagent": "^6.0.0",
     "@tyriar/fibonacci-heap": "^2.0.7",
-    "async": "^3.2.3",
     "concat-stream": "^2.0.0",
     "https-proxy-agent": "^5.0.0",
     "json-stringify-safe": "^5.0.0",
@@ -174,19 +177,17 @@
     "winston-transport": "^4.5.0"
   },
   "optionalDependencies": {
-    "@newrelic/native-metrics": "^8.0.0"
+    "@newrelic/native-metrics": "^9.0.0"
   },
   "devDependencies": {
     "@newrelic/eslint-config": "^0.0.3",
     "@newrelic/newrelic-oss-cli": "^0.1.2",
     "@newrelic/proxy": "^2.0.0",
-    "@newrelic/test-utilities": "^6.5.5",
+    "@newrelic/test-utilities": "^7.0.0",
     "@octokit/rest": "^18.0.15",
     "@slack/bolt": "^3.7.0",
     "ajv": "^6.12.6",
-    "architect": "*",
-    "benchmark": "^2.1.4",
-    "bluebird": "^3.4.7",
+    "async": "^3.2.4",
     "chai": "^4.1.2",
     "commander": "^7.0.0",
     "eslint": "^7.32.0",
@@ -197,22 +198,18 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.4.0",
     "express": "*",
-    "generic-pool": "^3.6.1",
     "glob": "^7.1.2",
     "got": "^11.8.5",
     "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",
-    "mysql": "*",
+    "minami": "^1.2.3",
     "nock": "11.8.0",
     "prettier": "^2.3.2",
     "proxyquire": "^1.8.0",
     "q": "*",
-    "redis": "^1.0.0",
-    "request": "^2.88.0",
+    "request": "^2.88.2",
     "rimraf": "^2.6.3",
     "should": "*",
     "sinon": "^4.5.0",