fix(knex): make stack traces work in 0.18+ (elastic#1497)

Qard · Qard · commit 10b349430e92 · 2019-10-31T19:19:07.000-07:00
diff --git a/lib/instrumentation/modules/knex.js b/lib/instrumentation/modules/knex.js
@@ -7,7 +7,7 @@ var symbols = require('../../symbols')
 
 module.exports = function (Knex, agent, { version, enabled }) {
   if (!enabled) return Knex
-  if (semver.gte(version, '0.18.0')) {
+  if (semver.gte(version, '0.21.0')) {
     agent.logger.debug('knex version %s not supported - aborting...', version)
     return Knex
   }
diff --git a/lib/instrumentation/shimmer.js b/lib/instrumentation/shimmer.js
@@ -32,7 +32,7 @@ function logger () {
 }
 
 function isFunction (funktion) {
-  return funktion && {}.toString.call(funktion) === '[object Function]'
+  return typeof funktion === 'function'
 }
 
 function wrap (nodule, name, wrapper) {

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ var symbols = require('../../symbols')`
`7`	`7`
`8`	`8`	`module.exports = function (Knex, agent, { version, enabled }) {`
`9`	`9`	`if (!enabled) return Knex`
`10`		`- if (semver.gte(version, '0.18.0')) {`
	`10`	`+ if (semver.gte(version, '0.21.0')) {`
`11`	`11`	`agent.logger.debug('knex version %s not supported - aborting...', version)`
`12`	`12`	`return Knex`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ function logger () {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`function isFunction (funktion) {`
`35`		`- return funktion && {}.toString.call(funktion) === '[object Function]'`
	`35`	`+ return typeof funktion === 'function'`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`function wrap (nodule, name, wrapper) {`