chore: Refine telemetry for Formatter Setting Editor (#657)

Author: CsCherrYY

src/formatter-settings/index.ts

@@ -97,11 +97,13 @@ export class JavaFormatterSettingsEditorProvider implements vscode.CustomTextEdi
                     }
                     break;
                 case "onWillChangeExampleKind":
+                    sendInfo("", { formatterExample: e.exampleKind });
                     this.exampleKind = e.exampleKind;
                     this.format();
                     break;
                 case "onWillChangeSetting":
                     const settingValue: string | undefined = FormatterConverter.webView2ProfileConvert(e.id, e.value.toString());
+                    sendInfo("", { formatterSetting: e.id });
                     // "" represents an empty inputbox, we regard it as a valid value.
                     if (settingValue === undefined) {
                         return;
@@ -225,15 +227,15 @@ export class JavaFormatterSettingsEditorProvider implements vscode.CustomTextEdi
         for (const setting of supportedVSCodeSettings.values()) {
             switch (setting.id) {
                 case SupportedSettings.TABULATION_CHAR:
-                    setting.value = (await getVSCodeSetting(VSCodeSettings.INSERT_SPACES, true) === false) ? "tab" : "space";
+                    setting.value = (getVSCodeSetting(VSCodeSettings.INSERT_SPACES, true) === false) ? "tab" : "space";
                     this.profileSettings.set(setting.id, setting.value);
                     break;
                 case SupportedSettings.TABULATION_SIZE:
-                    setting.value = String(await getVSCodeSetting(VSCodeSettings.TAB_SIZE, 4));
+                    setting.value = String(getVSCodeSetting(VSCodeSettings.TAB_SIZE, 4));
                     this.profileSettings.set(setting.id, setting.value);
                     break;
                 case VSCodeSettings.DETECT_INDENTATION:
-                    setting.value = String(await getVSCodeSetting(VSCodeSettings.DETECT_INDENTATION, true));
+                    setting.value = String(getVSCodeSetting(VSCodeSettings.DETECT_INDENTATION, true));
                     break;
                 default:
                     return;
@@ -292,21 +294,21 @@ export class JavaFormatterSettingsEditorProvider implements vscode.CustomTextEdi
         return true;
     }
 
-    private checkProfileSettings = instrumentOperation("formatter.checkProfileSetting", async (operationId: string) => {
+    private checkProfileSettings = instrumentOperation("java.formatter.checkProfileSetting", async (operationId: string) => {
         if (this.checkedProfileSettings) {
             return true;
         }
         this.readOnly = false;
         if (!this.settingsUrl) {
-            sendInfo(operationId, { formatterProfile: "undefined" });
+            sendInfo(operationId, { formatterProfileKind: "undefined" });
             await vscode.window.showInformationMessage("No active Formatter Profile found, do you want to create a default one?",
                 "Yes", "No").then((result) => {
                     if (result === "Yes") {
                         addDefaultProfile(this.context);
                     }
                 });
         } else if (isRemote(this.settingsUrl)) {
-            sendInfo(operationId, { formatterProfile: "remote" });
+            sendInfo(operationId, { formatterProfileKind: "remote" });
             this.checkedProfileSettings = await vscode.window.showInformationMessage("The active formatter profile is remote, do you want to open it in read-only mode or download and use it locally?",
                 "Open in read-only mode", "Download and use it locally").then(async (result) => {
                     if (result === "Open in read-only mode") {
@@ -329,7 +331,7 @@ export class JavaFormatterSettingsEditorProvider implements vscode.CustomTextEdi
                 this.profilePath = await getProfilePath(this.settingsUrl);
             }
             if (!(await fse.pathExists(this.profilePath))) {
-                sendInfo(operationId, { formatterProfile: "notExist" });
+                sendInfo(operationId, { formatterProfileKind: "notExist" });
                 await vscode.window.showInformationMessage("The active formatter profile does not exist, please check it in the Settings and try again.",
                     "Open Settings", "Generate a default profile").then((result) => {
                         if (result === "Open Settings") {
@@ -340,7 +342,7 @@ export class JavaFormatterSettingsEditorProvider implements vscode.CustomTextEdi
                     });
                 return false;
             }
-            sendInfo(operationId, { formatterProfile: "valid" });
+            sendInfo(operationId, { formatterProfileKind: "valid" });
             this.checkedProfileSettings = true;
         }
         return this.checkedProfileSettings;

src/formatter-settings/utils.ts

@@ -5,7 +5,7 @@ import * as fse from "fs-extra";
 import * as path from "path";
 import * as vscode from "vscode";
 import axios from 'axios';
-import { instrumentOperation, sendInfo } from "vscode-extension-telemetry-wrapper";
+import { sendInfo } from "vscode-extension-telemetry-wrapper";
 import { DOMAttr, DOMElement, ProfileContent } from "./types";
 import { DOMParser, XMLSerializer } from "xmldom";
 import { getDefaultValue, getSupportedProfileSettings, JavaConstants } from "./FormatterConstants";
@@ -26,15 +26,15 @@ export async function getProfilePath(formatterUrl: string): Promise<string> {
     return "";
 }
 
-export const getVSCodeSetting = instrumentOperation("formatter.getSetting", async (operationId: string, setting: string, defaultValue: any) => {
+export function getVSCodeSetting(setting: string, defaultValue: any) {
     const config = vscode.workspace.getConfiguration(undefined, { languageId: "java" });
     let result = config.get<any>(setting) ?? vscode.workspace.getConfiguration().get<any>(setting);
     if (result === undefined) {
-        sendInfo(operationId, { notFoundSetting: setting });
+        sendInfo("", { notFoundSetting: setting });
         return defaultValue;
     }
     return result;
-});
+}
 
 export function isRemote(path: string): boolean {
     return path !== null && path.startsWith("http:/") || path.startsWith("https:/");