build: Update telemetry wrapper to 0.14.0 (#1495)

microsoft · Jun 12, 2024 · 1d9db4f · 1d9db4f
1 parent ffa87a3
commit 1d9db4f
Show file tree

Hide file tree

Showing 5 changed files with 130 additions and 51 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -18,7 +18,7 @@
   ],
   "editor.formatOnSave": false,
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
+    "source.fixAll.eslint": "explicit"
   },
   "[markdown]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
@@ -32,12 +32,13 @@
   "[java]": {
     "editor.defaultFormatter": "redhat.java",
     "editor.codeActionsOnSave": {
-      "source.fixAll.spotlessGradle": true
+      "source.fixAll.spotlessGradle": "explicit"
     }
   },
   "[xml]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "files.insertFinalNewline": true,
-  "files.trimTrailingWhitespace": true
+  "files.trimTrailingWhitespace": true,
+  "java.compile.nullAnalysis.mode": "disabled"
 }
diff --git a/extension/package-lock.json b/extension/package-lock.json
diff --git a/extension/package.json b/extension/package.json
@@ -987,7 +987,7 @@
     "minimatch": "^5.1.1",
     "string-argv": "^0.3.1",
     "tree-kill": "^1.2.2",
-    "vscode-extension-telemetry-wrapper": "0.13.3",
+    "vscode-extension-telemetry-wrapper": "0.14.0",
     "vscode-languageclient": "7.0.0"
   }
 }
diff --git a/extension/src/bs/BuildServerController.ts b/extension/src/bs/BuildServerController.ts
@@ -59,21 +59,29 @@ export class BuildServerController implements Disposable {
                     this.logOutputChannel.appendLine(msg);
                 }
             }),
-            commands.registerCommand(SEND_TELEMETRY_CMD, (data: string | object) => {
-                let jsonString: string;
+            commands.registerCommand(SEND_TELEMETRY_CMD, (data: string | object | Error) => {
                 let jsonObj: { [key: string]: any };
                 if (typeof data === "string") {
                     jsonObj = JSON.parse(data);
-                    jsonString = data;
                 } else {
                     jsonObj = data;
-                    jsonString = JSON.stringify(data);
                 }
-                sendInfo("", {
-                    kind: jsonObj.kind,
-                    data: jsonString,
-                    ...(jsonObj.schemaVersion && { schemaVersion: jsonObj.schemaVersion }),
-                });
+
+                const { kind, trace, rootCauseMessage, schemaVersion, ...rest } = jsonObj;
+                if (trace || rootCauseMessage) {
+                    sendInfo("", {
+                        kind: "bsp-error",
+                        operationName: jsonObj.operationName,
+                        rootCauseMessage,
+                        trace,
+                    });
+                } else {
+                    sendInfo("", {
+                        kind: kind,
+                        data2: JSON.stringify(rest),
+                        ...(schemaVersion && { schemaVersion: schemaVersion }),
+                    });
+                }
             }),
             workspace.onDidChangeConfiguration((e: ConfigurationChangeEvent) => {
                 if (e.affectsConfiguration("java.gradle.buildServer.enabled")) {

diff --git a/extension/src/index.ts b/extension/src/index.ts
@@ -7,7 +7,7 @@ import { Extension } from "./Extension";
 let extension: Extension;
 
 export async function activate(context: vscode.ExtensionContext): Promise<Api> {
-    await initializeFromJsonFile(context.asAbsolutePath("./package.json"), { firstParty: true });
+    await initializeFromJsonFile(context.asAbsolutePath("./package.json"));
     return instrumentOperation("activation", activateExtension)(context);
 }