fix: captureError would fail on an Error attribute that is an invalid date (#2870)

Fixes: #2030

Author: trentm

CHANGELOG.asciidoc

@@ -53,6 +53,9 @@ Notes:
 [float]
 ===== Bug fixes
 
+- Capturing an error would fail if the Error instance had an attribute that
+  was an invalid date. ({issues}2030[#2030])
+
 - Fix the span for an instrumented S3 ListBuckets API call to not be invalid
   for APM server intake. ({pull}2866[#2866])
 

lib/errors.js

@@ -91,10 +91,13 @@ function attributesFromErr (err) {
         continue
       case 'object':
         // Ignore all objects except Dates.
-        if (typeof val.toISOString !== 'function') {
+        if (typeof val.toISOString !== 'function' || typeof val.getTime !== 'function') {
           continue
+        } else if (Number.isNaN(val.getTime())) {
+          val = 'Invalid Date' // calling toISOString() on invalid dates throws
+        } else {
+          val = val.toISOString()
         }
-        val = val.toISOString()
     }
     attrs[key] = val
     n++
@@ -280,5 +283,6 @@ module.exports = {
   createAPMError,
 
   // Exported for testing.
+  attributesFromErr,
   _moduleNameFromFrames
 }

test/errors.test.js

@@ -13,7 +13,7 @@ const path = require('path')
 const tape = require('tape')
 
 const logging = require('../lib/logging')
-const { createAPMError, generateErrorId, _moduleNameFromFrames } = require('../lib/errors')
+const { createAPMError, generateErrorId, attributesFromErr, _moduleNameFromFrames } = require('../lib/errors')
 const { dottedLookup } = require('./_utils')
 
 const log = logging.createLogger('off')
@@ -331,3 +331,43 @@ tape.test('#_moduleNameFromFrames()', function (suite) {
 
   suite.end()
 })
+
+tape.test('#attributesFromErr()', function (suite) {
+  var cases = [
+    // 'err' is an Error instance, or a function that returns one.
+    {
+      name: 'no attrs',
+      err: new Error('boom'),
+      expectedAttrs: undefined
+    },
+    {
+      name: 'string attr',
+      err: () => {
+        const err = new Error('boom')
+        err.aStr = 'hello'
+        return err
+      },
+      expectedAttrs: { aStr: 'hello' }
+    },
+    {
+      name: 'Invalid Date attr',
+      err: () => {
+        const err = new Error('boom')
+        err.aDate = new Date('invalid')
+        return err
+      },
+      expectedAttrs: { aDate: 'Invalid Date' }
+    }
+  ]
+
+  cases.forEach(function (opts) {
+    suite.test(opts.name, function (t) {
+      const err = typeof (opts.err) === 'function' ? opts.err() : opts.err
+      const attrs = attributesFromErr(err)
+      t.deepEqual(attrs, opts.expectedAttrs, 'got expected attrs')
+      t.end()
+    })
+  })
+
+  suite.end()
+})