attempt to unmangle logs from log aggregators

package.json

@@ -34,8 +34,8 @@
 		"webpack-cli": "^4.10.0"
 	},
 	"engines": {
-		"node": "^14.0.0",
-		"npm": "^7.0.0"
+		"node": "^16.0.0",
+		"npm": "^8.0.0"
 	},
 	"dependencies": {
 		"@babel/runtime": "^7.19.0",

src/ExceptionParser.js

@@ -6,13 +6,17 @@ window.unserialize = unserialize;
 
 export class ExceptionParser {
 	isException (logMessage) {
-		return this.isNewStyleException(logMessage) || this.isOldStyleException(logMessage) || this.isBackgroundJobException(logMessage);
+		return this.isNewStyleException(logMessage) || this.isOldStyleException(logMessage) || this.isBackgroundJobException(logMessage) || this.isNestedJsonException(logMessage);
 	}
 
 	isNewStyleException (logMessage) {
 		return logMessage.Exception;
 	}
 
+	isNestedJsonException (logMessage) {
+		return logMessage.substr && logMessage[0] === '{';
+	}
+
 	isOldStyleException (logMessage) {
 		return logMessage.substr && logMessage.substr(0, 12) === 'Exception: {';
 	}
@@ -34,6 +38,14 @@ export class ExceptionParser {
 				console.log(logMessage.substr(10));
 				console.error(e);
 			}
+		} else if (this.isNestedJsonException(logMessage)) {
+			try {
+				return this.tryParseJSON(logMessage);
+			} catch (e) {
+				console.log('Error while parsing exception:');
+				console.log(logMessage.substr(10));
+				console.error(e);
+			}
 		} else {
 			data = this.tryParseJSON(logMessage.substr(logMessage.indexOf('{"Exception":')));
 			const messageHead = logMessage.substr(0, logMessage.indexOf('{"Exception":'));

src/LogParser.ts

@@ -3,12 +3,12 @@ import splitter from "json-string-splitter";
 export function parseLog(raw: string): any[] {
 	try {
 		const lines = raw.split('\n');
-		return lines.map(tryParseJSON);
+		return lines.map(tryParseJSON).map(fixUpLogJson);
 	} catch (e) {
 		console.log("falling back to json splitter")
 		// the input might have had its data reformatted, breaking the original newline separated json
 		const lines = splitter(raw).jsons;
-		return lines.map(tryParseJSON);
+		return lines.map(tryParseJSON).map(fixUpLogJson);
 	}
 }
 
@@ -36,3 +36,18 @@ function tryParseJSON(json: string): any {
 		}
 	}
 }
+
+/**
+ * attempt to fixup some mangling done by log aggregators to our json
+ * to increase the number of times we can just copy-paste logs directly from users.
+ */
+function fixUpLogJson(message: any): any {
+	if (message.content?.message && message.content?.attributes && message.id && !message.reqId) {
+		return {
+			message: message.content.message,
+			...message.content.attributes
+		}
+	}
+
+	return message;
+}

tests/bootstrap.php

@@ -1,7 +1,7 @@
 <?php
 
 if (!defined('PHPUNIT_RUN')) {
-  define('PHPUNIT_RUN', 1);
+	define('PHPUNIT_RUN', 1);
 }
 
 require_once __DIR__ . '/../../../lib/base.php';