newrelic 4.5.0 → 4.8.0

package/lib/transaction/trace/index.js

@@ -49,30 +49,48 @@ function Trace(transaction) {
  * segments that support recording.
  */
 Trace.prototype.end = function end() {
+  var segments = [this.root]
+
+  while (segments.length) {
+    var segment = segments.pop()
+    _softEndSegment(segment)
+    Array.prototype.push.apply(segments, segment.getChildren())
+  }
+}
+
+/**
+ * Iterates over the trace tree and generates a span event for each segment.
+ */
+Trace.prototype.generateSpanEvents = function generateSpanEvents() {
   var config = this.transaction.agent.config
-  var segments = []
-  var processFn
 
   if (
     this.transaction.sampled &&
     config.span_events.enabled &&
-    config.feature_flag.distributed_tracing
+    config.distributed_tracing.enabled
   ) {
+    var toProcess = []
     // Root segment does not become a span, so we need to process it separately.
-    _softEndSegment(this.root)
+    const spanAggregator = this.transaction.agent.spans
     const children = this.root.getChildren()
     for (let i = 0; i < children.length; ++i) {
-      segments.push(new DTTraceNode(children[i], this.transaction.parentSpanId))
+      toProcess.push(new DTTraceNode(children[i], this.transaction.parentSpanId))
     }
-    processFn = makeDTNodeProcessor(this.transaction.agent.spans)
-  } else {
-    segments.push(this.root)
-    processFn = processNode
-  }
 
-  while (segments.length) {
-    var segment = segments.pop()
-    processFn(segment, segments)
+    while (toProcess.length) {
+      var segmentInfo = toProcess.pop()
+      var segment = segmentInfo.segment
+
+      // Even though at some point we might want to stop adding events
+      // because all the priorities should be the same, we need to count
+      // the spans as seen.
+      spanAggregator.addSegment(segment, segmentInfo.parentId)
+
+      Array.prototype.push.apply(
+        toProcess,
+        segment.getChildren().map(child => new DTTraceNode(child, segment.id))
+      )
+    }
   }
 }
 
@@ -90,31 +108,6 @@ function _softEndSegment(segment) {
   }
 }
 
-function makeDTNodeProcessor(spanAggregator) {
-  var addMoreSpans = true
-  return function processNodeDT(segmentInfo, segments) {
-    var segment = segmentInfo.segment
-    _softEndSegment(segment)
-
-    // This assumes that spans will have their transaction's priority. If insertion of
-    // one event fails, all following will fail due to having the same priority.
-    if (addMoreSpans && segment.name !== 'ROOT') {
-      addMoreSpans = spanAggregator.addSegment(segment, segmentInfo.parentId)
-    }
-
-    var children = segment.getChildren()
-    Array.prototype.push.apply(
-      segments,
-      children.map(child => new DTTraceNode(child, segment.id))
-    )
-  }
-}
-
-function processNode(segment, segments) {
-  _softEndSegment(segment)
-  Array.prototype.push.apply(segments, segment.getChildren())
-}
-
 /**
  * Add a child to the list of segments.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "4.5.0",
+  "version": "4.8.0",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "licenses": [
     {
@@ -96,7 +96,7 @@
   ],
   "homepage": "http://github.com/newrelic/node-newrelic",
   "engines": {
-    "node": ">=4.0.0",
+    "node": ">=4.0.0 <11.0.0",
     "npm": ">=2.0.0"
   },
   "directories": {
@@ -105,6 +105,7 @@
   "scripts": {
     "bench": "node ./bin/run-bench.js",
     "versioned-tests": "./bin/run-versioned-tests.sh",
+    "versioned": "./bin/run-versioned-tests.sh",
     "test": "make test"
   },
   "bin": {

package/.npmignore

@@ -1,4 +0,0 @@
-test
-examples
-out
-Makefile