newrelic 9.0.0 → 9.0.3

package/lib/transaction/index.js

@@ -418,13 +418,7 @@ function finalizeNameFromUri(requestURL, statusCode) {
 
   this.url = urltils.scrub(requestURL)
   this.statusCode = statusCode
-
-  // Derive the name from the request URL.
-  const partialName = this._partialNameFromUri(requestURL, statusCode)
-  this._partialName = partialName.value
-  if (partialName.ignore) {
-    this.ignore = true
-  }
+  this.name = this.getFullName()
 
   // If a namestate stack exists, copy route parameters over to the trace.
   if (!this.nameState.isEmpty() && this.baseSegment) {
@@ -448,17 +442,6 @@ function finalizeNameFromUri(requestURL, statusCode) {
     }, this)
   }
 
-  // Apply transaction name normalization rules (sent by server) to full name.
-  const fullName = TYPE_METRICS[this.type] + '/' + this._partialName
-  const normalized = this.agent.transactionNameNormalizer.normalize(fullName)
-  if (normalized.ignore) {
-    this.ignore = true
-  }
-  this.name = normalized.value
-
-  // 5. transaction segment term normalizer
-  this.name = this.agent.txSegmentNormalizer.normalize(this.name).value
-
   // Allow the API to explicitly set the ignored status.
   if (this.forceIgnore !== null) {
     this.ignore = this.forceIgnore
@@ -528,25 +511,22 @@ Transaction.prototype._markAsWeb = function _markAsWeb(rawURL) {
 Transaction.prototype.finalizeName = function finalizeName(name) {
   // If no name is given, and this is a web transaction with a url, then
   // finalize the name using the stored url.
-  if (name == null && this.type === 'web' && this.url) {
+  if (name == null && this.isWeb() && this.url) {
     return this.finalizeNameFromUri(this.url, this.statusCode)
   }
 
-  this._partialName = this.forceName || name || this._partialName
-  if (!this._partialName) {
+  // this may seem out of place but certain API methods
+  // set the _partialName directly so use that as a fallback
+  this._partialName = name || this._partialName
+
+  name = this.getFullName()
+
+  if (!name) {
     logger.debug('No name for transaction %s, not finalizing.', this.id)
     return
   }
 
-  const fullName = TYPE_METRICS[this.type] + '/' + this._partialName
-
-  // Transaction normalizers run on the full metric name, not the user facing
-  // transaction name.
-  const normalized = this.agent.transactionNameNormalizer.normalize(fullName)
-  if (normalized.ignore) {
-    this.ignore = true
-  }
-  this.name = normalized.value
+  this.name = name
 
   if (this.forceIgnore !== null) {
     this.ignore = this.forceIgnore
@@ -582,17 +562,25 @@ Transaction.prototype.finalizeName = function finalizeName(name) {
  */
 Transaction.prototype.getName = function getName() {
   if (this.isWeb() && this.url) {
-    return this._partialNameFromUri(this.url, this.statusCode).value
+    const finalName = this._partialNameFromUri(this.url, this.statusCode)
+    if (finalName.ignore) {
+      this.ignore = true
+    }
+    return finalName.value
   }
   return this._partialName
 }
 
 Transaction.prototype.getFullName = function getFullName() {
   let name = null
+  // use value from `api.setTransaction`
   if (this.forceName) {
     name = this.forceName
+    // use value from previously finalized named
   } else if (this.name) {
     return this.name
+    // derive name from uri in web case
+    // or just use whatever was this._partialName
   } else {
     name = this.getName()
   }
@@ -600,8 +588,23 @@ Transaction.prototype.getFullName = function getFullName() {
   if (!name) {
     return null
   }
-  const fullName = TYPE_METRICS[this.type] + '/' + name
-  return this.agent.transactionNameNormalizer.normalize(fullName).value
+
+  this._partialName = name
+  let fullName = TYPE_METRICS[this.type] + '/' + name
+  const normalized = this.agent.transactionNameNormalizer.normalize(fullName)
+  if (normalized.ignore) {
+    this.ignore = true
+  }
+
+  fullName = normalized.value
+
+  // apply transaction segment term normalizer
+  // only to web transactions
+  if (this.isWeb() && this.url) {
+    fullName = this.agent.txSegmentNormalizer.normalize(fullName).value
+  }
+
+  return fullName
 }
 
 /**

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": "9.0.0",
+  "version": "9.0.3",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [
@@ -169,7 +169,6 @@
     "@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",
@@ -188,9 +187,7 @@
     "@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",
@@ -201,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",