update event hub forwarder and template (#1024)

* Reapply "update event hub forwarder and template"

This reverts commit 98b23bc.

* reduce return paths and rename function

* update zip with reduced return paths

* rename to parseProperties

* return after setting properties

* use let

* regen the deploy zip

* add the dash back for event hub name

* regen the deploy zip

* let -> const

Author: mattsp1290

azure/activity_logs_monitoring/deploy.zip

@@ -5,7 +5,7 @@
 
 const { app, InvocationContext } = require('@azure/functions');
 
-const VERSION = '2.1.1';
+const VERSION = '2.2.0';
 
 const STRING = 'string'; // example: 'some message'
 const STRING_ARRAY = 'string-array'; // example: ['one message', 'two message', ...]
@@ -383,30 +383,28 @@ class EventhubLogHandler {
                     this.records.push(originalRecord);
                 }
             } else {
-                this.records.push(this.fixPropertiesJsonString(originalRecord));
+                this.records.push(this.parseProperties(originalRecord));
             }
         } else {
             record = this.addTagsToStringLog(record);
             this.records.push(record);
         }
     }
 
-    fixPropertiesJsonString(record) {
+    parseProperties(record) {
         // Check if properties field is a malformed JSON String
         if (Object.hasOwn(record, 'properties') && (typeof record.properties === 'string') && (record.properties.includes("':'"))) {
             try {
                 // If the check is true, find and replace single quotes
                 // with double quotes, to make a proper JSON
                 // which is then converted into a JSON Object
-                record.properties = JSON.parse(record.properties.replace(/'/g, '"'));
-                return record;
+                const parsedProperties = JSON.parse(record.properties.replace(/'/g, '"'));
+                record.properties = parsedProperties;
             } catch {
                 this.context.error('Unable to fix properties field to JSON Object');
-                return record;
             }
-        } else {
-            return record;
         }
+        return record;
     }
 
     handleLogs(logs) {

azure/activity_logs_monitoring/index.js

@@ -5,6 +5,6 @@
     "author": "Datadog",
     "license": "Apache-2.0",
     "dependencies": {
-        "@azure/functions": "^4.8.0"
+        "@azure/functions": "^4.9.0"
     }
 }

azure/activity_logs_monitoring/package-lock.json

@@ -818,15 +818,15 @@ describe('Log Splitting', function() {
         });
     });
 });
-describe('EventhubLogHandler Fix Properties Json String', function() {
+describe('EventhubLogHandler Parse Properties', function() {
 
     beforeEach(function() {
         this.forwarder = setUp();
     });
 
 	it('parses properties string with single quotes into object', function() {
 		const record = { properties: "{'key':'value'}" };
-        const result = this.forwarder.fixPropertiesJsonString(record);
+        const result = this.forwarder.parseProperties(record);
 
         const expectedProperties = { properties: { key: "value" } };
 
@@ -842,7 +842,7 @@ describe('EventhubLogHandler Fix Properties Json String', function() {
 
     it('parses object that doesnt have properties', function() {
 		const record = { hostname: "server_name", subObject: { key:"value"} };
-        const result = this.forwarder.fixPropertiesJsonString(record);
+        const result = this.forwarder.parseProperties(record);
 
         assert.deepEqual(
             record,
@@ -856,7 +856,7 @@ describe('EventhubLogHandler Fix Properties Json String', function() {
 
 	it('parses properties string with nested objects', function() {
 		const record = { properties: "{'key':'value','subObj':{ 'subKey' : 'subValue' }}" };
-        const result = this.forwarder.fixPropertiesJsonString(record);
+        const result = this.forwarder.parseProperties(record);
 
         const expectedProperties = { properties: { key: "value", subObj: { subKey: "subValue"} } };
 
@@ -872,7 +872,7 @@ describe('EventhubLogHandler Fix Properties Json String', function() {
 
 	it("leaves properties string unchanged when it doesn't match the malformed pattern", function() {
 		const record = { properties: 'some plain string without colons' };
-		const result = this.forwarder.fixPropertiesJsonString(record);
+		const result = this.forwarder.parseProperties(record);
 
         assert.deepEqual(
             record,
@@ -887,7 +887,7 @@ describe('EventhubLogHandler Fix Properties Json String', function() {
 	it('logs an error and returns original record when replacement results in invalid JSON', function() {
 		// includes the "':'" marker so the function attempts replacement, but JSON remains invalid
 		const badRecord = { properties: "Look i know i shouldn't but, i will do this ':' " };
-		const result = this.forwarder.fixPropertiesJsonString(badRecord);
+		const result = this.forwarder.parseProperties(badRecord);
 
         assert.deepEqual(
             badRecord,