Add extension and server version to telemetry (#2289)

Author: vinistock

vscode/src/client.ts

@@ -360,7 +360,7 @@ export default class Client extends LanguageClient implements ClientInterface {
             name: error.data.errorClass,
             stack,
           },
-          { ...error.data },
+          { ...error.data, serverVersion: this.serverVersion },
         );
       }
 
@@ -487,7 +487,6 @@ export default class Client extends LanguageClient implements ClientInterface {
         message: new vscode.TelemetryTrustedValue(label),
         lspVersion: this.serverVersion,
         rubyVersion: this.ruby.rubyVersion,
-        environment: os.platform(),
       },
     });
   }

vscode/src/extension.ts

@@ -1,3 +1,5 @@
+import os from "os";
+
 import * as vscode from "vscode";
 
 import { RubyLsp } from "./rubyLsp";
@@ -128,5 +130,9 @@ async function createLogger(context: vscode.ExtensionContext) {
     ignoreUnhandledErrors:
       context.extensionMode === vscode.ExtensionMode.Test ||
       context.extensionMode === vscode.ExtensionMode.Development,
+    additionalCommonProperties: {
+      extensionVersion: context.extension.packageJSON.version,
+      environment: os.platform(),
+    },
   });
 }