Always show watermark, first session experiment (#15547)

src/vs/platform/telemetry/common/telemetry.ts

@@ -23,7 +23,7 @@ export interface ITelemetryInfo {
 
 export interface ITelemetryExperiments {
 	showDefaultViewlet: boolean;
-	showCommandsWatermark: boolean;
+	showFirstSessionWatermark: boolean;
 	openUntitledFile: boolean;
 }
 
@@ -46,7 +46,7 @@ export interface ITelemetryService {
 
 export const defaultExperiments: ITelemetryExperiments = {
 	showDefaultViewlet: false,
-	showCommandsWatermark: false,
+	showFirstSessionWatermark: false,
 	openUntitledFile: true
 };
 
@@ -80,7 +80,7 @@ export function loadExperiments(storageService: IStorageService, configurationSe
 
 	const random0 = parseFloat(valueString);
 	let [random1, showDefaultViewlet] = splitRandom(random0);
-	const [random2, showCommandsWatermark] = splitRandom(random1);
+	const [random2, showFirstSessionWatermark] = splitRandom(random1);
 	let [, openUntitledFile] = splitRandom(random2);
 
 	// is the user a first time user?
@@ -93,7 +93,7 @@ export function loadExperiments(storageService: IStorageService, configurationSe
 
 	return applyOverrides(configurationService, {
 		showDefaultViewlet,
-		showCommandsWatermark,
+		showFirstSessionWatermark,
 		openUntitledFile
 	});
 }

src/vs/workbench/parts/watermark/electron-browser/watermark.ts

@@ -138,14 +138,12 @@ export class WatermarkContribution implements IWorkbenchContribution {
 		@IKeybindingService private keybindingService: IKeybindingService,
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@IStorageService private storageService: IStorageService,
-		@ITelemetryService telemetryService: ITelemetryService
+		@ITelemetryService private telemetryService: ITelemetryService
 	) {
-		if (telemetryService.getExperiments().showCommandsWatermark) {
-			lifecycleService.onShutdown(this.dispose, this);
-			this.partService.joinCreation().then(() => {
-				this.create();
-			});
-		}
+		lifecycleService.onShutdown(this.dispose, this);
+		this.partService.joinCreation().then(() => {
+			this.create();
+		});
 	}
 
 	public getId() {
@@ -160,7 +158,8 @@ export class WatermarkContribution implements IWorkbenchContribution {
 		const box = $(watermark)
 			.div({ 'class': 'watermark-box' });
 		const folder = !!this.contextService.getWorkspace();
-		const firstSession = !this.storageService.get('telemetry.lastSessionDate');
+		const firstSession = this.telemetryService.getExperiments().showFirstSessionWatermark &&
+			!this.storageService.get('telemetry.lastSessionDate');
 		const selected = (folder ? folderEntries : firstSession ? firstSessionEntries : noFolderEntries)
 			.filter(entry => !('mac' in entry) || entry.mac === isMacintosh);
 		const update = () => {