fix: updated isSimpleObject util to only check plain objects not arra…

…ys (#1865)
newrelic · Nov 14, 2023 · 8baa5bc · 8baa5bc
1 parent a7786f3
commit 8baa5bc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/lib/instrumentation/@elastic/elasticsearch.js b/lib/instrumentation/@elastic/elasticsearch.js
@@ -67,7 +67,7 @@ function queryParser(params) {
   // let body or bulkBody override querystring, as some requests have both
   if (isNotEmpty(params.body)) {
     queryParam = params.body
-  } else if (isNotEmpty(params.bulkBody)) {
+  } else if (Array.isArray(params.bulkBody) && params.bulkBody.length) {
     queryParam = params.bulkBody
   }
 

diff --git a/lib/util/objects.js b/lib/util/objects.js
@@ -13,7 +13,7 @@ exports = module.exports = { isSimpleObject, isNotEmpty }
  * @returns {boolean} whether or not the value is an object and not null
  */
 function isSimpleObject(thing) {
-  return 'object' === typeof thing && thing !== null
+  return Object.prototype.toString.call(thing) === '[object Object]' && thing !== null
 }
 
 /**

diff --git a/test/unit/util/objects.test.js b/test/unit/util/objects.test.js
@@ -10,10 +10,11 @@ const { isSimpleObject, isNotEmpty } = require('../../../lib/util/objects')
 const fixtures = [
   { name: 'populated object', value: { a: 1, b: 2, c: 3 }, simple: true, nonEmpty: true },
   { name: 'empty object', value: {}, simple: true, nonEmpty: false },
+  { name: 'object', value: { key: 'value' }, simple: true, nonEmpty: true },
   { name: 'null', value: null, simple: false, nonEmpty: false },
   { name: 'undefined', value: undefined, simple: false, nonEmpty: false },
-  { name: 'array', value: [1, 2, 3, 4], simple: true, nonEmpty: true },
-  { name: 'empty array', value: [], simple: true, nonEmpty: false },
+  { name: 'array', value: [1, 2, 3, 4], simple: false, nonEmpty: false },
+  { name: 'empty array', value: [], simple: false, nonEmpty: false },
   { name: 'string', value: 'a string', simple: false, nonEmpty: false },
   { name: 'empty string', value: '', simple: false, nonEmpty: false },
   { name: 'number', value: 42, simple: false, nonEmpty: false },