newrelic 6.7.0 → 6.10.0

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
@@ -404,6 +406,20 @@ function finalizeNameFromUri(requestURL, statusCode) {
             'request.parameters.' + key,
             params[key]
           )
+
+          const segment = this.agent.tracer.getSegment()
+
+          if (!segment) {
+            logger
+              .trace('Active segment not available, not adding request.parameters attribute for %s',
+                key)
+          } else {
+            segment.attributes.addAttribute(
+              DESTS.NONE,
+              'request.parameters.' + key,
+              params[key]
+            )
+          }
         }
       }
     }, this)
@@ -426,11 +442,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)
 }
 
 /**
@@ -449,6 +480,21 @@ Transaction.prototype._markAsWeb = function _markAsWeb(rawURL) {
         'request.parameters.' + key,
         params[key]
       )
+
+      const segment = this.agent.tracer.getSegment()
+
+      if (!segment) {
+        logger
+          .trace(
+            'Active segment not available, not adding request.parameters span attribute for %s',
+            key)
+      } else {
+        segment.attributes.addAttribute(
+          DESTS.NONE,
+          'request.parameters.' + key,
+          params[key]
+        )
+      }
     }
   }
   this.baseSegment.markAsWeb()
@@ -490,11 +536,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,10 +742,20 @@ function _linkExceptionToSegment(exception) {
     return
   }
 
+  const config = this.agent.config
+
   // Add error attributes to the span
-  const details = exception.getErrorDetails(this.agent.config)
-  segment.addAttribute('error.message', details.message)
-  segment.addAttribute('error.class', details.type)
+  const details = exception.getErrorDetails(config)
+  segment.addSpanAttribute('error.message', details.message)
+  segment.addSpanAttribute('error.class', details.type)
+
+  const isExpected =
+    errorHelper.isExpectedErrorClass(config, details.type) ||
+    errorHelper.isExpectedErrorMessage(config, details.type, details.message)
+
+  if (isExpected) {
+    segment.addSpanAttribute('error.expected', isExpected)
+  }
 
   // Add the span/segment ID to the exception as agent attributes
   exception.agentAttributes.spanId = segment.id
@@ -1233,6 +1293,14 @@ function addRequestParameters(requestParameters) {
         'request.parameters.' + key,
         requestParameters[key]
       )
+
+      const segment = this.baseSegment
+
+      segment.attributes.addAttribute(
+        DESTS.NONE,
+        'request.parameters.' + key,
+        requestParameters[key]
+      )
     }
   }
 }

package/lib/transaction/trace/index.js

@@ -41,6 +41,8 @@ function Trace(transaction) {
       'host.displayName',
       displayName
     )
+
+    this.displayName = displayName
   }
   this.domain = null
 }
@@ -82,6 +84,26 @@ Trace.prototype.generateSpanEvents = function generateSpanEvents() {
     const spanAggregator = this.transaction.agent.spanEventAggregator
 
     const children = this.root.getChildren()
+
+    if (children.length > 0) {
+      // At the point where these attributes are available, we only have a
+      // root span. Adding attributes to first non-root span here.
+      const attributeMap = {
+        'host.displayName': this.displayName,
+        'parent.type': this.transaction.parentType,
+        'parent.app': this.transaction.parentApp,
+        'parent.account': this.transaction.parentAcct,
+        'parent.transportType': this.transaction.parentTransportType,
+        'parent.transportDuration': this.transaction.parentTransportDuration
+      }
+
+      for (const [key, value] of Object.entries(attributeMap)) {
+        if (value !== null) {
+          children[0].addSpanAttribute(key, value)
+        }
+      }
+    }
+
     for (let i = 0; i < children.length; ++i) {
       toProcess.push(new DTTraceNode(children[i], this.transaction.parentSpanId, true))
     }

package/lib/transaction/trace/segment.js

@@ -6,8 +6,9 @@ const Timer = require('../../timer')
 const urltils = require('../../util/urltils')
 const hashes = require('../../util/hashes')
 
-const {Attributes, MAXIMUM_CUSTOM_ATTRIBUTES} = require('../../attributes')
+const {Attributes} = require('../../attributes')
 const ExclusiveCalculator = require('./exclusive-time-calculator')
+const SpanContext = require('../../spans/span-context')
 
 const NAMES = require('../../metrics/names')
 const INSTANCE_UNKNOWN = 'unknown'
@@ -52,7 +53,6 @@ function TraceSegment(transaction, name, recorder) {
   }
 
   this.attributes = new Attributes(ATTRIBUTE_SCOPE)
-  this.customAttributes = new Attributes(ATTRIBUTE_SCOPE, MAXIMUM_CUSTOM_ATTRIBUTES)
 
   this.children = []
 
@@ -77,6 +77,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(
@@ -87,13 +98,9 @@ function addAttribute(key, value, truncateExempt = false) {
   )
 }
 
-TraceSegment.prototype.getAttributes = function getAttributes() {
-  return this.attributes.get(DESTINATIONS.TRANS_SEGMENT)
-}
-
-TraceSegment.prototype.addCustomSpanAttribute = 
-function addCustomSpanAttribute(key, value, truncateExempt = false) {
-  this.customAttributes.addAttribute(
+TraceSegment.prototype.addSpanAttribute =
+function addSpanAttribute(key, value, truncateExempt = false) {
+  this.attributes.addAttribute(
     DESTINATIONS.SPAN_EVENT,
     key,
     value,
@@ -101,6 +108,18 @@ function addCustomSpanAttribute(key, value, truncateExempt = false) {
   )
 }
 
+TraceSegment.prototype.addSpanAttributes =
+function addSpanAttributes(attributes) {
+  this.attributes.addAttributes(
+    DESTINATIONS.SPAN_EVENT,
+    attributes
+  )
+}
+
+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

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.7.0",
+  "version": "6.10.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": "1.0.3",
-    "@grpc/proto-loader": "^0.5.3",
+    "@grpc/grpc-js": "1.0.4",
+    "@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": "^2.0.0",
-    "@newrelic/test-utilities": "^3.1.0",
+    "@newrelic/test-utilities": "^3.3.0",
     "JSV": "~4.0.2",
     "architect": "*",
     "benchmark": "^2.1.4",

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 '{}' +