newrelic 6.13.2 → 7.0.2

package/lib/transaction/handle.js

@@ -5,9 +5,7 @@
 
 'use strict'
 
-const util = require('util')
 const logger = require('../logger').child({component: 'transactionHandle'})
-const DistributedTracePayloadStub = require('./dt-payload').Stub
 
 const NAMES = require('../../lib/metrics/names')
 
@@ -61,7 +59,6 @@ class TransactionHandle {
    */
   acceptDistributedTraceHeaders(transportType, headers) {
     incrementApiSupportMetric(this._metrics, 'acceptDistributedTraceHeaders')
-
     return this._transaction.acceptDistributedTraceHeaders(transportType, headers)
   }
 
@@ -71,48 +68,10 @@ class TransactionHandle {
    */
   insertDistributedTraceHeaders(headers) {
     incrementApiSupportMetric(this._metrics, 'insertDistributedTraceHeaders')
-
     return this._transaction.insertDistributedTraceHeaders(headers)
   }
-
-  /**
-  *
-  * Proxy method for Transaction#createDistrubtedTracePayload.
-  *
-  * @returns {DistributedTracePayload} The created payload object.
-  *
-  */
-  createDistributedTracePayload() {
-    return this._transaction.createDistributedTracePayload()
-  }
-
-  /**
-  *
-  * Proxy method for Transaction#acceptDistributedTracePayload
-  *
-  * @param {String} The payload to accept as the parent to the current trace
-  *
-  */
-  acceptDistributedTracePayload(payload) {
-    return this._transaction.acceptDistributedTracePayload(payload)
-  }
 }
 
-// TODO: Fully remove functions in future Major release. v7.0.0?
-TransactionHandle.prototype.acceptDistributedTracePayload = util.deprecate(
-  TransactionHandle.prototype.acceptDistributedTracePayload,
-  'TransactionHandle#acceptDistributedTracePayload has been deprecated! ' +
-  'Please use TransactionHandle#acceptDistributedTraceHeaders ' +
-  'which supports multiple distributed trace formats.'
-)
-
-TransactionHandle.prototype.createDistributedTracePayload = util.deprecate(
-  TransactionHandle.prototype.createDistributedTracePayload,
-  'TransactionHandle#createDistributedTracePayload has been deprecated! ' +
-  'Please use TransactionHandle#insertDistributedTraceHeaders ' +
-  'which supports multiple distributed trace formats.'
-)
-
 module.exports = TransactionHandle
 
 function incrementApiSupportMetric(metrics, functionName) {
@@ -147,19 +106,6 @@ module.exports.Stub = class TransactionHandleStub {
     logger.debug("No transaction found when calling Transaction.isSampled")
   }
 
-  createDistributedTracePayload() {
-    logger.debug(
-      "No transaction found when calling Transaction.createDistributedTracePayload"
-    )
-    return new DistributedTracePayloadStub()
-  }
-
-  acceptDistributedTracePayload() {
-    logger.debug(
-      "No transaction found when calling Transaction.acceptDistributedTracePayload"
-    )
-  }
-
   acceptDistributedTraceHeaders() {
     logger.debug("No transaction found when calling Transaction.acceptDistributedTraceHeaders")
   }

package/lib/transaction/index.js

@@ -509,7 +509,7 @@ Transaction.prototype._markAsWeb = function _markAsWeb(rawURL) {
  * Sets the transaction's name and determines if it will be ignored.
  *
  * @param {string} [name]
- *  Optional. The partial name to use for the finalized transaction. If ommitted
+ *  Optional. The partial name to use for the finalized transaction. If omitted
  *  the current partial name is used.
  */
 Transaction.prototype.finalizeName = function finalizeName(name) {
@@ -679,7 +679,6 @@ Transaction.prototype.measure = function measure(name, scope, duration, exclusiv
 Transaction.prototype._setApdex = function _setApdex(name, duration, keyApdexInMillis) {
   var apdexStats = this.metrics.getOrCreateApdexMetric(name, null, keyApdexInMillis)
 
-
   // if we have an error-like status code, and all the errors are
   // expected, we know the status code was caused by an expected
   // error, so we will not report "frustrating".  Otherwise, we
@@ -747,19 +746,13 @@ function _linkExceptionToSegment(exception) {
     return
   }
 
-  const config = this.agent.config
-
-  // Add error attributes to the span
-  const details = exception.getErrorDetails(config)
-  segment.addSpanAttribute('error.message', details.message)
-  segment.addSpanAttribute('error.class', details.type)
-
-  const isExpected =
-    errorHelper.isExpectedErrorClass(config, details.type) ||
-    errorHelper.isExpectedErrorMessage(config, details.type, details.message)
-
-  if (isExpected) {
-    segment.addSpanAttribute('error.expected', isExpected)
+  const spanContext = segment.getSpanContext()
+  if (spanContext) {
+    // Exception attributes will be added to span unless transaction
+    // status code has been ignored. Last error wins.
+    const config = this.agent.config
+    const details = exception.getErrorDetails(config)
+    spanContext.setError(details)
   }
 
   // Add the span/segment ID to the exception as agent attributes
@@ -793,6 +786,14 @@ function _addUserError(exception) {
   this.userErrors.push(exception)
 }
 
+/**
+ * Returns if the transaction's current status code is errored
+ * but considered ignored via the config.
+ */
+Transaction.prototype.hasIgnoredErrorStatusCode = function _hasIgnoredErrorStatusCode() {
+  return urltils.isIgnoredError(this.agent.config, this.statusCode)
+}
+
 /**
  * Returns true if an error happened during the transaction or if the transaction itself is
  * considered to be an error.
@@ -812,7 +813,7 @@ Transaction.prototype.hasOnlyExpectedErrors = function hasOnlyExpectedErrors() {
 
   for (let i = 0;i < this.exceptions.length;i++) {
     const exception = this.exceptions[i]
-    // this expection is neither expected nor ignored
+    // this exception is neither expected nor ignored
     const isUnexpected = !(
       errorHelper.isExpectedException(
         this,
@@ -885,19 +886,14 @@ function acceptDistributedTraceHeaders(transportType, headers) {
 
   if (traceparent) {
     logger.trace('Accepting trace context DT payload for transaction %s', this.id)
-
     // assumes header keys already lowercase
     const tracestate = headers[TRACE_CONTEXT_STATE_HEADER]
-
     this.acceptTraceContextPayload(traceparent, tracestate, transport)
-  } else {
+  } else if (NEWRELIC_TRACE_HEADER in headers) {
+    logger.trace('Accepting newrelic DT payload for transaction %s', this.id)
     // assumes header keys already lowercase
     const payload = headers[NEWRELIC_TRACE_HEADER]
-    if (payload) {
-      logger.trace('Accepting newrelic DT payload for transaction %s', this.id)
-
-      this.acceptDistributedTracePayload(payload, transport)
-    }
+    this._acceptDistributedTracePayload(payload, transport)
   }
 }
 
@@ -928,7 +924,7 @@ function insertDistributedTraceHeaders(headers) {
   }
 
   try {
-    const newrelicFormatData = this.createDistributedTracePayload().httpSafe()
+    const newrelicFormatData = this._createDistributedTracePayload().httpSafe()
     headers[NEWRELIC_TRACE_HEADER] = newrelicFormatData
     logger.trace('Added outbound request distributed tracing headers in transaction %s', this.id)
   } catch (error) {
@@ -992,8 +988,8 @@ function acceptTraceContextPayload(traceparent, tracestate, transport) {
  * @param {object} payload                - The distributed trace payload to accept.
  * @param {string} [transport='Unknown']  - The transport type that delivered the payload.
  */
-Transaction.prototype.acceptDistributedTracePayload = acceptDistributedTracePayload
-function acceptDistributedTracePayload(payload, transport) {
+Transaction.prototype._acceptDistributedTracePayload = _acceptDistributedTracePayload
+function _acceptDistributedTracePayload(payload, transport) {
   if (!payload) {
     this.agent.recordSupportability('DistributedTrace/AcceptPayload/Ignored/Null')
     return
@@ -1088,11 +1084,6 @@ function acceptDistributedTracePayload(payload, transport) {
     return
   }
 
-  // TODO: This should be removable / covered by acceptDistributedTraceHeaders
-  // once the Transaction#acceptDistributedTracePayload API that directly invokes
-  // this acceptDistributedTracePayload is fully removed in a future Major version.
-  transport = TRANSPORT_TYPES_SET[transport] ? transport : TRANSPORT_TYPES.UNKNOWN
-
   this.parentType = data.ty
   this.parentApp = data.ap
   this.parentAcct = data.ac
@@ -1162,9 +1153,9 @@ Transaction.prototype._getParsedPayload = function _getParsedPayload(payload) {
 /**
  * Creates a distributed trace payload.
  */
-Transaction.prototype.createDistributedTracePayload = createDistributedTracePayload
+Transaction.prototype._createDistributedTracePayload = _createDistributedTracePayload
 
-function createDistributedTracePayload() {
+function _createDistributedTracePayload() {
   const config = this.agent.config
   const accountId = config.account_id
   const appId = config.primary_application_id
@@ -1184,11 +1175,6 @@ function createDistributedTracePayload() {
     return new DTPayloadStub()
   }
 
-  // TODO: This should be removable / covered by insertDistributedTraceHeaders
-  // once the Transaction#createDistributedTracePayload API that directly invokes
-  // this createDistributedTracePayload is fully removed in a future Major version.
-  this._calculatePriority()
-
   const currSegment = this.agent.tracer.getSegment()
   const data = {
     ty: 'App',

package/lib/transaction/tracecontext.js

@@ -27,7 +27,7 @@ const FLAGS = {
 }
 
 /**
- * The class reponsible for accepting, validating, and producing w3c tracecontext headers.
+ * The class responsible for accepting, validating, and producing w3c tracecontext headers.
  */
 class TraceContext {
   /**
@@ -63,7 +63,14 @@ class TraceContext {
     // If no segment/span is in context, generate one so we can have a valid traceparent
     const segment = this.transaction.agent.tracer.getSegment()
     let parentId = segment && segment.id
-    parentId = parentId || hashes.makeId(16)
+    if (!parentId) {
+      parentId = hashes.makeId(16)
+      logger.debug(
+        'No segment/span in context. Generated new traceparent parentId (%s) for traceId (%s)',
+        parentId,
+        traceId
+      )
+    }
 
     return `${W3C_TRACEPARENT_VERSION}-${traceId}-${parentId}-${this.createFlagsHex()}`
   }
@@ -103,7 +110,11 @@ class TraceContext {
       const segment = this.transaction.agent.tracer.getSegment()
       if (segment) {
         spanId = segment.id
+      } else {
+        logger.debug('No segment/span in context. Not sending spanId in tracestate.')
       }
+    } else {
+      logger.trace('Span events disabled. Not sending spanId in tracestate.')
     }
 
     const transactionId = config.transaction_events.enabled ? this.transaction.id : ''
@@ -130,11 +141,15 @@ class TraceContext {
       return
     }
 
-    headers[TRACE_CONTEXT_PARENT_HEADER] = this.createTraceparent()
+    const traceParent = this.createTraceparent()
+    headers[TRACE_CONTEXT_PARENT_HEADER] = traceParent
+
+    logger.trace('traceparent added with %s', traceParent)
 
     const tracestate = this.createTracestate()
     if (tracestate) {
       headers[TRACE_CONTEXT_STATE_HEADER] = tracestate
+      logger.trace('tracestate added with %s', tracestate)
     }
 
     this.transaction.agent.recordSupportability('TraceContext/Create/Success')
@@ -240,7 +255,7 @@ class TraceContext {
       return traceContextData
     }
 
-    // Keep the raw, non-NewRelic tracestate string stored so that we can propogate it
+    // Keep the raw, non-NewRelic tracestate string stored so that we can propagate it
     this._traceStateRaw = parsedState.newTraceState
 
     // These need to be kept to be added to root span events as an attribute

package/lib/util/byte-limit.js

@@ -55,7 +55,7 @@ function truncate(val, limit) {
 
   // Continue the binary search till:
   // 1) The string is the desired length (i.e. cmpVal = 0) OR
-  // 2) The desired string must split a character to acheive the desired byte length
+  // 2) The desired string must split a character to achieve the desired byte length
   //    In this case, we should cut the character that would be split.
   //    (i.e. delta > 1 character OR the string is larger than the limit)
   var substr

package/lib/utilization/common.js

@@ -81,7 +81,7 @@ exports.request = function request(opts, agent, cb) {
         return cb(new Error('Request for metadata failed.'))
       } else if (!data) {
         logger.debug('Got no response data?')
-        return cb(new Error('No reponse data received.'))
+        return cb(new Error('No response data received.'))
       }
 
       cb(null, data.toString('utf8'))

package/newrelic.js

@@ -28,7 +28,7 @@ exports.config = {
      *
      * @env NEW_RELIC_DISTRIBUTED_TRACING_ENABLED
      */
-    enabled: false,
+    enabled: false
   },
   logging: {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "6.13.2",
+  "version": "7.0.2",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [
@@ -111,7 +111,7 @@
   ],
   "homepage": "http://github.com/newrelic/node-newrelic",
   "engines": {
-    "node": ">=8.0.0",
+    "node": ">=10.0.0",
     "npm": ">=3.0.0"
   },
   "directories": {
@@ -142,11 +142,11 @@
     "newrelic-naming-rules": "./bin/test-naming-rules.js"
   },
   "dependencies": {
-    "@grpc/grpc-js": "1.0.5",
-    "@grpc/proto-loader": "^0.5.4",
-    "@newrelic/aws-sdk": "^2.0.0",
-    "@newrelic/koa": "^4.0.0",
-    "@newrelic/superagent": "^3.0.0",
+    "@grpc/grpc-js": "1.2.0",
+    "@grpc/proto-loader": "^0.5.5",
+    "@newrelic/aws-sdk": "^3.0.0",
+    "@newrelic/koa": "^5.0.0",
+    "@newrelic/superagent": "^4.0.0",
     "@tyriar/fibonacci-heap": "^2.0.7",
     "async": "^3.2.0",
     "concat-stream": "^2.0.0",
@@ -156,12 +156,11 @@
     "semver": "^5.3.0"
   },
   "optionalDependencies": {
-    "@newrelic/native-metrics": "^5.3.0"
+    "@newrelic/native-metrics": "^6.0.0"
   },
   "devDependencies": {
     "@newrelic/proxy": "^2.0.0",
-    "@newrelic/test-utilities": "^4.0.0",
-    "JSV": "~4.0.2",
+    "@newrelic/test-utilities": "^5.0.0",
     "architect": "*",
     "benchmark": "^2.1.4",
     "bluebird": "^3.4.7",
@@ -174,6 +173,7 @@
     "got": "^8.0.1",
     "http-errors": "^1.7.3",
     "jsdoc": "^3.6.3",
+    "JSV": "~4.0.2",
     "memcached": ">=0.2.8",
     "minami": "^1.1.1",
     "mongodb": "^3.3.3",
@@ -187,7 +187,7 @@
     "rimraf": "^2.6.3",
     "should": "*",
     "sinon": "^4.5.0",
-    "tap": "^14.10.7",
+    "tap": "^14.10.8",
     "temp": "^0.8.1",
     "through": "^2.3.6",
     "when": "*"

package/stub_api.js

@@ -61,7 +61,7 @@ function setLambdaHandler(callback) {
 }
 
 function startSegment(name, record, handler, callback) {
-  logger.debug('Not calling `startSegment` becuase New Relic is disabled.')
+  logger.debug('Not calling `startSegment` because New Relic is disabled.')
   if (typeof handler === 'function') {
     return handler(callback)
   }

package/third_party_manifest.json

@@ -1,68 +1,68 @@
 {
-  "lastUpdated": "Tue Oct 13 2020 14:24:25 GMT-0700 (Pacific Daylight Time)",
+  "lastUpdated": "Tue Nov 17 2020 14:58:13 GMT-0800 (Pacific Standard Time)",
   "projectName": "New Relic Node Agent",
   "projectUrl": "https://github.com/newrelic/node-newrelic",
   "includeDev": true,
   "dependencies": {
-    "@grpc/grpc-js@1.0.5": {
+    "@grpc/grpc-js@1.2.0": {
       "name": "@grpc/grpc-js",
-      "version": "1.0.5",
-      "range": "1.0.5",
+      "version": "1.2.0",
+      "range": "1.2.0",
       "licenses": "Apache-2.0",
       "repoUrl": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js",
-      "versionedRepoUrl": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/tree/v1.0.5",
+      "versionedRepoUrl": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/tree/v1.2.0",
       "licenseFile": "node_modules/@grpc/grpc-js/LICENSE",
-      "licenseUrl": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/blob/v1.0.5/LICENSE",
+      "licenseUrl": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/blob/v1.2.0/LICENSE",
       "licenseTextSource": "file",
       "publisher": "Google Inc."
     },
-    "@grpc/proto-loader@0.5.4": {
+    "@grpc/proto-loader@0.5.5": {
       "name": "@grpc/proto-loader",
-      "version": "0.5.4",
-      "range": "^0.5.4",
+      "version": "0.5.5",
+      "range": "^0.5.5",
       "licenses": "Apache-2.0",
       "repoUrl": "https://github.com/grpc/grpc-node",
-      "versionedRepoUrl": "https://github.com/grpc/grpc-node/tree/v0.5.4",
+      "versionedRepoUrl": "https://github.com/grpc/grpc-node/tree/v0.5.5",
       "licenseFile": "node_modules/@grpc/proto-loader/LICENSE",
-      "licenseUrl": "https://github.com/grpc/grpc-node/blob/v0.5.4/LICENSE",
+      "licenseUrl": "https://github.com/grpc/grpc-node/blob/v0.5.5/LICENSE",
       "licenseTextSource": "file",
       "publisher": "Google Inc."
     },
-    "@newrelic/aws-sdk@2.0.0": {
+    "@newrelic/aws-sdk@3.0.0": {
       "name": "@newrelic/aws-sdk",
-      "version": "2.0.0",
-      "range": "^2.0.0",
+      "version": "3.0.0",
+      "range": "^3.0.0",
       "licenses": "Apache-2.0",
       "repoUrl": "https://github.com/newrelic/node-newrelic-aws-sdk",
-      "versionedRepoUrl": "https://github.com/newrelic/node-newrelic-aws-sdk/tree/v2.0.0",
+      "versionedRepoUrl": "https://github.com/newrelic/node-newrelic-aws-sdk/tree/v3.0.0",
       "licenseFile": "node_modules/@newrelic/aws-sdk/LICENSE",
-      "licenseUrl": "https://github.com/newrelic/node-newrelic-aws-sdk/blob/v2.0.0/LICENSE",
+      "licenseUrl": "https://github.com/newrelic/node-newrelic-aws-sdk/blob/v3.0.0/LICENSE",
       "licenseTextSource": "file",
       "publisher": "New Relic Node.js agent team",
       "email": "nodejs@newrelic.com"
     },
-    "@newrelic/koa@4.0.0": {
+    "@newrelic/koa@5.0.0": {
       "name": "@newrelic/koa",
-      "version": "4.0.0",
-      "range": "^4.0.0",
+      "version": "5.0.0",
+      "range": "^5.0.0",
       "licenses": "Apache-2.0",
       "repoUrl": "https://github.com/newrelic/node-newrelic-koa",
-      "versionedRepoUrl": "https://github.com/newrelic/node-newrelic-koa/tree/v4.0.0",
+      "versionedRepoUrl": "https://github.com/newrelic/node-newrelic-koa/tree/v5.0.0",
       "licenseFile": "node_modules/@newrelic/koa/LICENSE",
-      "licenseUrl": "https://github.com/newrelic/node-newrelic-koa/blob/v4.0.0/LICENSE",
+      "licenseUrl": "https://github.com/newrelic/node-newrelic-koa/blob/v5.0.0/LICENSE",
       "licenseTextSource": "file",
       "publisher": "New Relic Node.js agent team",
       "email": "nodejs@newrelic.com"
     },
-    "@newrelic/superagent@3.0.0": {
+    "@newrelic/superagent@4.0.0": {
       "name": "@newrelic/superagent",
-      "version": "3.0.0",
-      "range": "^3.0.0",
+      "version": "4.0.0",
+      "range": "^4.0.0",
       "licenses": "Apache-2.0",
       "repoUrl": "https://github.com/newrelic/node-newrelic-superagent",
-      "versionedRepoUrl": "https://github.com/newrelic/node-newrelic-superagent/tree/v3.0.0",
+      "versionedRepoUrl": "https://github.com/newrelic/node-newrelic-superagent/tree/v4.0.0",
       "licenseFile": "node_modules/@newrelic/superagent/LICENSE",
-      "licenseUrl": "https://github.com/newrelic/node-newrelic-superagent/blob/v3.0.0/LICENSE",
+      "licenseUrl": "https://github.com/newrelic/node-newrelic-superagent/blob/v4.0.0/LICENSE",
       "licenseTextSource": "file",
       "publisher": "New Relic Node.js Agent Team",
       "email": "nodejs@newrelic.com"
@@ -171,15 +171,15 @@
       "email": "nathan@tootallnate.net",
       "url": "http://n8.io/"
     },
-    "@newrelic/test-utilities@4.0.0": {
+    "@newrelic/test-utilities@5.0.0": {
       "name": "@newrelic/test-utilities",
-      "version": "4.0.0",
-      "range": "^4.0.0",
+      "version": "5.0.0",
+      "range": "^5.0.0",
       "licenses": "Apache-2.0",
       "repoUrl": "https://github.com/newrelic/node-test-utilities",
-      "versionedRepoUrl": "https://github.com/newrelic/node-test-utilities/tree/v4.0.0",
+      "versionedRepoUrl": "https://github.com/newrelic/node-test-utilities/tree/v5.0.0",
       "licenseFile": "node_modules/@newrelic/test-utilities/LICENSE",
-      "licenseUrl": "https://github.com/newrelic/node-test-utilities/blob/v4.0.0/LICENSE",
+      "licenseUrl": "https://github.com/newrelic/node-test-utilities/blob/v5.0.0/LICENSE",
       "licenseTextSource": "file",
       "publisher": "New Relic Node.js agent team",
       "email": "nodejs@newrelic.com"
@@ -552,15 +552,15 @@
       "licenseTextSource": "file",
       "publisher": "Christian Johansen"
     },
-    "tap@14.10.7": {
+    "tap@14.10.8": {
       "name": "tap",
-      "version": "14.10.7",
-      "range": "^14.10.7",
+      "version": "14.10.8",
+      "range": "^14.10.8",
       "licenses": "ISC",
       "repoUrl": "https://github.com/tapjs/node-tap",
-      "versionedRepoUrl": "https://github.com/tapjs/node-tap/tree/v14.10.7",
+      "versionedRepoUrl": "https://github.com/tapjs/node-tap/tree/v14.10.8",
       "licenseFile": "node_modules/tap/LICENSE",
-      "licenseUrl": "https://github.com/tapjs/node-tap/blob/v14.10.7/LICENSE",
+      "licenseUrl": "https://github.com/tapjs/node-tap/blob/v14.10.8/LICENSE",
       "licenseTextSource": "file",
       "publisher": "Isaac Z. Schlueter",
       "email": "i@izs.me",