Merge pull request #903 from fbricon/webworker-telemetry

Enable telemetry in Web extension

Author: msivasubramaniaan

.gitignore

@@ -6,4 +6,5 @@ dist/
 test/testFixture/.vscode
 *.vsix
 .DS_Store
-test-resources
+test-resources
+yarn-error.log

.vscode/launch.json

@@ -8,7 +8,6 @@
       "request": "launch",
       "runtimeExecutable": "${execPath}",
       "args": ["--extensionDevelopmentPath=${workspaceRoot}"],
-      "stopOnEntry": false,
       "sourceMaps": true,
       "outFiles": ["${workspaceRoot}/dist/**/*.js"],
       "preLaunchTask": "compile typescript",
@@ -36,13 +35,16 @@
     },
     {
       "name": "Launch Web Extension",
-      "type": "pwa-extensionHost",
+      "type": "extensionHost",
       "debugWebWorkerHost": true,
       "request": "launch",
       "args": [
         "--extensionDevelopmentPath=${workspaceFolder}",
         "--extensionDevelopmentKind=web"
       ],
+      "env": {
+        "VSCODE_REDHAT_TELEMETRY_DEBUG":"true"
+      },
       "outFiles": ["${workspaceRoot}/dist/**/*.js"],
       "preLaunchTask": "compile webpack"
     },

package.json

@@ -268,6 +268,7 @@
     "@vscode/test-web": "0.0.11",
     "buffer": "^6.0.3",
     "chai": "^4.2.0",
+    "crypto-browserify": "^3.12.0",
     "eslint": "^7.6.0",
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-prettier": "^3.1.4",
@@ -284,19 +285,20 @@
     "typescript": "4.4.3",
     "umd-compat-loader": "^2.1.2",
     "url": "^0.11.0",
-    "util": "^0.12.4",
+    "util": "^0.12.5",
     "vscode-extension-tester": "^5.3.0",
     "vscode-test": "^1.4.0",
-    "webpack": "^5.52.1",
-    "webpack-cli": "^4.8.0"
+    "webpack": "^5.76.1",
+    "webpack-cli": "^5.0.1"
   },
   "dependencies": {
-    "@redhat-developer/vscode-redhat-telemetry": "0.5.2",
+    "@redhat-developer/vscode-redhat-telemetry": "^0.6.0",
     "fs-extra": "^9.1.0",
     "request-light": "^0.5.7",
     "vscode-languageclient": "7.0.0",
     "vscode-nls": "^3.2.1",
     "vscode-uri": "^2.0.3",
+    "whatwg-fetch": "^3.6.2",
     "yaml-language-server": "next"
   }
 }

src/webworker/yamlClientMain.ts

@@ -10,9 +10,9 @@ import { startClient, LanguageClientConstructor, RuntimeEnvironment } from '../e
 import { LanguageClient } from 'vscode-languageclient/browser';
 import { SchemaExtensionAPI } from '../schema-extension-api';
 import { IJSONSchemaCache } from '../json-schema-content-provider';
-
+import { getRedHatService } from '@redhat-developer/vscode-redhat-telemetry/lib/webworker';
 // this method is called when vs code is activated
-export async function activate(context: ExtensionContext): Promise<SchemaExtensionAPI> {
+export async function activate(context: ExtensionContext): Promise<SchemaExtensionAPI | undefined> {
   const extensionUri = context.extensionUri;
   const serverMain = extensionUri.with({
     path: extensionUri.path + '/dist/languageserver-web.js',
@@ -25,12 +25,12 @@ export async function activate(context: ExtensionContext): Promise<SchemaExtensi
 
     const schemaCache: IJSONSchemaCache = {
       getETag: () => undefined,
-      getSchema: () => undefined,
+      getSchema: async () => undefined,
       putSchema: () => Promise.resolve(),
     };
-
+    const telemetry = await (await getRedHatService(context)).getTelemetryService();
     const runtime: RuntimeEnvironment = {
-      telemetry: { send: () => undefined, sendStartupEvent: () => undefined },
+      telemetry,
       schemaCache,
     };
     return startClient(context, newLanguageClient, runtime);

test/telemetry.test.ts

@@ -7,7 +7,7 @@ import * as sinonChai from 'sinon-chai';
 import * as chai from 'chai';
 import * as vscode from 'vscode';
 import { TelemetryErrorHandler, TelemetryOutputChannel } from '../src/telemetry';
-import { TelemetryEvent, TelemetryService } from '@redhat-developer/vscode-redhat-telemetry/lib/interfaces/telemetry';
+import { TelemetryEvent, TelemetryService } from '@redhat-developer/vscode-redhat-telemetry';
 
 const expect = chai.expect;
 chai.use(sinonChai);

webpack.config.js

@@ -72,9 +72,13 @@ const clientWeb = {
   resolve: {
     mainFields: ['module', 'main'],
     extensions: ['.ts', '.js'], // support ts-files and js-files
-    alias: {},
+    alias: {
+      'node-fetch': 'whatwg-fetch',
+      'object-hash': 'object-hash/dist/object_hash.js',
+    },
     fallback: {
       path: require.resolve('path-browserify'),
+      'node-fetch': require.resolve('whatwg-fetch'),
       util: require.resolve('util'),
       fs: false,
     },
@@ -102,7 +106,7 @@ const clientWeb = {
   },
   plugins: [
     new webpack.ProvidePlugin({
-      process: 'process/browser.js', // provide a shim for the global `process` variable
+      process: path.resolve(path.join(__dirname, 'node_modules/process/browser.js')), // provide a shim for the global `process` variable
     }),
   ],
   externals: {