Merge pull request #1430 from microsoft/ulugbekna/cand-exp-filter-fcv1

add exp filter for fcv1 copilot token flag

Author: ulugbekna

src/platform/authentication/common/copilotToken.ts

@@ -199,6 +199,10 @@ export class CopilotToken {
 	isExpandedClientSideIndexingEnabled(): boolean {
 		return this._info.blackbird_clientside_indexing === true;
 	}
+
+	isFcv1(): boolean {
+		return this.tokenMap.get('fcv1') === '1';
+	}
 }
 
 /**

src/platform/telemetry/node/baseExperimentationService.ts

@@ -17,13 +17,14 @@ import { IExperimentationService, TreatmentsChangeEvent } from '../common/nullEx
 export class UserInfoStore extends Disposable {
 	private _internalOrg: string | undefined;
 	private _sku: string | undefined;
+	private _isFcv1: boolean | undefined;
 
 	private _onDidChangeUserInfo = this._register(new Emitter<void>());
 	readonly onDidChangeUserInfo = this._onDidChangeUserInfo.event;
 
 	static INTERNAL_ORG_STORAGE_KEY = 'exp.github.copilot.internalOrg';
 	static SKU_STORAGE_KEY = 'exp.github.copilot.sku';
-
+	static IS_FCV1_STORAGE_KEY = 'exp.github.copilot.isFcv1';
 	constructor(private readonly context: IVSCodeExtensionContext, copilotTokenStore: ICopilotTokenStore) {
 		super();
 
@@ -38,15 +39,16 @@ export class UserInfoStore extends Disposable {
 			};
 
 			copilotTokenStore.onDidStoreUpdate(() => {
-				this.updateUserInfo(getInternalOrg(), copilotTokenStore.copilotToken?.sku);
+				this.updateUserInfo(getInternalOrg(), copilotTokenStore.copilotToken?.sku, copilotTokenStore.copilotToken?.isFcv1());
 			});
 
 			if (copilotTokenStore.copilotToken) {
-				this.updateUserInfo(getInternalOrg(), copilotTokenStore.copilotToken.sku);
+				this.updateUserInfo(getInternalOrg(), copilotTokenStore.copilotToken.sku, copilotTokenStore.copilotToken.isFcv1());
 			} else {
 				const cachedInternalValue = this.context.globalState.get<string>(UserInfoStore.INTERNAL_ORG_STORAGE_KEY);
 				const cachedSkuValue = this.context.globalState.get<string>(UserInfoStore.SKU_STORAGE_KEY);
-				this.updateUserInfo(cachedInternalValue, cachedSkuValue);
+				const cachedIsFcv1Value = this.context.globalState.get<boolean>(UserInfoStore.IS_FCV1_STORAGE_KEY);
+				this.updateUserInfo(cachedInternalValue, cachedSkuValue, cachedIsFcv1Value);
 			}
 		}
 	}
@@ -59,17 +61,22 @@ export class UserInfoStore extends Disposable {
 		return this._sku;
 	}
 
-	private updateUserInfo(internalOrg?: string, sku?: string): void {
-		if (this._internalOrg === internalOrg && this._sku === sku) {
+	get isFcv1(): boolean | undefined {
+		return this._isFcv1;
+	}
+
+	private updateUserInfo(internalOrg?: string, sku?: string, isFcv1?: boolean): void {
+		if (this._internalOrg === internalOrg && this._sku === sku && this._isFcv1 === isFcv1) {
 			// no change
 			return;
 		}
 
 		this._internalOrg = internalOrg;
 		this._sku = sku;
-
+		this._isFcv1 = isFcv1;
 		this.context.globalState.update(UserInfoStore.INTERNAL_ORG_STORAGE_KEY, this._internalOrg);
 		this.context.globalState.update(UserInfoStore.SKU_STORAGE_KEY, this._sku);
+		this.context.globalState.update(UserInfoStore.IS_FCV1_STORAGE_KEY, this._isFcv1);
 
 		this._onDidChangeUserInfo.fire();
 	}
@@ -186,4 +193,4 @@ function equalMap(map1: Map<string, string>, map2: Map<string, string>): boolean
 	}
 
 	return true;
-}
+}

src/platform/telemetry/vscode-node/microsoftExperimentationService.ts

@@ -127,10 +127,11 @@ class GithubAccountFilterProvider implements IExperimentationFilterProvider {
 	constructor(private _userInfoStore: UserInfoStore, private _logService: ILogService) { }
 
 	getFilters(): Map<string, any> {
-		this._logService.trace(`[GithubAccountFilterProvider]::getFilters SKU: ${this._userInfoStore.sku}, Internal Org: ${this._userInfoStore.internalOrg}`);
+		this._logService.trace(`[GithubAccountFilterProvider]::getFilters SKU: ${this._userInfoStore.sku}, Internal Org: ${this._userInfoStore.internalOrg}, IsFcv1: ${this._userInfoStore.isFcv1}`);
 		const filters = new Map<string, any>();
 		filters.set('X-GitHub-Copilot-SKU', this._userInfoStore.sku);
 		filters.set('X-Microsoft-Internal-Org', this._userInfoStore.internalOrg);
+		filters.set('X-GitHub-Copilot-IsFcv1', this._userInfoStore.isFcv1);
 		return filters;
 	}
 
@@ -174,7 +175,7 @@ export class MicrosoftExperimentationService extends BaseExperimentationService
 				new CopilotExtensionsFilterProvider(logService),
 				// The callback is called in super ctor. At that time, self/this is not initialized yet (but also, no filter could have been possibly set).
 				new CopilotCompletionsFilterProvider(() => self?.getCompletionsFilters() ?? new Map(), logService),
-				new DevDeviceIdFilterProvider(vscode.env.devDeviceId)
+				new DevDeviceIdFilterProvider(vscode.env.devDeviceId),
 			);
 		};