newrelic 5.13.0 → 6.2.0

package/lib/transaction/trace/segment.js

@@ -90,6 +90,16 @@ TraceSegment.prototype.getAttributes = function getAttributes() {
   return this.attributes.get(DESTINATIONS.TRANS_SEGMENT)
 }
 
+TraceSegment.prototype.getSpanId = function getSpanId() {
+  const conf = this.transaction.agent.config
+  const enabled = conf.span_events.enabled && conf.distributed_tracing.enabled
+  if (enabled) {
+    return this.id
+  }
+
+  return null
+}
+
 /**
  * @param {string} host
  *  The name of the host of the database. This will be normalized if the string

package/lib/utilization/common.js

@@ -66,7 +66,8 @@ exports.request = function request(opts, agent, cb) {
     function respond(data) {
       agent.removeListener('errored', abortRequest)
       agent.removeListener('stopped', abortRequest)
-
+      agent.removeListener('disconnected', abortRequest)
+      
       if (res.statusCode !== 200) {
         logger.debug(
           'Got %d %s from metadata request %j',
@@ -83,22 +84,28 @@ exports.request = function request(opts, agent, cb) {
   })
 
   req.setTimeout(1000, function requestTimeout() {
-    logger.debug('Request for metadata %j timed out', opts)
-    cb(new Error('Timeout'))
+    req.abort()
   })
+
   req.on('error', function requestError(err) {
+    if (err.code === 'ECONNRESET') {
+      logger.debug('Request for metadata %j timed out', opts)
+      return cb(err)
+    }
+
     logger.debug('Message for metadata %j: %s', opts, err.message)
     cb(err)
   })
-
   agent.once('errored', abortRequest)
   agent.once('stopped', abortRequest)
+  agent.once('disconnected', abortRequest)
 
   function abortRequest() {
     logger.debug('Aborting request for metadata at %j', opts)
     req.abort()
     agent.removeListener('errored', abortRequest)
     agent.removeListener('stopped', abortRequest)
+    agent.removeListener('disconnected', abortRequest)
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "5.13.0",
+  "version": "6.2.0",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "SEE LICENSE IN LICENSE",
   "contributors": [
@@ -96,7 +96,7 @@
   ],
   "homepage": "http://github.com/newrelic/node-newrelic",
   "engines": {
-    "node": ">=6.0.0 <13.0.0",
+    "node": ">=8.0.0 <13.0.0",
     "npm": ">=3.0.0"
   },
   "directories": {
@@ -108,7 +108,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 test/integration/*/*.tap.js test/integration/*/*/*.tap.js --timeout=120",
+    "integration": "npm run prepare-test && npm run sub-install && time tap --no-esm test/integration/**/**/*.tap.js --timeout=120 --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/",
@@ -119,7 +119,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 && mocha -r nock -c test/unit --recursive",
+    "unit": "rm -f newrelic_agent.log && mocha -r nock -c test/unit --recursive --exit",
     "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"
