newrelic 6.6.0 → 6.9.0

package/NEWS.md

@@ -1,3 +1,84 @@
+### 6.9.0 (2020-06-08):
+
+* Added AWS API Gateway V2 Support to lambda instrumentation.
+
+* Added 'transaction.name' intrinsic to active span at time transaction name is finalized.
+
+  This enables finding transaction name for traces that may not have a matching transaction event.
+
+* Added 'error.expected' attribute to span active at time expected error was noticed.
+
+* Dropped errors earlier during collection when error collection is disabled.
+
+  Error attributes will no longer show up on spans when error collection has been disabled. Other unnecessary work will also be avoided.
+
+* Removed allocation of logging-only objects used by transaction naming when those log levels are disabled.
+
+* Upgraded escodegen from 1.12.0 to 1.14.1.
+
+* Upgraded readable-stream from 3.4.0 to 3.6.0.
+
+* Upgraded @grpc/proto-loader from 0.5.3 to 0.5.4.
+
+* Converted facts unit test to use tap API.
+
+* Converted transaction 'finalizeName...' unit tests to use tap API.
+
+* Added several items to .npmignore to prevent accidental publishing.
+
+* Fixed Redis client w/o callback versioned test flicker.
+
+  Doesn't end transaction until error encountered. Increases wait time for first operation which has to complete for the second operation to be successful.
+
+### 6.8.0 (2020-05-21):
+
+* Bumped @newrelic/native-metrics to ^5.1.0.
+
+  Upgraded nan to ^2.14.1 to resolve 'GetContents' deprecation warning with Node 14. This version of the native metrics module is tested against Node 14 and includes a pre-built binary download backup for Node 14.
+
+* Added whitespace trimming of license key configuration values.
+
+  Previously, when a license key was entered with leading or trailing whitespace, it would be used as-is and result in a validation failure. This most commonly occurred with environment variable based configuration.
+
+* Moved to GitHub actions for CI.
+
+* Updated PR template and added initial issue templates.
+
+* Converted most of the collector API unit tests to use the tap API. Split larger test groupings into their own test files.
+
+### 6.7.1 (2020-05-14):
+
+* Added synthetics headers to transaction event intrinsics for DT
+
+* Fixed stale comment documentation with regards to segment recording
+
+### 6.7.0 (2020-05-06):
+
+* Added a configurable-length span queue to Infinite Tracing:
+  infinite_tracing.span_events.queue_size.
+
+  The queue length can be modified to balance the needs of keeping full traces
+  against trade-off of memory usage and CPU overhead in a high-throughput
+  application.
+
+* Fixed issue where API.instrumentLoadedModule could throw an exception when it
+  failed.
+
+  Error details will now be caught and logged.
+
+* Resolved non-proxy minimist security warnings by bumping dependencies.
+
+  These updates only impact development dependencies. Thank you to @devfreddy for
+  the contribution.
+
+  * Updated minimist sub-deps to resolve most related security warnings.
+  * Updated tap to resolve remaining tap security warnings.
+  * Updated @newrelic/proxy.
+
+* Updated remaining /api unit tests to use tap API.
+
+* Updated @grpc/grpc-js to v1.0.3.
+
 ### 6.6.0 (2020-04-20):
 
 * Added support for [Infinite Tracing on New Relic

package/README.md

@@ -742,3 +742,5 @@ license and the licenses of its dependencies.
 [6]: https://github.com/newrelic/node-newrelic/blob/master/lib/config/default.js
 [7]: https://docs.newrelic.com/docs/agents/nodejs-agent/installation-configuration/nodejs-agent-configuration
 
+
+

package/api.js

@@ -342,13 +342,13 @@ API.prototype.addCustomAttributes = function addCustomAttributes(atts) {
 
 /**
  * Add custom span attributes in an object to the current segment/span.
- * 
+ *
  * See documentation for newrelic.addCustomSpanAttribute for more information.
- * 
+ *
  * An example of setting a custom span attribute:
- * 
+ *
  *    newrelic.addCustomSpanAttribute({test: 'value', test2: 'value2'})
- * 
+ *
  * @param {object} [atts]
  * @param {string} [atts.KEY] The name you want displayed in the RPM UI.API.
  * @param {string} [atts.KEY.VALUE] The value you want displayed.  Must be serializable.
@@ -396,7 +396,7 @@ API.prototype.addCustomSpanAttribute = function addCustomSpanAttribute(key, valu
   }
 
   const segment = this.agent.tracer.getSegment()
-  
+
   if (!segment) {
     return logger.debug(
       'Could not add attribute %s. No available span/segment.',
@@ -1344,31 +1344,37 @@ function instrumentLoadedModule(moduleName, module) {
     NAMES.SUPPORTABILITY.API + '/instrumentLoadedModule'
   )
   metric.incrementCallCount()
+  try {
+    const instrumentationName = shimmer.getInstrumentationNameFromModuleName(moduleName)
+    if (!shimmer.registeredInstrumentations[instrumentationName]) {
+      logger.warn("No instrumentation registered for '%s'.", instrumentationName)
+      return false
+    }
 
-  const instrumentationName = shimmer.getInstrumentationNameFromModuleName(moduleName)
-  if (!shimmer.registeredInstrumentations[instrumentationName]) {
-    logger.warn("No instrumentation registered for '%s'.", instrumentationName)
-    return false
-  }
-
-  const instrumentation = shimmer.registeredInstrumentations[instrumentationName]
-  if (!instrumentation.onRequire) {
-    logger.warn("No onRequire function registered for '%s'.", instrumentationName)
-    return false
-  }
+    const instrumentation = shimmer.registeredInstrumentations[instrumentationName]
+    if (!instrumentation.onRequire) {
+      logger.warn("No onRequire function registered for '%s'.", instrumentationName)
+      return false
+    }
 
-  const resolvedName = require.resolve(moduleName)
+    const resolvedName = require.resolve(moduleName)
 
-  const shim = shims.createShimFromType(
-    instrumentation.type,
-    this.agent,
-    moduleName,
-    resolvedName
-  )
+    const shim = shims.createShimFromType(
+      instrumentation.type,
+      this.agent,
+      moduleName,
+      resolvedName
+    )
 
-  instrumentation.onRequire(shim, module, moduleName)
+    instrumentation.onRequire(shim, module, moduleName)
 
-  return true
+    return true
+  } catch (error) {
+    logger.error(
+      'instrumentLoadedModule encountered an error, module not instrumentend: %s',
+      error
+    )
+  }
 }
 
 /**

package/bin/run-versioned-tests.sh

@@ -21,5 +21,14 @@ fi
 
 export AGENT_PATH=`pwd`
 
+# @koa/router 8.03+ breaks segment naming for nested routes
+skip="koa"
+
+# Don't run the aws-sdk tests if we don't have the keys set
+if [[ -z "$AWS_ACCESS_KEY_ID" ]]; then
+  skip="${skip},aws-sdk"
+fi
+
+
 # This is meant to be temporary. Remove once new major version with fixes rolled into agent.
-time ./node_modules/.bin/versioned-tests $VERSIONED_MODE -i 2 -s koa ${directories[@]}
+time ./node_modules/.bin/versioned-tests $VERSIONED_MODE -i 2 -s $skip ${directories[@]}

package/bin/ssl.sh

@@ -8,7 +8,7 @@ set -x  # be chatty and show the lines we're running
 # that are mysterious and not understood, so let
 # bail early if we detect that's the case
 ENGINE_OPENSSL=`openssl version | awk '{print $(1)}'`
-if [ "$ENGINE_OPENSSL" == "LibreSSL" ]
+if [ "$ENGINE_OPENSSL" = "LibreSSL" ]
 then
     echo "LibreSSL is not supported, please install a stock openssl and \n"
     echo "make sure that openssl binary is in your PATH"
@@ -25,7 +25,7 @@ CERTIFICATE="test/lib/self-signed-test-certificate.crt"
 
 # USAGE: ./bin/ssl.sh clear
 # a sub command to remove all the generated files and start over
-if [ "$1" == "clear" ]
+if [ "$1" = "clear" ]
 then
     rm $SSLKEY
     rm $CACERT
@@ -37,7 +37,7 @@ fi
 
 # if there's already a certificate, then exit, but
 # exit with a success code so build continue
-if [ -a $CERTIFICATE ]; then
+if [ -e $CERTIFICATE ]; then
   exit 0;
 fi
 

package/lib/config/default.js

@@ -891,16 +891,24 @@ exports.config = () => ({
     trace_observer: {
       /**
        * The URI HOST of the observer.  Setting this enables infinite tracing.
-       * 
+       *
        * @env NEW_RELIC_INFINITE_TRACING_TRACE_OBSERVER_HOST
        */
       host: '',
       /**
        * The URI PORT of the observer.
-       * 
+       *
        * @env NEW_RELIC_INFINITE_TRACING_TRACE_OBSERVER_PORT
        */
       port: '443'
+    },
+    span_events: {
+      /**
+       * The amount of spans to hold onto before dropping them
+       *
+       * @env NEW_RELIC_INFINITE_TRACING_SPAN_EVENTS_QUEUE_SIZE
+       */
+      queue_size: 10000
     }
   },
 

