[analytics] correct vscode_session attributes

- generate session id, otheriwse it is stubbed by dummy value
- rename id to session id to avoid conflicts with segment id
- add instance id to correlates with logs and other analytics

Author: akosyakov

extensions/gitpod-remote/package.json

@@ -229,4 +229,4 @@
     "gitpod-shared": "0.0.1",
     "vscode-nls": "^5.0.0"
   }
-}
+}

extensions/gitpod-shared/package.json

@@ -13,6 +13,7 @@
   },
   "devDependencies": {
     "@types/node": "^10.12.21",
+    "@types/uuid": "^8.3.1",
     "@types/ws": "^7.2.6"
   },
   "dependencies": {
@@ -21,6 +22,7 @@
     "bufferutil": "^4.0.1",
     "reconnecting-websocket": "^4.4.0",
     "utf-8-validate": "^5.0.2",
+    "uuid": "^8.3.1",
     "vscode-nls": "^5.0.0",
     "ws": "^7.3.1",
     "yaml": "^1.10.0"

extensions/gitpod-shared/src/extension.ts

@@ -4,7 +4,7 @@
 
 import * as vscode from 'vscode';
 import { createGitpodExtensionContext, GitpodExtensionContext, registerDefaultLayout, registerNotifications, registerWorkspaceCommands, registerWorkspaceSharing, registerWorkspaceTimeout } from './features';
-import { performance } from 'perf_hooks';
+import * as uuid from 'uuid';
 
 export { GitpodExtensionContext, SupervisorConnection, registerTasks } from './features';
 export * from './gitpod-plugin-model';
@@ -41,9 +41,11 @@ function registerUsageAnalytics(context: GitpodExtensionContext): void {
 	if (context.devMode && vscode.env.uiKind === vscode.UIKind.Web) {
 		return;
 	}
+	const sessionId = uuid.v4();
 	const properties = {
-		id: vscode.env.sessionId,
+		sessionId,
 		workspaceId: context.info.getWorkspaceId(),
+		instanceId: context.info.getInstanceId(),
 		appName: vscode.env.appName,
 		uiKind: vscode.env.uiKind === vscode.UIKind.Web ? 'web' : 'desktop',
 		devMode: context.devMode,
@@ -53,7 +55,7 @@ function registerUsageAnalytics(context: GitpodExtensionContext): void {
 			event: 'vscode_session',
 			properties: {
 				...properties,
-				timestamp: performance.now(),
+				timestamp: Date.now(),
 				focused: vscode.window.state.focused,
 				phase,
 			}

extensions/gitpod-shared/src/features.ts

@@ -724,7 +724,7 @@ export async function registerTasks(context: GitpodExtensionContext, createTermi
 				{
 					name: taskTerminal.getTitle(),
 					pty,
-					iconPath: new vscode.ThemeIcon('tools')
+					iconPath: new vscode.ThemeIcon('terminal')
 				},
 				parentTerminal
 			);

extensions/gitpod-web/package.json

@@ -441,8 +441,7 @@
   "dependencies": {
     "gitpod-shared": "0.0.1",
     "node-fetch": "^2.6.1",
-    "uuid": "^8.3.1",
     "vscode-jsonrpc": "^5.0.1",
     "vscode-nls": "^5.0.0"
   }
-}
+}

extensions/yarn.lock

@@ -103,6 +103,11 @@
   resolved "https://registry.yarnpkg.com/@types/tmp/-/tmp-0.2.1.tgz#83ecf4ec22a8c218c71db25f316619fe5b986011"
   integrity sha512-7cTXwKP/HLOPVgjg+YhBdQ7bMiobGMuoBmrGmqwIWJv8elC6t1DfVc/mn4fD9UE1IjhwmhaQ5pGVXkmXbH0rhg==
 
+"@types/uuid@^8.3.1":
+  version "8.3.1"
+  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.1.tgz#1a32969cf8f0364b3d8c8af9cc3555b7805df14f"
+  integrity sha512-Y2mHTRAbqfFkpjldbkHGY8JIzRN6XqYRliG8/24FcHm2D2PwW24fl5xMRTVGdrb7iMrwCaIEbLWerGIkXuFWVg==
+
 "@types/ws@^7.2.6":
   version "7.4.7"
   resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.4.7.tgz#f7c390a36f7a0679aa69de2d501319f4f8d9b702"