Merge pull request #2733 from blackflux/dev

[Gally]: master <- dev
blackflux · Oct 21, 2021 · bfbab66 · bfbab66
2 parents f5820bb + 78f0645
commit bfbab66
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -52,6 +52,7 @@
     "lambda-monitor-logger": "3.0.1",
     "lodash.get": "4.4.2",
     "lru-cache-ext": "2.0.1",
+    "object-scan": "17.1.0",
     "promise-pool-ext": "2.1.2",
     "request": "2.88.2",
     "request-promise-native": "1.0.9",

diff --git a/src/logic/bundler-handler.js b/src/logic/bundler-handler.js
@@ -1,3 +1,4 @@
+const objectScan = require('object-scan');
 const Datadog = require('./util/datadog');
 
 module.exports = async (event, context) => {
@@ -6,5 +7,18 @@ module.exports = async (event, context) => {
     return;
   }
   const arr = event.Records.map(({ body }) => JSON.parse(body));
+  // Workaround since Datadog strips empty objects
+  // Reference: https://docs.datadoghq.com/logs/log_configuration/parsing/?tab=matchers
+  objectScan(['[*]**'], {
+    filterFn: ({ parent, property, value }) => {
+      if (value === null) {
+        // eslint-disable-next-line no-param-reassign
+        parent[property] = '<null>';
+      } else if (value instanceof Object && Object.keys(value).length === 0) {
+        // eslint-disable-next-line no-param-reassign
+        parent[property] = `<empty ${JSON.stringify(value)}>`;
+      }
+    }
+  })(arr);
   await datadog.Logger.uploadJsonArray(arr);
 };
diff --git a/test/lambda/__cassettes/bundlerHandler/multi_event.spec.json_recording.json b/test/lambda/__cassettes/bundlerHandler/multi_event.spec.json_recording.json
@@ -26,7 +26,15 @@
         "_level": "warning",
         "_group": "/aws/lambda/peg-solitiare-dev-overview",
         "path": "path/to/data3.json.gz",
-        "status": 200
+        "status": 200,
+        "event": {
+          "emptyArray": "<empty []>",
+          "emptyObj": "<empty {}>",
+          "arrContainingEmptyObj": [
+            "<empty {}>"
+          ],
+          "null": "<null>"
+        }
       }
     ],
     "status": 200,

diff --git a/test/lambda/tests/bundlerHandler/multi_event.spec.json b/test/lambda/tests/bundlerHandler/multi_event.spec.json
@@ -64,6 +64,12 @@
           "_timestamp": 1632869955749,
           "_level": "warning",
           "_group": "/aws/lambda/peg-solitiare-dev-overview",
+          "event": {
+            "emptyArray": [],
+            "emptyObj": {},
+            "arrContainingEmptyObj": [{}],
+            "null": null
+          },
           "path": "path/to/data3.json.gz",
           "status": 200
         },

diff --git a/yarn.lock b/yarn.lock
@@ -5272,6 +5272,11 @@ object-scan@17.0.0:
   resolved "https://registry.yarnpkg.com/object-scan/-/object-scan-17.0.0.tgz#ee51a7f7c2b6a056ae513a67d75955ddcf545fd1"
   integrity sha512-/GkRZGupBmWcbmWqWqQ5/I98MRryIlrTVenteL7DOvymqm11WlL4tcXwxH7iV+9Pc8ouQwtk/4rLAnXJp6Qobw==
 
+object-scan@17.1.0:
+  version "17.1.0"
+  resolved "https://registry.yarnpkg.com/object-scan/-/object-scan-17.1.0.tgz#35e67020b94ee1e6cd59ccef5ff91c2e4e5e302d"
+  integrity sha512-r+LfWbSftyqVBj/WqSEQ4sSCDN1T0JBVCfHp2WO3vf1ykn6IjVMKtJ34+ABvdDDGjjCgq1L8TC6yc2CV37jRwA==
+
 object-treeify@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/object-treeify/-/object-treeify-2.0.0.tgz#4c6c7f016f69b5f84c5f7d882bf41d18bdf03acb"