detach tags from error messages (#1027)

Signed-off-by: Yan Zhang <yanzh@microsoft.com>

Author: Eskibear

src/daemon/serverLog/logWatcher.ts

@@ -56,16 +56,22 @@ export class LogWatcher {
             const consentToCollectLogs = vscode.workspace.getConfiguration("java").get<boolean>("help.collectErrorLog");
             if (errors) {
                 errors.forEach(e => {
-                    consentToCollectLogs ? sendInfo("", {
-                        name: "jdtls-error",
-                        error: e.message,
-                        stack: e.stack!,
-                        timestamp: e.timestamp!.toString()
-                    }) : sendInfo("", {
-                        name: "jdtls-error",
-                        error: redact(e.message),
-                        timestamp: e.timestamp!.toString()
-                    });
+                    if (consentToCollectLogs) {
+                        sendInfo("", {
+                            name: "jdtls-error",
+                            error: e.message,
+                            stack: e.stack!,
+                            timestamp: e.timestamp!.toString()
+                        });
+                    } else {
+                        const {message, tags} = redact(e.message);
+                        sendInfo("", {
+                            name: "jdtls-error",
+                            error: message,
+                            tags: tags.join(","),
+                            timestamp: e.timestamp!.toString()
+                        })
+                    }
                 })
             }
             this.logProcessedTimestamp = Date.now();
@@ -108,16 +114,23 @@ export class LogWatcher {
             const consentToCollectLogs = vscode.workspace.getConfiguration("java").get<boolean>("help.collectErrorLog");
             if (errors) {
                 errors.forEach(e => {
-                    consentToCollectLogs ? sendInfo("", {
-                        name: "jdtls-error-in-crashed-session",
-                        error: e.message,
-                        stack: e.stack!,
-                        timestamp: e.timestamp!.toString()
-                    }) : sendInfo("", {
-                        name: "jdtls-error-in-crashed-session",
-                        error: redact(e.message),
-                        timestamp: e.timestamp!.toString()
-                    });
+                    if (consentToCollectLogs) {
+                        sendInfo("", {
+                            name: "jdtls-error-in-crashed-session",
+                            error: e.message,
+                            stack: e.stack!,
+                            timestamp: e.timestamp!.toString()
+                        })
+                    } else {
+                        const { message, tags } = redact(e.message);
+                        sendInfo("", {
+                            name: "jdtls-error-in-crashed-session",
+                            error: message,
+                            tags: tags.join(","),
+                            timestamp: e.timestamp!.toString()
+                        })
+                    }
+
                 })
             }
         }

src/daemon/serverLog/whitelist.ts

@@ -42,13 +42,15 @@ const MESSAGE_WHITELIST: string[] = [
     "Workspace restored, but some problems occurred.",
 ];
 
-export function redact(rawMessage: string): string {
-    const matchedMessage = MESSAGE_WHITELIST.find(msg => rawMessage.includes(msg));
-    if (matchedMessage) {
-        return matchedMessage;
-    } else {
-        const lower = rawMessage.toLocaleLowerCase();
-        const tags = TAGS.filter(tag => lower.includes(tag));
-        return tags.length > 0 ? `Tags:${tags.join(",")}` : "";
+export function redact(rawMessage: string): {
+    message: string;
+    tags: string[];
+} {
+    const message = MESSAGE_WHITELIST.find(msg => rawMessage.includes(msg)) ?? "";
+    const tags = TAGS.filter(tag => rawMessage.toLocaleLowerCase().includes(tag));
+
+    return {
+        message,
+        tags
     }
 }