cleanup regex and remove trailing \n

Author: stevezau

cloudwatchlogs/node.js/cloudwatchlogs_lambda.js

@@ -6,7 +6,7 @@ var sumoEndpoint = 'https://collectors.sumologic.com/receiver/v1/http/<XXX>';
 
 // Format used to parse out log formats
 // Example: 2016-11-10T23:11:54.523Z	108af3bb-a79b-11e6-8bd7-91c363cc05d9    some message
-var consoleFormatRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z\t(\w+?-\w+?-\w+?-\w+?-\w+)\t(.*)/g;
+var consoleFormatRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z\t(\w+?-\w+?-\w+?-\w+?-\w+)\t(.*)/;
 
 var https = require('https');
 var zlib = require('zlib');
@@ -49,7 +49,7 @@ exports.handler = function (event, context) {
         };
 
         // Used to extract RequestID
-        var requestIdRegex = new RegExp(/(?:RequestId:|Z)\s+([\w\d\-]+)/);
+        var requestIdRegex = /(?:RequestId:|Z)\s+([\w\d\-]+)/;
         var lastRequestID = null;
 
         awslogsData.logEvents.forEach(function (val, idx, arr) {
@@ -78,6 +78,9 @@ exports.handler = function (event, context) {
                 finalizeContext();
             });
 
+			// Remove trailing \n
+			val.message = val.message.replace(/\n$/, '');
+			
             // Try extract requestID
             var requestId = requestIdRegex.exec(val.message);
             if (requestId !== null) {
@@ -98,7 +101,7 @@ exports.handler = function (event, context) {
                 // Do nothing, leave as text
                 val.message.trim()
             }
-            
+			
             // delete id as it's not very useful
             delete val.id;