💄

Author: jeanp413

.github/workflows/nightly.yml

@@ -23,7 +23,7 @@ jobs:
         run: |
           set -e
           setSegmentKey="setpath([\"segmentKey\"]; \"untrusted-dummy-key\")"
-          setConfigcatKey="setpath([\"configcatKey\"]; \"${{ secrets.CONFIGCAT_KEY }}\")"
+          setConfigcatKey="setpath([\"configcatKey\"]; \"gitpod\")"
           jqCommands="${setSegmentKey} | ${setConfigcatKey}"
           cat package.json | jq "${jqCommands}" > package.json.tmp
           mv package.json.tmp package.json

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
         run: |
           set -e
           setSegmentKey="setpath([\"segmentKey\"]; \"untrusted-dummy-key\")"
-          setConfigcatKey="setpath([\"configcatKey\"]; \"${{ secrets.CONFIGCAT_KEY }}\")"
+          setConfigcatKey="setpath([\"configcatKey\"]; \"gitpod\")"
           jqCommands="${setSegmentKey} | ${setConfigcatKey}"
           cat package.json | jq "${jqCommands}" > package.json.tmp
           mv package.json.tmp package.json

src/experiments.ts

@@ -10,23 +10,27 @@ import * as semver from 'semver';
 import { ISessionService } from './services/sessionService';
 import { ILogService } from './services/logService';
 import { IHostService } from './services/hostService';
+import { Disposable } from './common/dispose';
 
 const EXPERIMENTAL_SETTINGS = [
     'gitpod.remote.useLocalApp',
     // 'gitpod.remote.useLocalSSHServer',
 ];
 
-export class ExperimentalSettings {
+export class ExperimentalSettings extends Disposable {
     private configcatClient: configcatcommon.IConfigCatClient;
     private extensionVersion: semver.SemVer;
 
     constructor(
         key: string,
         extensionVersion: string,
+        context: vscode.ExtensionContext,
         private readonly sessionService: ISessionService,
         private readonly hostService: IHostService,
         private readonly logger: ILogService
     ) {
+        super();
+
         const configCatOptions = {
             logger: {
                 debug(): void { },
@@ -39,17 +43,20 @@ export class ExperimentalSettings {
             cacheTimeToLiveSeconds: 60
         };
 
+        const gitpodHost = context.extensionMode === vscode.ExtensionMode.Production ? this.hostService.gitpodHost : 'https://gitpod-staging.com';
         this.configcatClient = configcat.createClientWithLazyLoad(key, {
-            baseUrl: new URL('/configcat', this.hostService.gitpodHost).href,
+            baseUrl: new URL('/configcat', gitpodHost).href,
             ...configCatOptions
         });
 
-        hostService.onDidChangeHost(() => {
+        this._register(hostService.onDidChangeHost(() => {
+            this.configcatClient.dispose();
+            const gitpodHost = context.extensionMode === vscode.ExtensionMode.Production ? this.hostService.gitpodHost : 'https://gitpod-staging.com';
             this.configcatClient = configcat.createClientWithLazyLoad(key, {
-                baseUrl: new URL('/configcat', this.hostService.gitpodHost).href,
+                baseUrl: new URL('/configcat', gitpodHost).href,
                 ...configCatOptions
             });
-        });
+        }));
 
         this.extensionVersion = new semver.SemVer(extensionVersion);
     }
@@ -125,7 +132,8 @@ export class ExperimentalSettings {
         return this.extensionVersion.minor % 2 === 1;
     }
 
-    dispose(): void {
+    override dispose(): void {
+        super.dispose();
         this.configcatClient.dispose();
     }
 

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, hostService,logger);
+		const experiments = new ExperimentalSettings(packageJSON.configcatKey, packageJSON.version, context, sessionService, hostService, logger);
 		context.subscriptions.push(experiments);
 
 		const settingsSync = new SettingsSync(commandManager, logger, telemetryService, notificationService);

src/services/hostService.ts

@@ -44,6 +44,12 @@ export class HostService extends Disposable implements IHostService {
 
         this._register(vscode.workspace.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration('gitpod.host')) {
+                if (e.affectsConfiguration('[javascript]') && e.affectsConfiguration('[markdown]')) {
+					// Seems onDidChangeConfiguration fires many times while resolving the remote (once with all settings),
+					// and because now we active the extension earlier with onResolveRemoteAuthority we get this false positive
+					// event, so ignore it if more settings are affected at the same time.
+					return;
+				}
                 const newGitpodHost = Configuration.getGitpodHost();
                 if (new URL(this._gitpodHost).host !== new URL(newGitpodHost).host) {
                     this._gitpodHost = newGitpodHost;