newrelic 4.8.1 → 4.9.0

package/lib/transaction/index.js

@@ -755,11 +755,16 @@ function acceptDistributedTracePayload(payload, transport) {
 
   const config = this.agent.config
   const distTraceEnabled = config.distributed_tracing.enabled
-  const catEnabled = config.cross_application_tracer.enabled
   const trustedAccount = config.trusted_account_key || config.account_id
 
-  if (!distTraceEnabled || !catEnabled || !trustedAccount) {
-    logger.warn('Invalid configuration for distributed trace payload, not accepting')
+  if (!distTraceEnabled || !trustedAccount) {
+    logger.debug(
+      'Invalid configuration for distributed trace payload, not accepting ' +
+      '(distributed_tracing.enabled: %s, trustKey: %s',
+      distTraceEnabled,
+      trustedAccount
+    )
+
     this.agent.recordSupportability('DistributedTrace/AcceptPayload/Exception')
     return
   }
@@ -898,15 +903,20 @@ Transaction.prototype.createDistributedTracePayload = createDistributedTracePayl
 function createDistributedTracePayload() {
   const config = this.agent.config
   const accountId = config.account_id
-  const appId = config.application_id
+  const appId = config.primary_application_id
   const distTraceEnabled = config.distributed_tracing.enabled
-  const catEnabled = config.cross_application_tracer.enabled
 
-  if (!accountId || !appId || !distTraceEnabled || !catEnabled) {
-    logger.warn(
-      'Invalid configuration for distributed trace payload in transaction %s',
+  if (!accountId || !appId || !distTraceEnabled) {
+    logger.debug(
+      'Invalid configuration for distributed trace payload ' +
+      '(distributed_tracing.enabled: %s, account_id: %s, application_id: %s) ' +
+      'in transaction %s',
+      distTraceEnabled,
+      accountId,
+      appId,
       this.id
     )
+
     return new DTPayloadStub()
   }
 

package/lib/transaction/trace/aggregator.js

@@ -126,12 +126,12 @@ TraceAggregator.prototype.isBetter = function isBetter(name, duration, apdexT) {
   var isOverThreshold
 
   if (config &&
-      config.transaction_threshold &&
+      config.transaction_threshold != null &&
       config.transaction_threshold !== 'apdex_f' &&
       typeof config.transaction_threshold === 'number') {
-    isOverThreshold = duration > config.transaction_threshold * TO_MILLIS
+    isOverThreshold = duration >= config.transaction_threshold * TO_MILLIS
   } else {
-    isOverThreshold = duration > 4 * TO_MILLIS * apdexT
+    isOverThreshold = duration >= 4 * TO_MILLIS * apdexT
   }
   if (!isOverThreshold) return false
 

package/lib/util/codec.js

@@ -45,11 +45,14 @@ module.exports = {
     zlib.inflate(new Buffer(encoded, 'base64'), function cb_inflate(err, raw) {
       if (err) return callback(err)
 
+      let json
       try {
-        return callback(null, JSON.parse(raw))
+        json = JSON.parse(raw)
       } catch (error) {
         return callback(error)
       }
+
+      return callback(null, json)
     })
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "4.8.1",
+  "version": "4.9.0",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "licenses": [
     {
@@ -118,6 +118,7 @@
   },
   "dependencies": {
     "@newrelic/koa": "^1.0.0",
+    "@newrelic/superagent": "^1.0.0",
     "@tyriar/fibonacci-heap": "^2.0.7",
     "async": "^2.1.4",
     "concat-stream": "^1.5.0",
@@ -138,7 +139,7 @@
     "chai": "^4.1.2",
     "connect": "*",
     "cover": "*",
-    "ejs": "0.8.5",
+    "ejs": "2.5.5",
     "eslint": "^4.19.1",
     "express": "*",
     "generic-pool": "*",