newrelic 7.5.2 → 8.3.0

package/lib/errors/helper.js

@@ -11,9 +11,11 @@ module.exports = {
     if (transaction && urltils.isExpectedError(config, transaction.statusCode)) {
       isExpectedTransactionCode = true
     }
-    return this.isExpectedErrorMessage(config, type, message) ||
+    return (
+      this.isExpectedErrorMessage(config, type, message) ||
       this.isExpectedErrorClass(config, type) ||
       isExpectedTransactionCode
+    )
   },
   isExpectedErrorMessage: function isExpectedErrorMessage(config, type, message) {
     if (!config.error_collector.expected_messages[type]) {
@@ -34,29 +36,15 @@ module.exports = {
     }
     return false
   },
-  isExpectedException: function isExpectedException(
-    transaction,
-    exception,
-    config,
-    urltils
-  ) {
-    let {type, message} = this.extractErrorInformation(
-      transaction,
-      exception,
-      config,
-      urltils
-    )
+  isExpectedException: function isExpectedException(transaction, exception, config, urltils) {
+    let { type, message } = this.extractErrorInformation(transaction, exception, config, urltils)
 
-    return this.isExpectedErrorClass(config, type) ||
-      this.isExpectedErrorMessage(config, type, message)
+    return (
+      this.isExpectedErrorClass(config, type) || this.isExpectedErrorMessage(config, type, message)
+    )
   },
 
-  extractErrorInformation: function extractErrorInformation(
-    transaction,
-    error,
-    config,
-    urltils
-  ) {
+  extractErrorInformation: function extractErrorInformation(transaction, error, config, urltils) {
     let name = 'Unknown'
     let message = ''
     let type = 'Error'
@@ -79,8 +67,11 @@ module.exports = {
       } else if (error.constructor && error.constructor.name) {
         type = error.constructor.name
       }
-    } else if (transaction && transaction.statusCode &&
-               urltils.isError(config, transaction.statusCode)) {
+    } else if (
+      transaction &&
+      transaction.statusCode &&
+      urltils.isError(config, transaction.statusCode)
+    ) {
       message = 'HttpError ' + transaction.statusCode
     }
 
@@ -94,9 +85,9 @@ module.exports = {
     }
 
     return {
-      name:name,
-      message:message,
-      type:type,
+      name: name,
+      message: message,
+      type: type
     }
   },
 
@@ -104,18 +95,18 @@ module.exports = {
     // extract _just_ the error information, not transaction stuff
     let errorInfo = this.extractErrorInformation(null, error, config, null)
 
-    return this.shouldIgnoreErrorClass(errorInfo, config) ||
+    return (
+      this.shouldIgnoreErrorClass(errorInfo, config) ||
       this.shouldIgnoreErrorMessage(errorInfo, config) ||
       this.shouldIgnoreStatusCode(transaction, config)
+    )
   },
 
   shouldIgnoreStatusCode: function shouldIgnoreStatusCode(transaction, config) {
     if (!transaction) {
       return false
     }
-    return config.error_collector.ignore_status_codes.indexOf(
-      transaction.statusCode
-    ) !== -1
+    return config.error_collector.ignore_status_codes.indexOf(transaction.statusCode) !== -1
   },
 
   shouldIgnoreErrorClass: function shouldIgnoreErrorClass(errorInfo, config) {

package/lib/errors/index.js

@@ -12,7 +12,7 @@ var urltils = require('../util/urltils')
 const errorHelper = require('../errors/helper')
 
 class Exception {
-  constructor({error, timestamp, customAttributes, agentAttributes}) {
+  constructor({ error, timestamp, customAttributes, agentAttributes }) {
     this.error = error
     this.timestamp = timestamp || 0
     this.customAttributes = customAttributes || {}
@@ -26,7 +26,7 @@ class Exception {
     return errorDetails
   }
 
-  isExpected(config, {type, message}) {
+  isExpected(config, { type, message }) {
     if (!this._expected) {
       this._expected =
         errorHelper.isExpectedErrorClass(config, type) ||
@@ -51,7 +51,7 @@ class Exception {
  */
 function createError(transaction, exception, config) {
   const error = exception.error
-  let {name, message, type} = errorHelper.extractErrorInformation(
+  let { name, message, type } = errorHelper.extractErrorInformation(
     transaction,
     error,
     config,
@@ -85,10 +85,7 @@ function createError(transaction, exception, config) {
   if (!config.high_security && config.api.custom_attributes_enabled && customAttributes) {
     for (let key in customAttributes) {
       if (props.hasOwn(customAttributes, key)) {
-        const dest = config.attributeFilter.filterTransaction(
-          DESTINATIONS.ERROR_EVENT,
-          key
-        )
+        const dest = config.attributeFilter.filterTransaction(DESTINATIONS.ERROR_EVENT, key)
         if (dest & DESTINATIONS.ERROR_EVENT) {
           params.userAttributes[key] = customAttributes[key]
         }
@@ -139,32 +136,23 @@ function createEvent(transaction, error, timestamp, config) {
   var userAttributes = Object.assign(Object.create(null), errorParams.userAttributes)
   var agentAttributes = Object.assign(Object.create(null), errorParams.agentAttributes)
 
-  var errorEvent = [
-    intrinsicAttributes,
-    userAttributes,
-    agentAttributes
-  ]
+  var errorEvent = [intrinsicAttributes, userAttributes, agentAttributes]
 
   return errorEvent
 }
 
 // eslint-disable-next-line max-params
-function _getErrorEventIntrinsicAttrs(
-  transaction,
-  errorClass,
-  message,
-  expected,
-  timestamp,
-  conf
-) {
+function _getErrorEventIntrinsicAttrs(transaction, errorClass, message, expected, timestamp, conf) {
   // the server expects seconds instead of milliseconds
-  if (timestamp) timestamp = timestamp / 1000
+  if (timestamp) {
+    timestamp = timestamp / 1000
+  }
 
   var attributes = {
-    type: "TransactionError",
-    "error.class": errorClass,
-    "error.message": conf.high_security ? '' : message,
-    timestamp: timestamp,
+    'type': 'TransactionError',
+    'error.class': errorClass,
+    'error.message': conf.high_security ? '' : message,
+    'timestamp': timestamp,
     'error.expected': expected
   }
 
@@ -190,9 +178,9 @@ function _getErrorEventIntrinsicAttrs(
     }
 
     if (transaction.syntheticsData) {
-      attributes["nr.syntheticsResourceId"] = transaction.syntheticsData.resourceId
-      attributes["nr.syntheticsJobId"] = transaction.syntheticsData.jobId
-      attributes["nr.syntheticsMonitorId"] = transaction.syntheticsData.monitorId
+      attributes['nr.syntheticsResourceId'] = transaction.syntheticsData.resourceId
+      attributes['nr.syntheticsJobId'] = transaction.syntheticsData.jobId
+      attributes['nr.syntheticsMonitorId'] = transaction.syntheticsData.monitorId
     }
 
     if (transaction.agent.config.distributed_tracing.enabled) {

package/lib/feature_flags.js

@@ -9,14 +9,12 @@
 exports.prerelease = {
   express5: false,
   await_support: true,
-  serverless_mode: true, // TODO: Move to released & remove code checks next Major.
   promise_segments: false,
   reverse_naming_rules: false,
   fastify_instrumentation: false,
-  // Starts by defaulting true as introducing for deprecation/removal purposes.
-  // Will eventually set false prior full removal of feature.
-  certificate_bundle: true,
-  new_promise_tracking: false
+  certificate_bundle: false,
+  new_promise_tracking: false,
+  unresolved_promise_cleanup: true
 }
 
 // flags that are no longer used for released features
@@ -28,12 +26,11 @@ exports.released = [
   'express_segments',
   'native_metrics',
   'protocol_17',
+  'serverless_mode',
   'send_request_uri_attribute',
   'synthetics',
   'dt_format_w3c'
 ]
 
 // flags that are no longer used for unreleased features
-exports.unreleased = [
-  'unreleased'
-]
+exports.unreleased = ['unreleased']

package/lib/grpc/connection/states.js

@@ -5,10 +5,10 @@
 
 'use strict'
 module.exports = {
-  disconnected:0,
-  connecting:1,
-  connected:2,
-  0:'disconnected',
-  1:'connecting',
-  2:'connected'
+  disconnected: 0,
+  connecting: 1,
+  connected: 2,
+  0: 'disconnected',
+  1: 'connecting',
+  2: 'connected'
 }

package/lib/grpc/connection.js

@@ -7,7 +7,7 @@
 
 const protoLoader = require('@grpc/proto-loader')
 const grpc = require('../proxy/grpc')
-const logger = require('../logger').child({component: 'grpc_connection'})
+const logger = require('../logger').child({ component: 'grpc_connection' })
 const EventEmitter = require('events')
 const NAMES = require('../metrics/names')
 const util = require('util')
@@ -20,15 +20,9 @@ const GRPC_TEST_META = {
 
 const connectionStates = require('./connection/states')
 
-const PROTO_OPTIONS = {keepCase: true,
-  longs: String,
-  enums: String,
-  defaults: true,
-  oneofs: true
-}
+const PROTO_OPTIONS = { keepCase: true, longs: String, enums: String, defaults: true, oneofs: true }
 
-const PROTO_DEFINITION_PATH = __dirname +
-  '../../../lib/grpc/endpoints/infinite-tracing/v1.proto'
+const PROTO_DEFINITION_PATH = __dirname + '../../../lib/grpc/endpoints/infinite-tracing/v1.proto'
 
 const DEFAULT_RECONNECT_DELAY_MS = 15 * 1000
 
@@ -77,14 +71,14 @@ class GrpcConnection extends EventEmitter {
    * but before the actual connection.
    *
    * @param {string} endpoint the GRPC server's endpoint
-   * @param {string} license_key the agent license key
-   * @param {string} run_id the current agent run id (also called agent run token)
+   * @param {string} licenseKey the agent license key
+   * @param {string} runId the current agent run id (also called agent run token)
    * @param {object} requestHeadersMap request headers map received from server connect.
    * @param {string} [rootCerts] string of root (ca) certificates to attach to the connection.
    */
-  setConnectionDetails(license_key, run_id, requestHeadersMap, rootCerts) {
-    this._licenseKey = license_key
-    this._runId = run_id
+  setConnectionDetails(licenseKey, runId, requestHeadersMap, rootCerts) {
+    this._licenseKey = licenseKey
+    this._runId = runId
     this._requestHeadersMap = requestHeadersMap
     this._rootCerts = rootCerts
 
@@ -129,10 +123,7 @@ class GrpcConnection extends EventEmitter {
       // immediately.
       this._setState(connectionStates.connected, this.stream)
     } catch (err) {
-      logger.warn(
-        err,
-        'Unexpected error establishing gRPC stream, will not attempt reconnect.'
-      )
+      logger.warn(err, 'Unexpected error establishing gRPC stream, will not attempt reconnect.')
       this._disconnect()
     }
   }
@@ -153,13 +144,13 @@ class GrpcConnection extends EventEmitter {
   /**
    * Method returns GRPC metadata for initial connection
    *
-   * @param {string} license_key
-   * @param {string} run_id
+   * @param {string} licenseKey
+   * @param {string} runId
    */
-  _getMetadata(license_key, run_id, requestHeadersMap, env) {
+  _getMetadata(licenseKey, runId, requestHeadersMap, env) {
     const metadata = new grpc.Metadata()
-    metadata.add('license_key', license_key)
-    metadata.add('agent_run_token', run_id)
+    metadata.add('license_key', licenseKey)
+    metadata.add('agent_run_token', runId)
 
     // p17 spec: If request_headers_map is empty or absent,
     // the agent SHOULD NOT apply anything to its requests.
@@ -199,10 +190,7 @@ class GrpcConnection extends EventEmitter {
 
     logger.trace('Reconnecting to gRPC endpoint in [%s] seconds', reconnectDelayMs)
 
-    setTimeout(
-      this.connectSpans.bind(this),
-      reconnectDelayMs
-    )
+    setTimeout(this.connectSpans.bind(this), reconnectDelayMs)
   }
 
   _disconnect() {
@@ -251,7 +239,7 @@ class GrpcConnection extends EventEmitter {
     // if we are not going to use the data.
     stream.on('data', function data(response) {
       if (logger.traceEnabled()) {
-        logger.trace("gRPC span response stream: %s", JSON.stringify(response))
+        logger.trace('gRPC span response stream: %s', JSON.stringify(response))
       }
     })
 
@@ -259,13 +247,12 @@ class GrpcConnection extends EventEmitter {
     // and we need to disconnect
     stream.on('status', (grpcStatus) => {
       logger.trace('gRPC Status Received [%s]: %s', grpcStatus.code, grpcStatus.details)
-      const grpcStatusName =
-        grpc.status[grpcStatus.code] ? grpc.status[grpcStatus.code] : 'UNKNOWN'
+      const grpcStatusName = grpc.status[grpcStatus.code] ? grpc.status[grpcStatus.code] : 'UNKNOWN'
 
       if (grpc.status[grpc.status.UNIMPLEMENTED] === grpcStatusName) {
-        this._metrics.getOrCreateMetric(
-          NAMES.INFINITE_TRACING.SPAN_RESPONSE_GRPC_UNIMPLEMENTED
-        ).incrementCallCount()
+        this._metrics
+          .getOrCreateMetric(NAMES.INFINITE_TRACING.SPAN_RESPONSE_GRPC_UNIMPLEMENTED)
+          .incrementCallCount()
 
         // per the spec, An UNIMPLEMENTED status code from gRPC indicates
         // that the versioned Trace Observer is no longer available. Agents
@@ -277,9 +264,11 @@ class GrpcConnection extends EventEmitter {
       } else if (grpc.status[grpc.status.OK] === grpcStatusName) {
         this._reconnect()
       } else {
-        this._metrics.getOrCreateMetric(
-          util.format(NAMES.INFINITE_TRACING.SPAN_RESPONSE_GRPC_STATUS, grpcStatusName)
-        ).incrementCallCount()
+        this._metrics
+          .getOrCreateMetric(
+            util.format(NAMES.INFINITE_TRACING.SPAN_RESPONSE_GRPC_STATUS, grpcStatusName)
+          )
+          .incrementCallCount()
 
         this._reconnect(this._reconnectDelayMs)
       }
@@ -288,7 +277,8 @@ class GrpcConnection extends EventEmitter {
     // if we don't listen for the errors they'll bubble
     // up and crash the application
     stream.on('error', (err) => {
-      this._metrics.getOrCreateMetric(NAMES.INFINITE_TRACING.SPAN_RESPONSE_ERROR)
+      this._metrics
+        .getOrCreateMetric(NAMES.INFINITE_TRACING.SPAN_RESPONSE_ERROR)
         .incrementCallCount()
 
       // For errors, the status will either result in a disconnect or a reconnect
@@ -339,8 +329,12 @@ class GrpcConnection extends EventEmitter {
       this._client = this._createClient(this._endpoint)
     }
 
-    const metadata =
-      this._getMetadata(this._licenseKey, this._runId, this._requestHeadersMap, process.env)
+    const metadata = this._getMetadata(
+      this._licenseKey,
+      this._runId,
+      this._requestHeadersMap,
+      process.env
+    )
 
     const stream = this._client.recordSpan(metadata)
     this._setupSpanStreamObservers(stream)
@@ -361,17 +355,12 @@ class GrpcConnection extends EventEmitter {
 
     const packageDefinition = protoLoader.loadSync(PROTO_DEFINITION_PATH, PROTO_OPTIONS)
 
-    const protoDescriptor = grpc.loadPackageDefinition(
-      packageDefinition
-    )
+    const protoDescriptor = grpc.loadPackageDefinition(packageDefinition)
 
     const traceApi = protoDescriptor.com.newrelic.trace.v1
 
     const credentials = this._generateCredentials(grpc)
-    const client = new traceApi.IngestService(
-      endpoint,
-      credentials
-    )
+    const client = new traceApi.IngestService(endpoint, credentials)
 
     return client
   }

package/lib/header-attributes.js

@@ -17,55 +17,55 @@ const COLLECTED_REQUEST_HEADERS = [
 ]
 
 const HEADER_ATTR_NAMES = {
-  'accept':                       'accept',
-  'accept-charset':               'acceptCharset',
-  'accept-encoding':              'acceptEncoding',
+  'accept': 'accept',
+  'accept-charset': 'acceptCharset',
+  'accept-encoding': 'acceptEncoding',
   'access-control-allow-headers': 'accessControlAllowHeaders',
   'access-control-allow-methods': 'accessControlAllowMethods',
-  'access-control-allow-origin':  'accessControlAllowOrigin',
-  'age':                          'age',
-  'allow':                        'allow',
-  'authorization':                'authorization',
-  'cache-control':                'cacheControl',
-  'connection':                   'connection',
-  'cookie':                       'cookie',
-  'content-encoding':             'contentEncoding',
-  'content-length':               'contentLength',
-  'content-type':                 'contentType',
-  'date':                         'date',
-  'etag':                         'eTag',
-  'expect':                       'expect',
-  'expires':                      'expires',
-  'forwarded':                    'forwarded',
-  'host':                         'host',
-  'if-match':                     'ifMatch',
-  'if-modified-since':            'ifModifiedSince',
-  'last-modified':                'lastModified',
-  'location':                     'location',
-  'newrelic':                     'newrelic',
-  'origin':                       'origin',
-  'proxy-authorization':          'proxyAuthorization',
-  'referer':                      'referer',
-  'refresh':                      'refresh',
-  'server':                       'server',
-  'set-cookie':                   'setCookie',
-  'transfer-encoding':            'transferEncoding',
-  'user-agent':                   'userAgent',
-  'upgrade':                      'upgrade',
-  'vary':                         'vary',
-  'x-correlation-id':             'xCorrelationId',
-  'x-csrf-token':                 'xCsrfToken',
-  'x-forwarded-for':              'xForwardedFor',
-  'x-http-method-override':       'xHttpMethodOverride',
-  'x-newrelic-app-data':          'xNewrelicAppData',
-  'x-newrelic-id':                'xNewrelicId',
-  'x-newrelic-synthetics':        'xNewrelicSynthetics',
-  'x-newrelic-transaction':       'xNewrelicTransaction',
-  'x-powered-by':                 'xPoweredBy',
-  'x-queue-start':                'xQueueStart',
-  'x-request-id':                 'xRequestId',
-  'x-request-start':              'xRequestStart',
-  'x-requested-with':             'xRequestedWith'
+  'access-control-allow-origin': 'accessControlAllowOrigin',
+  'age': 'age',
+  'allow': 'allow',
+  'authorization': 'authorization',
+  'cache-control': 'cacheControl',
+  'connection': 'connection',
+  'cookie': 'cookie',
+  'content-encoding': 'contentEncoding',
+  'content-length': 'contentLength',
+  'content-type': 'contentType',
+  'date': 'date',
+  'etag': 'eTag',
+  'expect': 'expect',
+  'expires': 'expires',
+  'forwarded': 'forwarded',
+  'host': 'host',
+  'if-match': 'ifMatch',
+  'if-modified-since': 'ifModifiedSince',
+  'last-modified': 'lastModified',
+  'location': 'location',
+  'newrelic': 'newrelic',
+  'origin': 'origin',
+  'proxy-authorization': 'proxyAuthorization',
+  'referer': 'referer',
+  'refresh': 'refresh',
+  'server': 'server',
+  'set-cookie': 'setCookie',
+  'transfer-encoding': 'transferEncoding',
+  'user-agent': 'userAgent',
+  'upgrade': 'upgrade',
+  'vary': 'vary',
+  'x-correlation-id': 'xCorrelationId',
+  'x-csrf-token': 'xCsrfToken',
+  'x-forwarded-for': 'xForwardedFor',
+  'x-http-method-override': 'xHttpMethodOverride',
+  'x-newrelic-app-data': 'xNewrelicAppData',
+  'x-newrelic-id': 'xNewrelicId',
+  'x-newrelic-synthetics': 'xNewrelicSynthetics',
+  'x-newrelic-transaction': 'xNewrelicTransaction',
+  'x-powered-by': 'xPoweredBy',
+  'x-queue-start': 'xQueueStart',
+  'x-request-id': 'xRequestId',
+  'x-request-start': 'xRequestStart',
+  'x-requested-with': 'xRequestedWith'
 }
 
 const REQUEST_HEADER_PREFIX = 'request.headers.'
@@ -116,7 +116,7 @@ function _collectHeaders(headers, nameMap, prefix, transaction) {
     : Object.keys(headers)
 
   const segment = transaction.agent.tracer.getSegment()
-  
+
   for (var i = 0; i < headerKeys.length; i++) {
     var headerKey = headerKeys[i]
     var header = headers[headerKey]
@@ -130,11 +130,7 @@ function _collectHeaders(headers, nameMap, prefix, transaction) {
       }
 
       var attributeName = nameMap[headerKey] || prefix + _headerToCamelCase(headerKey)
-      transaction.trace.attributes.addAttribute(
-        DESTS.TRANS_COMMON,
-        attributeName,
-        header
-      )
+      transaction.trace.attributes.addAttribute(DESTS.TRANS_COMMON, attributeName, header)
 
       segment.addSpanAttribute(attributeName, header)
     }

package/lib/instrumentation/amqplib.js

@@ -7,7 +7,6 @@
 
 var url = require('url')
 
-
 // TODO: Make this an external module.
 // var newrelic = require('newrelic')
 // newrelic.instrumentMessages('amqplib', instrumentChannelAPI)
@@ -66,7 +65,6 @@ var CHANNEL_METHODS = [
 
 var TEMP_RE = /^amq\./
 
-
 function instrumentChannelAPI(shim, amqp) {
   instrumentAMQP(shim, amqp, true)
   wrapPromiseChannel(shim)
@@ -79,7 +77,7 @@ function instrumentCallbackAPI(shim, amqp) {
 
 function instrumentAMQP(shim, amqp, promiseMode) {
   if (!amqp || !amqp.connect) {
-    shim.logger.debug('This module is not the amqplib we\'re looking for.')
+    shim.logger.debug("This module is not the amqplib we're looking for.")
     return false
   }
 
@@ -95,7 +93,7 @@ function instrumentAMQP(shim, amqp, promiseMode) {
 
     if (shim.isString(connArgs)) {
       connArgs = url.parse(connArgs)
-      params = {host: connArgs.hostname}
+      params = { host: connArgs.hostname }
       if (connArgs.port) {
         params.port = connArgs.port
       }
@@ -138,10 +136,7 @@ function wrapChannel(shim) {
       var segment = shim.getSegment()
       var cb = arguments[arguments.length - 1]
       if (!shim.isFunction(cb) || !segment) {
-        shim.logger.debug(
-          {cb: !!cb, segment: !!segment},
-          'Not binding sendOrEnqueue callback'
-        )
+        shim.logger.debug({ cb: !!cb, segment: !!segment }, 'Not binding sendOrEnqueue callback')
         return fn.apply(this, arguments)
       }
 
@@ -245,7 +240,7 @@ function wrapPromiseChannel(shim) {
         headers = message.properties.headers
       }
 
-      return {parameters: parameters, headers: headers}
+      return { parameters: parameters, headers: headers }
     }
   })
 
@@ -255,7 +250,7 @@ function wrapPromiseChannel(shim) {
       queue = null
     }
 
-    return {queue: queue, promise: true}
+    return { queue: queue, promise: true }
   })
 
   shim.recordSubscribedConsume(proto, 'consume', {
@@ -328,7 +323,7 @@ function wrapCallbackChannel(shim) {
         headers = message.properties.headers
       }
 
-      return {parameters: parameters, headers: headers}
+      return { parameters: parameters, headers: headers }
     }
   })
 
@@ -338,10 +333,9 @@ function wrapCallbackChannel(shim) {
       queue = null
     }
 
-    return {queue: queue, callback: shim.LAST}
+    return { queue: queue, callback: shim.LAST }
   })
 
-
   shim.recordSubscribedConsume(proto, 'consume', {
     name: 'amqplib.Channel#consume',
     queue: shim.FIRST,
@@ -355,10 +349,7 @@ function wrapCallbackChannel(shim) {
 function describeMessage(shim, consumer, name, args) {
   var message = args[0]
   if (!message || !message.properties) {
-    shim.logger.debug(
-      {message: message},
-      'Failed to find message in consume arguments.'
-    )
+    shim.logger.debug({ message: message }, 'Failed to find message in consume arguments.')
     return null
   }