package/lib/config/env.js

@@ -157,7 +157,8 @@ const ENV_MAPPING = {
     trace_observer: {
       host: 'NEW_RELIC_INFINITE_TRACING_TRACE_OBSERVER_HOST',
       port: 'NEW_RELIC_INFINITE_TRACING_TRACE_OBSERVER_PORT'
-    }
+    },
+    queue_size: 'NEW_RELIC_INFINITE_TRACING_QUEUE_SIZE'
   }
 }
 
@@ -245,7 +246,8 @@ const FLOAT_VARS = new Set([
 
 const INT_VARS = new Set([
   'NEW_RELIC_EXPLAIN_THRESHOLD',
-  'NEW_RELIC_MAX_SQL_SAMPLES'
+  'NEW_RELIC_MAX_SQL_SAMPLES',
+  'NEW_RELIC_INFINITE_TRACING_SPAN_EVENTS_QUEUE_SIZE'
 ])
 
 exports.ENV_MAPPING = ENV_MAPPING

package/lib/config/index.js

@@ -1323,6 +1323,10 @@ Config.prototype._canonicalize = function _canonicalize() {
 
   this.serverless_mode.enabled = this.serverless_mode.enabled
     && this.feature_flag.serverless_mode
+
+  if (this.license_key) {
+    this.license_key = this.license_key.trim()
+  }
 }
 
 function _parseCodes(codes) {

package/lib/errors/error-collector.js

@@ -193,6 +193,12 @@ class ErrorCollector {
       return
     }
 
+    const shouldCollectErrors = this._shouldCollectErrors()
+    if (!shouldCollectErrors) {
+      logger.trace('error_collector.enabled is false, dropping application error.')
+      return
+    }
+
     if (errorHelper.shouldIgnoreError(transaction, error, this.config)) {
       logger.trace('Ignoring error')
       return
@@ -223,7 +229,15 @@ class ErrorCollector {
    * @param {Exception}  exception The Exception to be traced.
    */
   addUserError(transaction, error, customAttributes) {
-    if (!error) return
+    if (!error) {
+      return
+    }
+
+    const shouldCollectErrors = this._shouldCollectErrors()
+    if (!shouldCollectErrors) {
+      logger.trace('error_collector.enabled is false, dropping user reported error.')
+      return
+    }
 
     const timestamp = Date.now()
     const exception = new Exception({error, timestamp, customAttributes})
@@ -270,18 +284,6 @@ class ErrorCollector {
       return false
     }
 
-    // allow enabling & disabling the error tracer at runtime
-    // TODO: it would be better to check config in the public add() to prevents collecting
-    // errors on the transaction unnecessarily. Should we allow the work above or
-    // short-circuit sooner?
-    if (
-      !this.config.collect_errors ||
-      !this.config.error_collector ||
-      !this.config.error_collector.enabled
-    ) {
-      return false
-    }
-
     if (exception.error) {
       logger.trace(exception.error, 'Got exception to trace:')
     }
@@ -304,7 +306,10 @@ class ErrorCollector {
       }
     }
 
-    this.traceAggregator.add(errorTrace)
+    // defaults true in config/index. can be modified server-side
+    if (this.config.collect_errors) {
+      this.traceAggregator.add(errorTrace)
+    }
 
     if (this.config.error_collector.capture_events === true) {
       const priority = transaction && transaction.priority || Math.random()
@@ -328,6 +333,17 @@ class ErrorCollector {
     this.seenObjectsByTransaction = Object.create(null)
   }
 
+  _shouldCollectErrors() {
+    const errorCollectorEnabled =
+      this.config.error_collector && this.config.error_collector.enabled
+
+    const shouldCaptureTraceOrEvent =
+      this.config.collect_errors || // are traces enabled
+      (this.config.error_collector && this.config.error_collector.capture_events)
+
+    return errorCollectorEnabled && shouldCaptureTraceOrEvent
+  }
+
   reconfigure(config) {
     this.config = config
 

package/lib/instrumentation/core/http.js

@@ -117,28 +117,30 @@ function wrapEmitWithTransaction(agent, emit, isHTTPS) {
       transaction.queueTime = Date.now() - queueTimeStamp
     }
 
+    const synthHeader = request.headers[NEWRELIC_SYNTHETICS_HEADER]
+
+    if (synthHeader && agent.config.trusted_account_ids && agent.config.encoding_key) {
+      handleSyntheticsHeader(
+        synthHeader,
+        agent.config.encoding_key,
+        agent.config.trusted_account_ids,
+        transaction
+      )
+    }
+
     if (agent.config.distributed_tracing.enabled) {
       // Node http headers are automatically lowercase
       transaction.acceptDistributedTraceHeaders(transport, request.headers)
     } else if (agent.config.cross_application_tracer.enabled) {
-      var encKey = agent.config.encoding_key
-      var incomingCatId = request.headers[NEWRELIC_ID_HEADER]
-      var obfTransaction = request.headers[NEWRELIC_TRANSACTION_HEADER]
-      var synthHeader = request.headers[NEWRELIC_SYNTHETICS_HEADER]
-      if (encKey) {
-        cat.handleCatHeaders(incomingCatId, obfTransaction, encKey, transaction)
+      const incomingCatId = request.headers[NEWRELIC_ID_HEADER]
+      const obfTransaction = request.headers[NEWRELIC_TRANSACTION_HEADER]
+
+      if (agent.config.encoding_key) {
+        cat.handleCatHeaders(incomingCatId, obfTransaction, agent.config.encoding_key, transaction)
         if (transaction.incomingCatId) {
           logger.trace('Got inbound request CAT headers in transaction %s',
             transaction.id)
         }
-        if (synthHeader && agent.config.trusted_account_ids) {
-          handleSyntheticsHeader(
-            synthHeader,
-            encKey,
-            agent.config.trusted_account_ids,
-            transaction
-          )
-        }
       }
     }
 

package/lib/metrics/normalizer.js

@@ -4,7 +4,7 @@ var EventEmitter = require('events').EventEmitter
 var util = require('util')
 var logger = require('../logger').child({component: 'metric_normalizer'})
 var deepEqual = require('../util/deep-equal')
-var Rule = require('./normalizer/rule')
+var NormalizerRule = require('./normalizer/rule')
 var NAMES = require('../metrics/names.js')
 
 
@@ -82,7 +82,7 @@ MetricNormalizer.prototype.load = function load(json) {
 
     json.forEach(function cb_forEach(ruleJSON) {
       // no need to add the same rule twice
-      var rule = new Rule(ruleJSON)
+      var rule = new NormalizerRule(ruleJSON)
       if (!this.rules.find(deepEqual.bind(null, rule))) {
         this.rules.push(rule)
         logger.trace("Loaded %s normalization rule: %s", this.type, rule)
@@ -142,9 +142,9 @@ MetricNormalizer.prototype.loadFromConfig = function loadFromConfig() {
           : r.precedence > json.eval_order
       })
       if (insert === -1) {
-        this.rules.push(new Rule(json))
+        this.rules.push(new NormalizerRule(json))
       } else {
-        this.rules.splice(insert, 0, new Rule(json))
+        this.rules.splice(insert, 0, new NormalizerRule(json))
       }
     }, this)
   }
@@ -186,7 +186,7 @@ MetricNormalizer.prototype.addSimple = function addSimple(pattern, name) {
     json.ignore = true
   }
 
-  this.rules.unshift(new Rule(json))
+  this.rules.unshift(new NormalizerRule(json))
 }
 
 /**

package/lib/serverless/event-sources.json

@@ -21,7 +21,7 @@
             "httpMethod",
             "path",
             "requestContext",
-            "resource"
+            "requestContext.stage"
         ]
     },
     "cloudFront": {

package/lib/shim/shim.js

@@ -989,9 +989,9 @@ function record(nodule, properties, recordNamer) {
       })
 
       // Apply the function, and (if it returned a stream) bind that too.
-      // If you are looking here Geoff, the reason there is no check for
-      // `segment` is because it should be guaranteed by the parent and active
-      // transaction check at the beginning of this function. :)
+      // The reason there is no check for `segment` is because it should
+      // be guaranteed by the parent and active transaction check
+      // at the beginning of this function.
       var ret = _applyRecorderSegment(segment, this, args, segDesc)
       if (ret) {
         if (segDesc.stream) {

package/lib/spans/create-span-event-aggregator.js

@@ -39,7 +39,8 @@ function createStreamingAggregator(config, collector, metrics) {
   const spanStreamer = new SpanStreamer(
     config.license_key,
     connection,
-    metrics
+    metrics,
+    config.infinite_tracing.span_events.queue_size
   )
 
   const opts = {

package/lib/spans/span-context.js

@@ -0,0 +1,13 @@
+'use strict'
+
+class SpanContext {
+  constructor(intrinsicAttributes) {
+    this.intrinsicAttributes = intrinsicAttributes || Object.create(null)
+  }
+
+  addIntrinsicAttribute(key, value) {
+    this.intrinsicAttributes[key] = value
+  }
+}
+
+module.exports = SpanContext

package/lib/spans/span-event.js

@@ -91,6 +91,11 @@ class SpanEvent {
       span = new SpanEvent(attributes, customAttributes)
     }
 
+    const spanContext = segment.getSpanContext()
+    for (const [key, value] of Object.entries(spanContext.intrinsicAttributes)) {
+      span.intrinsics[key] = value
+    }
+
     const tx = segment.transaction
 
     span.intrinsics.traceId = tx.traceId

package/lib/spans/span-streamer.js

@@ -1,94 +1,128 @@
 'use strict'
 
 const logger = require('../logger').child({component: 'span-streamer'})
+const NAMES = require('../metrics/names').INFINITE_TRACING
 
-const NAMES = require('../metrics/names')
+const SPAN_DROP_MSG =
+  'Queue full, dropping spans.'
+const SPAN_DROP_INTERVAL = 5
 
-const NO_STREAM_WARNING =
-  'Attempting to stream spans before connection created. ' +
-  'This warning will not appear again this agent run.'
-
-const BACK_PRESSURE_WARNING =
-  'Back pressure detected in SpanStreamer! Spans will be dropped until the current batch ' +
-  'has fully sent. Will not warn again for %s seconds.'
-const BACK_PRESSURE_WARNING_INTERVAL = 60 // in seconds
-
-const BACK_PRESSURE_STOP = 'Back pressure has ended, continuing to stream'
 
 class SpanStreamer {
-  constructor(license_key, connection, metrics) {
+  constructor(license_key, connection, metrics, queue_size) {
     this.stream = null
     this.license_key = license_key
     this.connection = connection
+    this.queue_size = queue_size
+    this.spans = []
     this._metrics = metrics
     this._writable = false
 
     // 'connected' indicates a safely writeable stream.
     // May still be mid-connect to gRPC server.
     this.connection.on('connected', (stream) =>{
+      logger.info('Span streamer connected')
       this.stream = stream
       this._writable = true
+      this.sendQueue()
     })
 
     this.connection.on('disconnected', () =>{
+      logger.info('Span streamer disconnected')
       this.stream = null
       this._writable = false
     })
   }
 
+  /* Accepts a span and either writes it to the stream, queues it to be sent,
+   * or drops it depending on stream/queue state
+   */
   write(span) {
-    if (!this.stream) {
-      logger.warnOnce(NO_STREAM_WARNING)
-      return false
-    }
+    this._metrics.getOrCreateMetric(NAMES.SEEN).incrementCallCount()
 
+    // If not writeable (because of backpressure) queue the span
     if (!this._writable) {
-      return false
+      if (this.spans.length <= this.queue_size) {
+        this.spans.push(span)
+        return
+      }
+
+      // If the queue is full drop the span
+      logger.infoOncePer(
+        // key for the OncePer
+        'SPAN_DROP_MSG',
+        // interval in ms
+        SPAN_DROP_INTERVAL * 1000,
+        // message
+        SPAN_DROP_MSG + ' Will not warn again for %s seconds.',
+        // variables to put in log message
+        SPAN_DROP_INTERVAL
+      )
+
+      return
     }
 
     const formattedSpan = span.toStreamingFormat()
 
     try {
-      // false indicates the stream has reached the highWaterMark
-      // and future writes should be avoided until drained. written items,
-      // including the one that returned false, will still be buffered.
-      this._writable = this.stream.write(formattedSpan)
-
-      if (!this._writable) {
-        logger.infoOncePer(
-          'BACK_PRESSURE_START',
-          BACK_PRESSURE_WARNING_INTERVAL * 1000,
-          BACK_PRESSURE_WARNING,
-          BACK_PRESSURE_WARNING_INTERVAL
-        )
-
-        const waitDrainStart = Date.now()
-
-        this.stream.once('drain', () => {
-          const drainCompleted = Date.now()
-          const drainDurationMs = drainCompleted - waitDrainStart
-
-          // Metric can be used to see how frequently completing drains
-          // as well as average time to drain from when we first notice.
-          this._metrics.getOrCreateMetric(NAMES.INFINITE_TRACING.DRAIN_DURATION)
-            .recordValue(drainDurationMs / 1000)
-
-          logger.trace(BACK_PRESSURE_STOP)
-          this._writable = true
-        })
-      }
-
-      // span was added to internal node stream buffer to be sent while draining
-      // so we return true even when we should not write anymore afterwards
-      return true
+      this.send(formattedSpan)
     } catch (err) {
-      logger.trace('Could not stream span.', err)
+      logger.error(err)
       // TODO: something has gone horribly wrong.
       // We may want to log and turn off this aggregator
       // to prevent sending further spans. Maybe even "disable" their creation?
       // or is there a situation where we can recover?
+    }
+  }
+
+  /**
+   *  Sends the span over the stream. Spans are only sent here if the stream is
+   *  in a writable state. If the stream becomes unwritable after sending the
+   *  span, a drain event handler is setup to continue writing when possible.
+   */
+  send(span) {
+    // false indicates the stream has reached the highWaterMark
+    // and future writes should be avoided until drained. written items,
+    // including the one that returned false, will still be buffered.
+    this._writable = this.stream.write(span)
+    this._metrics.getOrCreateMetric(NAMES.SENT).incrementCallCount()
+
+    if (!this._writable) {
+      const waitDrainStart = Date.now()
+      const onDrain = this.drain.bind(this, waitDrainStart)
+      this.stream.once('drain', onDrain)
+    }
+  }
+
+  /**
+   *  Drains the span queue that built up when the connection was
+   *  back-pressured or disconnected. `waitDrainStart` is when the stream
+   *  initially blocked, used to time how long the stream was blocked. If this
+   *  is not defined, it is assumed this is being called after a reconnect,
+   *  and the metric is not used.
+   */
+  drain(waitDrainStart) {
+    // Metric can be used to see how frequently completing drains as well as
+    // average time to drain from when we first notice.
+    const drainCompleted = Date.now()
+    const drainDurationMs = drainCompleted - waitDrainStart
+    this._metrics.getOrCreateMetric(NAMES.DRAIN_DURATION)
+      .recordValue(drainDurationMs / 1000)
+
+    // Once the 'drain' event fires we can begin writing to the stream again
+    this._writable = true
+
+    this.sendQueue()
+  }
 
-      return false
+  sendQueue() {
+    // Continue sending the spans that were in the queue. _writable is checked
+    // so that if a send fails while clearing the queue, this drain handler can
+    // finish, and the drain handler setup on the failed send will then attempt
+    // to clear the queue
+    while (this.spans.length > 0 && this._writable) {
+      const nextObject = this.spans.shift()
+      this.send(nextObject)
     }
   }
 

package/lib/spans/streaming-span-event-aggregator.js

@@ -2,7 +2,6 @@
 
 const Aggregator = require('../aggregators/base-aggregator')
 const StreamingSpanEvent = require('./streaming-span-event')
-const NAMES = require('../metrics/names')
 const logger = require('../logger').child({component: 'streaming-span-event-aggregator'})
 
 const SEND_WARNING =
@@ -20,7 +19,6 @@ class StreamingSpanEventAggregator extends Aggregator {
 
     super(opts, collector)
 
-    this.metricNames = opts.metricNames || NAMES.INFINITE_TRACING
     this.stream = opts.span_streamer
     this.metrics = metrics
     this.started = false
@@ -82,16 +80,8 @@ class StreamingSpanEventAggregator extends Aggregator {
       return
     }
 
-    // SEEN/SENT are to understand where we've had to drop spans due back-pressure, errors,
-    // reconnects, etc. so moving after start check to avoid logging for a
-    // currently unsupported case.
-    this.metrics.getOrCreateMetric(this.metricNames.SEEN).incrementCallCount()
-
     const span = StreamingSpanEvent.fromSegment(segment, parentId, isRoot)
-
-    if (this.stream.write(span)) {
-      this.metrics.getOrCreateMetric(this.metricNames.SENT).incrementCallCount()
-    }
+    this.stream.write(span)
   }
 }
 

package/lib/spans/streaming-span-event.js

@@ -112,6 +112,11 @@ class StreamingSpanEvent {
       span = new StreamingSpanEvent(traceId, agentAttributes, customAttributes)
     }
 
+    const spanContext = segment.getSpanContext()
+    for (const [key, value] of Object.entries(spanContext.intrinsicAttributes)) {
+      span.addIntrinsicAttribute(key, value)
+    }
+
     span.addIntrinsicAttribute('guid', segment.id)
     span.addIntrinsicAttribute('parentId', parentId)
     span.addIntrinsicAttribute('transactionId', transaction.id)

package/lib/transaction/index.js

@@ -381,8 +381,10 @@ Transaction.prototype.isIgnored = function getIgnore() {
  */
 Transaction.prototype.finalizeNameFromUri = finalizeNameFromUri
 function finalizeNameFromUri(requestURL, statusCode) {
-  logger.trace({requestURL: requestURL, statusCode: statusCode, transactionId: this.id,
-    transactionName: this.name}, 'Setting transaction name')
+  if (logger.traceEnabled()) {
+    logger.trace({requestURL: requestURL, statusCode: statusCode, transactionId: this.id,
+      transactionName: this.name}, 'Setting transaction name')
+  }
 
   this.url = urltils.scrub(requestURL)
   this.statusCode = statusCode
@@ -426,11 +428,26 @@ function finalizeNameFromUri(requestURL, statusCode) {
   }
 
   this.baseSegment && this._markAsWeb(requestURL)
-  logger.trace({
-    transactionId: this.id,
-    transactionName: this.name,
-    ignore: this.ignore
-  }, 'Finished setting transaction name from Uri')
+
+  this._copyNameToActiveSpan(this.name)
+
+  if (logger.traceEnabled()) {
+    logger.trace({
+      transactionId: this.id,
+      transactionName: this.name,
+      ignore: this.ignore
+    }, 'Finished setting transaction name from Uri')
+  }
+}
+
+Transaction.prototype._copyNameToActiveSpan = function _copyNameToActiveSpan(name) {
+  const spanContext = this.agent.tracer.getSpanContext()
+  if (!spanContext) {
+    logger.trace('Span context not available, not adding transaction.name attribute for %s', name)
+    return
+  }
+
+  spanContext.addIntrinsicAttribute('transaction.name', name)
 }
 
 /**
@@ -490,11 +507,15 @@ Transaction.prototype.finalizeName = function finalizeName(name) {
 
   this.baseSegment && this.baseSegment.setNameFromTransaction()
 
-  logger.trace({
-    transactionId: this.id,
-    transactionName: this.name,
-    ignore: this.ignore
-  }, 'Finished setting transaction name from string')
+  this._copyNameToActiveSpan(this.name)
+
+  if (logger.traceEnabled()) {
+    logger.trace({
+      transactionId: this.id,
+      transactionName: this.name,
+      ignore: this.ignore
+    }, 'Finished setting transaction name from string')
+  }
 }
 
 /**
@@ -692,11 +713,21 @@ function _linkExceptionToSegment(exception) {
     return
   }
 
+  const config = this.agent.config
+
   // Add error attributes to the span
-  const details = exception.getErrorDetails(this.agent.config)
+  const details = exception.getErrorDetails(config)
   segment.addAttribute('error.message', details.message)
   segment.addAttribute('error.class', details.type)
 
+  const isExpected =
+    errorHelper.isExpectedErrorClass(config, details.type) ||
+    errorHelper.isExpectedErrorMessage(config, details.type, details.message)
+
+  if (isExpected) {
+    segment.addAttribute('error.expected', isExpected)
+  }
+
   // Add the span/segment ID to the exception as agent attributes
   exception.agentAttributes.spanId = segment.id
 }

package/lib/transaction/trace/segment.js

@@ -8,6 +8,7 @@ const hashes = require('../../util/hashes')
 
 const {Attributes, MAXIMUM_CUSTOM_ATTRIBUTES} = require('../../attributes')
 const ExclusiveCalculator = require('./exclusive-time-calculator')
+const SpanContext = require('../../spans/span-context')
 
 const NAMES = require('../../metrics/names')
 const INSTANCE_UNKNOWN = 'unknown'
@@ -77,6 +78,17 @@ function TraceSegment(transaction, name, recorder) {
   this.probe('new TraceSegment')
 }
 
+TraceSegment.prototype.getSpanContext = function getSpanContext() {
+  const config = this.transaction.agent.config
+  const spansEnabled = config.distributed_tracing.enabled && config.span_events.enabled
+
+  if (!this._spanContext && spansEnabled) {
+    this._spanContext = new SpanContext()
+  }
+
+  return this._spanContext
+}
+
 TraceSegment.prototype.addAttribute =
 function addAttribute(key, value, truncateExempt = false) {
   this.attributes.addAttribute(
@@ -91,7 +103,7 @@ TraceSegment.prototype.getAttributes = function getAttributes() {
   return this.attributes.get(DESTINATIONS.TRANS_SEGMENT)
 }
 
-TraceSegment.prototype.addCustomSpanAttribute = 
+TraceSegment.prototype.addCustomSpanAttribute =
 function addCustomSpanAttribute(key, value, truncateExempt = false) {
   this.customAttributes.addAttribute(
     DESTINATIONS.SPAN_EVENT,

package/lib/transaction/tracer/index.js

@@ -21,6 +21,7 @@ function Tracer(agent) {
 
 Tracer.prototype.getTransaction = getTransaction
 Tracer.prototype.getSegment = getSegment
+Tracer.prototype.getSpanContext = getSpanContext
 Tracer.prototype.createSegment = createSegment
 Tracer.prototype.addSegment = addSegment
 Tracer.prototype.transactionProxy = transactionProxy
@@ -61,6 +62,10 @@ function getSegment() {
   return this.segment
 }
 
+function getSpanContext() {
+  return this.segment && this.segment.getSpanContext()
+}
+
 function createSegment(name, recorder, _parent) {
   var parent = _parent || this.segment
   if (!parent || !parent.transaction.isActive()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "6.6.0",
+  "version": "6.9.0",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "SEE LICENSE IN LICENSE",
   "contributors": [
@@ -83,6 +83,21 @@
       "name": "Michael Goin",
       "email": "mgoin@newrelic.com",
       "web": "https://newrelic.com"
+    },
+    {
+      "name": "Alan Storm",
+      "email": "astorm@newrelic.com",
+      "web": "https://newrelic.com"
+    },
+    {
+      "name": "Carlo Pearson",
+      "email": "cpearson@newrelic.com",
+      "web": "https://newrelic.com"
+    },
+    {
+      "name": "Nick Tzaperas",
+      "email": "ntzaperas@newrelic.com",
+      "web": "https://newrelic.com"
     }
   ],
   "description": "New Relic agent",
@@ -108,7 +123,7 @@
     "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=120 --no-coverage",
+    "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",
     "lint": "eslint ./*.js lib test",
     "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/",
@@ -118,7 +133,7 @@
     "ssl": "./bin/ssl.sh",
     "sub-install": "node test/bin/install_sub_deps",
     "test": "npm run integration && npm run unit",
-    "unit": "rm -f newrelic_agent.log && time tap --test-regex='(\\/|^test\\/unit\\/.*\\.test\\.js)$' --timeout=120 --no-coverage",
+    "unit": "rm -f newrelic_agent.log && time tap --test-regex='(\\/|^test\\/unit\\/.*\\.test\\.js)$' --timeout=180 --no-coverage",
     "update-cross-agent-tests": "./bin/update-cats.sh",
     "versioned-tests": "./bin/run-versioned-tests.sh",
     "versioned": "npm run prepare-test && time ./bin/run-versioned-tests.sh"
@@ -127,27 +142,27 @@
     "newrelic-naming-rules": "./bin/test-naming-rules.js"
   },
   "dependencies": {
-    "@grpc/grpc-js": "^0.6.15",
-    "@grpc/proto-loader": "^0.5.3",
+    "@grpc/grpc-js": "1.0.3",
+    "@grpc/proto-loader": "^0.5.4",
     "@newrelic/aws-sdk": "^1.1.1",
     "@newrelic/koa": "^3.0.0",
     "@newrelic/superagent": "^2.0.1",
     "@tyriar/fibonacci-heap": "^2.0.7",
     "async": "^2.1.4",
     "concat-stream": "^2.0.0",
-    "escodegen": "^1.11.1",
+    "escodegen": "^1.14.1",
     "esprima": "^4.0.1",
     "https-proxy-agent": "^4.0.0",
     "json-stringify-safe": "^5.0.0",
-    "readable-stream": "^3.1.1",
+    "readable-stream": "^3.6.0",
     "semver": "^5.3.0"
   },
   "optionalDependencies": {
-    "@newrelic/native-metrics": "^5.0.0"
+    "@newrelic/native-metrics": "^5.1.0"
   },
   "devDependencies": {
-    "@newrelic/proxy": "^1.0.0",
-    "@newrelic/test-utilities": "^3.1.0",
+    "@newrelic/proxy": "^2.0.0",
+    "@newrelic/test-utilities": "^3.3.0",
     "JSV": "~4.0.2",
     "architect": "*",
     "benchmark": "^2.1.4",
@@ -173,7 +188,7 @@
     "rimraf": "^2.6.3",
     "should": "*",
     "sinon": "^4.5.0",
-    "tap": "^14.10.6",
+    "tap": "^14.10.7",
     "temp": "^0.8.1",
     "through": "^2.3.6",
     "when": "*"

package/.eslintignore

@@ -1 +0,0 @@
-**/node_modules/**

package/.eslintrc.js

@@ -1,67 +0,0 @@
-module.exports = {
-  "env": {
-    "es6": true,
-    "node": true,
-    "browser": false
-  },
-  "parserOptions": {
-    "ecmaVersion": 6
-  },
-  "ignorePatterns": ["invalid-json/"],
-  "rules": {
-    "indent": ["warn", 2, {"SwitchCase": 1}],
-    "brace-style": "error",
-    "comma-dangle": "off",
-    "comma-style": ["error", "last"],
-    "consistent-return": "off",
-    "curly": "off",
-    "eol-last": "error",
-    "eqeqeq": ["error", "smart"],
-    "camelcase": ["off", {"properties": "never"}],
-    "dot-notation": "error",
-    "func-names": "error",
-    "guard-for-in": "error",
-    "key-spacing": ["off", { "beforeColon": false }],
-    "max-len": ["error", 100, { "ignoreUrls": true }],
-    "max-nested-callbacks": ["error", 3],
-    "max-params": ["error", 5],
-    "new-cap": "error",
-    "no-console": "warn",
-    "no-debugger": "error",
-    "no-else-return": "error",
-    "no-floating-decimal": "error",
-    "no-lonely-if": "error",
-    "no-mixed-requires": "error",
-    "no-multiple-empty-lines": "error",
-    "no-multi-spaces": ["off", { "ignoreEOLComments": true }],
-    "no-new": "error",
-    "no-new-func": "warn",
-    "no-shadow": ["warn", {"allow": ["shim"]}],
-    "no-undef": "error",
-    "no-unused-vars": "error",
-    "no-use-before-define": ["off", {"functions": false}],
-    "one-var": ["off", "never"],
-    "padded-blocks": ["error", "never"],
-    "radix": "error",
-    "semi": ["error", "never"],
-    "space-before-function-paren": ["error", "never"],
-    "keyword-spacing": "error",
-    "space-before-blocks": "error",
-    "space-infix-ops": "error",
-    "spaced-comment": "error",
-    "space-unary-ops": "error",
-    "strict": "error",
-    "quote-props": [ "off", "consistent-as-needed" ],
-    "quotes": ["off", "single"],
-    "use-isnan": "error",
-    "wrap-iife": "error"
-  },
-  "overrides": [
-    {
-        "files": ["test/integration/*.tap.js", "test/integration/*/*.tap.js", "test/integration/core/exec-me.js"],
-        "rules": {
-            "no-console": ["off"]
-        }
-    }
-  ]
-}

package/.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +0,0 @@
-## CHANGE LOG
-
-## INTERNAL LINKS
-
-## NOTES

package/.travis.yml

@@ -1,40 +0,0 @@
-language: generic
-env:
-  global:
-    - MONGODB=2.6.11
-  matrix:
-    # NODE 8
-    - NR_NODE_VERSION=8 SUITE=smoke
-    - NR_NODE_VERSION=8 SUITE=unit
-    - NR_NODE_VERSION=8 SUITE=integration
-    - NR_NODE_VERSION=8 SUITE=versioned
-    # NODE 10
-    - NR_NODE_VERSION=10 SUITE=smoke
-    - NR_NODE_VERSION=10 SUITE=unit
-    - NR_NODE_VERSION=10 SUITE=integration
-    - NR_NODE_VERSION=10 SUITE=versioned
-    # NODE 12 --
-    - NR_NODE_VERSION=12 SUITE=smoke
-    - NR_NODE_VERSION=12 SUITE=unit
-    - NR_NODE_VERSION=12 SUITE=integration
-    - NR_NODE_VERSION=12 SUITE=lint
-    - NR_NODE_VERSION=12 SUITE=versioned
-services:
-  - memcached
-  - mysql
-  - redis
-  - postgresql
-  - rabbitmq
-addons:
-  apt:
-    packages:
-      - rabbitmq-server
-before_install:
-  - source ./bin/travis-node.sh
-  - ./bin/travis-setup.sh
-install: if [ "$SUITE" != "smoke" ]; then npm ci; fi
-cache:
-  directories:
-    - "$HOME/.npm"
-script: npm run $SUITE
-after_script: find /home/travis/.npm/_logs -type f -exec cat '{}' +