Skip to content

Commit

Permalink
fix missing stack trace when logging non-errors as errors (#707)
Browse files Browse the repository at this point in the history
  • Loading branch information
rochdev committed Oct 8, 2019
1 parent ac97fbf commit d830ae6
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 1 deletion.
12 changes: 11 additions & 1 deletion packages/dd-trace/src/log.js
Expand Up @@ -51,7 +51,17 @@ const log = {
err = err()
}

_logger.error(typeof err === 'string' ? new Error(err) : err)
if (typeof err !== 'object' || !err) {
err = String(err)
} else if (!err.stack) {
err = String(err.message || err)
}

if (typeof err === 'string') {
err = new Error(err)
}

_logger.error(err)
}

return this
Expand Down
24 changes: 24 additions & 0 deletions packages/dd-trace/test/log.spec.js
Expand Up @@ -74,6 +74,30 @@ describe('log', () => {
expect(console.error.firstCall.args[0]).to.have.property('message', 'error')
})

it('should convert empty values to errors', () => {
log.error()

expect(console.error).to.have.been.called
expect(console.error.firstCall.args[0]).to.be.instanceof(Error)
expect(console.error.firstCall.args[0]).to.have.property('message', 'undefined')
})

it('should convert invalid types to errors', () => {
log.error(123)

expect(console.error).to.have.been.called
expect(console.error.firstCall.args[0]).to.be.instanceof(Error)
expect(console.error.firstCall.args[0]).to.have.property('message', '123')
})

it('should reuse error messages for non-errors', () => {
log.error({ message: 'test' })

expect(console.error).to.have.been.called
expect(console.error.firstCall.args[0]).to.be.instanceof(Error)
expect(console.error.firstCall.args[0]).to.have.property('message', 'test')
})

it('should convert messages from callbacks to errors', () => {
log.error(() => 'error')

Expand Down

0 comments on commit d830ae6

Please sign in to comment.