@@ -128,18 +128,21 @@
     "newrelic-naming-rules": "./bin/test-naming-rules.js"
   },
   "dependencies": {
-    "@newrelic/koa": "^1.0.8",
-    "@newrelic/superagent": "^1.0.2",
+    "@newrelic/aws-sdk": "^1.0.0",
+    "@newrelic/koa": "^3.0.0",
+    "@newrelic/superagent": "^2.0.0",
     "@tyriar/fibonacci-heap": "^2.0.7",
     "async": "^2.1.4",
     "concat-stream": "^2.0.0",
-    "https-proxy-agent": "^2.2.1",
+    "escodegen": "^1.11.1",
+    "esprima": "^4.0.1",
+    "https-proxy-agent": "^3.0.0",
     "json-stringify-safe": "^5.0.0",
     "readable-stream": "^3.1.1",
     "semver": "^5.3.0"
   },
   "optionalDependencies": {
-    "@newrelic/native-metrics": "^4.0.0"
+    "@newrelic/native-metrics": "^5.0.0"
   },
   "devDependencies": {
     "@newrelic/proxy": "^1.0.0",
@@ -158,8 +161,8 @@
     "lodash": "^4.17.14",
     "memcached": ">=0.2.8",
     "minami": "^1.1.1",
-    "mocha": "^5.2.0",
-    "mongodb": "^2",
+    "mocha": "^6.2.1",
+    "mongodb": "^3.3.3",
     "mysql": "*",
     "nock": "9.1.9",
     "proxyquire": "^1.8.0",
@@ -170,7 +173,7 @@
     "rimraf": "^2.6.3",
     "should": "*",
     "sinon": "^4.5.0",
-    "tap": "^12.7.0",
+    "tap": "^14.10.1",
     "temp": "^0.8.1",
     "through": "^2.3.6",
     "when": "*"

package/stub_api.js

@@ -36,6 +36,7 @@ Stub.prototype.getTransaction = getTransaction
 Stub.prototype.getBrowserTimingHeader = getBrowserTimingHeader
 Stub.prototype.shutdown = shutdown
 Stub.prototype.setLambdaHandler = setLambdaHandler
+Stub.prototype.getTraceMetadata = getTraceMetadata
 
 // This code gets injected into HTML templates
 // and we don't want it to return undefined/null.
@@ -61,6 +62,13 @@ function startSegment(name, record, handler, callback) {
   return null
 }
 
+function getTraceMetadata() {
+  return {
+    traceId: '',
+    spanId: ''
+  }
+}
+
 function startWebTransaction(url, callback) {
   logger.debug('Not calling startWebTransaction because New Relic is disabled.')
   if (typeof callback === 'function') {

package/lib/event-aggregator.js

@@ -1,94 +0,0 @@
-'use strict'
-
-const logger = require('./logger').child({component: 'event_aggregator'})
-const PriorityQueue = require('./priority-queue')
-
-/**
- * Aggregates events up to a certain limit.
- *
- * @private
- * @class
- */
-class EventAggregator {
-  constructor(limit) {
-    this._events = new PriorityQueue(limit)
-  }
-
-  get limit() {
-    return this._events.limit
-  }
-
-  set limit(limit) {
-    this._events.setLimit(limit)
-  }
-
-  get seen() {
-    return this._events.seen
-  }
-
-  get length() {
-    return this._events.length
-  }
-
-  get overflow() {
-    return this._events.overflow()
-  }
-
-  /**
-   *
-   */
-  getQueue() {
-    return this._events
-  }
-
-  /**
-   * Fetches all the span events aggregated.
-   *
-   * @return {array.<Event>} An array of span events from the aggregator.
-   */
-  getEvents() {
-    return this._events.toArray()
-  }
-
-  /**
-   * Resets the contents of the aggregator and all counters.
-   *
-   * @return {PriorityQueue} The old collection of aggregated events.
-   */
-  clearEvents() {
-    const oldEvents = this._events
-    this._events = new PriorityQueue(this._events.limit)
-    return oldEvents
-  }
-
-  addEvent(event, priority) {
-    return this._events.add(event, priority)
-  }
-
-  /**
-   * Merges a set of events back into the aggregator.
-   *
-   * This should only be used after a failed harvest with the `PriorityQueue`
-   * returned from `EventAggregator#clearEvents`.
-   *
-   * @param {?PriorityQueue} events - The collection of events to re-merge.
-   */
-  mergeEvents(events) {
-    if (!events) {
-      return
-    }
-
-    // We calculate the number that will be merged for the log, but we try to
-    // add every event because we want the ones with the highest priority, not
-    // the first `n` events.
-    const toMerge = Math.min(events.length, this.limit - this.length)
-    logger.warn(
-      'Merging %d of %d events into %s for next harvest',
-      toMerge, events.length, this.constructor.name
-    )
-
-    this._events.merge(events)
-  }
-}
-
-module.exports = EventAggregator