Merge branch 'main' into seanmcm/addCrashLogs

Colengms · web-flow · commit de197a3dbf80 · 2025-03-05T16:41:28.000-08:00
diff --git a/Extension/src/LanguageServer/client.ts b/Extension/src/LanguageServer/client.ts
@@ -186,7 +186,6 @@ interface TelemetryPayload {
     event: string;
     properties?: Record<string, string>;
     metrics?: Record<string, number>;
-    signedMetrics?: Record<string, number>;
 }
 
 interface ReportStatusNotificationBody extends WorkspaceFolderParams {
@@ -2729,8 +2728,7 @@ export class DefaultClient implements Client {
         if (notificationBody.event === "includeSquiggles" && this.configurationProvider && notificationBody.properties) {
             notificationBody.properties["providerId"] = this.configurationProvider;
         }
-        const metrics_unified: Record<string, number> = { ...notificationBody.metrics, ...notificationBody.signedMetrics };
-        telemetry.logLanguageServerEvent(notificationBody.event, notificationBody.properties, metrics_unified);
+        telemetry.logLanguageServerEvent(notificationBody.event, notificationBody.properties, notificationBody.metrics);
     }
 
     private async updateStatus(notificationBody: ReportStatusNotificationBody): Promise<void> {

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,6 @@ interface TelemetryPayload {`
`186`	`186`	`event: string;`
`187`	`187`	`properties?: Record<string, string>;`
`188`	`188`	`metrics?: Record<string, number>;`
`189`		`- signedMetrics?: Record<string, number>;`
`190`	`189`	`}`
`191`	`190`
`192`	`191`	`interface ReportStatusNotificationBody extends WorkspaceFolderParams {`
`@@ -2729,8 +2728,7 @@ export class DefaultClient implements Client {`
`2729`	`2728`	`if (notificationBody.event === "includeSquiggles" && this.configurationProvider && notificationBody.properties) {`
`2730`	`2729`	`notificationBody.properties["providerId"] = this.configurationProvider;`
`2731`	`2730`	`}`
`2732`		`- const metrics_unified: Record<string, number> = { ...notificationBody.metrics, ...notificationBody.signedMetrics };`
`2733`		`- telemetry.logLanguageServerEvent(notificationBody.event, notificationBody.properties, metrics_unified);`
	`2731`	`+ telemetry.logLanguageServerEvent(notificationBody.event, notificationBody.properties, notificationBody.metrics);`
`2734`	`2732`	`}`
`2735`	`2733`
`2736`	`2734`	`private async updateStatus(notificationBody: ReportStatusNotificationBody): Promise<void> {`