Merge pull request #61 from gitpod-io/ft/dynamic-experiments-host

Author: filiptronicek

package.json

@@ -130,7 +130,7 @@
 	},
 	"main": "./out/extension.js",
 	"segmentKey": "YErmvd89wPsrCuGcVnF2XAl846W9WIGl",
-	"configcatKey": "WBLaCPtkjkqKHlHedziE9g/LEAOCNkbuUKiqUZAcVg7dw",
+	"configcatKey": "gitpod",
 	"scripts": {
 		"vscode:prepublish": "webpack --mode production",
 		"webpack": "webpack --mode development",

src/experiments.ts

@@ -9,6 +9,7 @@ import * as configcatcommon from 'configcat-common';
 import * as semver from 'semver';
 import { ISessionService } from './services/sessionService';
 import { ILogService } from './services/logService';
+import { IHostService } from './services/hostService';
 
 const EXPERTIMENTAL_SETTINGS = [
     'gitpod.remote.useLocalApp',
@@ -23,11 +24,10 @@ export class ExperimentalSettings {
         key: string,
         extensionVersion: string,
         private readonly sessionService: ISessionService,
-        private readonly context: vscode.ExtensionContext,
+        private readonly hostService: IHostService,
         private readonly logger: ILogService
     ) {
-        this.configcatClient = configcat.createClientWithLazyLoad(key, {
-            baseUrl: new URL('/configcat', this.context.extensionMode === vscode.ExtensionMode.Production ? 'https://gitpod.io' : 'https://gitpod-staging.com').href,
+        const configCatOptions = {
             logger: {
                 debug(): void { },
                 log(): void { },
@@ -37,7 +37,20 @@ export class ExperimentalSettings {
             },
             requestTimeoutMs: 1500,
             cacheTimeToLiveSeconds: 60
+        };
+
+        this.configcatClient = configcat.createClientWithLazyLoad(key, {
+            baseUrl: new URL('/configcat', this.hostService.gitpodHost).href,
+            ...configCatOptions
         });
+
+        hostService.onDidChangeHost(() => {
+            this.configcatClient = configcat.createClientWithLazyLoad(key, {
+                baseUrl: new URL('/configcat', this.hostService.gitpodHost).href,
+                ...configCatOptions
+            });
+        });
+
         this.extensionVersion = new semver.SemVer(extensionVersion);
     }
 

src/extension.ts

@@ -78,7 +78,7 @@ export async function activate(context: vscode.ExtensionContext) {
 		const sessionService = new SessionService(hostService, logger);
 		context.subscriptions.push(sessionService);
 
-		const experiments = new ExperimentalSettings('gitpod', packageJSON.version, sessionService, context, logger);
+		const experiments = new ExperimentalSettings('gitpod', packageJSON.version, sessionService, hostService,logger);
 		context.subscriptions.push(experiments);
 
 		const settingsSync = new SettingsSync(commandManager, logger, telemetryService, notificationService);