Fixes ARC tracking (microsoft#254445)

* Fixes microsoft#254419 (microsoft#254421)

* Fixes microsoft/vscode-internalbacklog#5608 (microsoft#254423)

Author: hediet

src/vs/workbench/contrib/editTelemetry/browser/editSourceTrackingFeature.ts

@@ -24,13 +24,14 @@ import { IEditorService } from '../../../services/editor/common/editorService.js
 import { IStatusbarService, StatusbarAlignment } from '../../../services/statusbar/browser/statusbar.js';
 import { EditSource } from './documentWithAnnotatedEdits.js';
 import { EditSourceTrackingImpl } from './editSourceTrackingImpl.js';
-import { EDIT_TELEMETRY_SHOW_DECORATIONS, EDIT_TELEMETRY_SHOW_STATUS_BAR } from './settings.js';
+import { EDIT_TELEMETRY_DETAILS_SETTING_ID, EDIT_TELEMETRY_SHOW_DECORATIONS, EDIT_TELEMETRY_SHOW_STATUS_BAR } from './settings.js';
 import { VSCodeWorkspace } from './vscodeObservableWorkspace.js';
 
 export class EditTrackingFeature extends Disposable {
 
 	private readonly _editSourceTrackingShowDecorations;
 	private readonly _editSourceTrackingShowStatusBar;
+	private readonly _editSourceDetailsEnabled;
 	private readonly _showStateInMarkdownDoc = 'editTelemetry.showDebugDetails';
 	private readonly _toggleDecorations = 'editTelemetry.toggleDebugDecorations';
 
@@ -46,6 +47,7 @@ export class EditTrackingFeature extends Disposable {
 
 		this._editSourceTrackingShowDecorations = makeSettable(observableConfigValue(EDIT_TELEMETRY_SHOW_DECORATIONS, false, this._configurationService));
 		this._editSourceTrackingShowStatusBar = observableConfigValue(EDIT_TELEMETRY_SHOW_STATUS_BAR, false, this._configurationService);
+		this._editSourceDetailsEnabled = observableConfigValue(EDIT_TELEMETRY_DETAILS_SETTING_ID, false, this._configurationService);
 
 		const onDidAddGroupSignal = observableSignalFromEvent(this, this._editorGroupsService.onDidAddGroup);
 		const onDidRemoveGroupSignal = observableSignalFromEvent(this, this._editorGroupsService.onDidRemoveGroup);
@@ -72,7 +74,7 @@ export class EditTrackingFeature extends Disposable {
 		const impl = this._register(this._instantiationService.createInstance(EditSourceTrackingImpl, this._workspace, (doc, reader) => {
 			const map = visibleUris.read(reader);
 			return map.get(doc.uri.toString()) !== undefined;
-		}));
+		}, this._editSourceDetailsEnabled));
 
 		this._register(autorun((reader) => {
 			if (!this._editSourceTrackingShowDecorations.read(reader)) {

src/vs/workbench/contrib/editTelemetry/browser/editSourceTrackingImpl.ts

@@ -26,17 +26,21 @@ export class EditSourceTrackingImpl extends Disposable {
 	constructor(
 		private readonly _workspace: ObservableWorkspace,
 		private readonly _docIsVisible: (doc: IObservableDocument, reader: IReader) => boolean,
+		private readonly _statsEnabled: IObservable<boolean>,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 	) {
 		super();
 
 		const scmBridge = this._instantiationService.createInstance(ScmBridge);
 
-		this.docsState = mapObservableArrayCached(this, this._workspace.documents, (doc, store) => {
+		const states = mapObservableArrayCached(this, this._workspace.documents, (doc, store) => {
 			const docIsVisible = derived(reader => this._docIsVisible(doc, reader));
 			const wasEverVisible = derivedObservableWithCache<boolean>(this, (reader, lastVal) => lastVal || docIsVisible.read(reader));
-			return wasEverVisible.map(v => v ? [doc, store.add(this._instantiationService.createInstance(TrackedDocumentInfo, doc, docIsVisible, scmBridge))] as const : undefined);
-		}).recomputeInitiallyAndOnChange(this._store).map((entries, reader) => new Map(entries.map(e => e.read(reader)).filter(isDefined)));
+			return wasEverVisible.map(v => v ? [doc, store.add(this._instantiationService.createInstance(TrackedDocumentInfo, doc, docIsVisible, scmBridge, this._statsEnabled))] as const : undefined);
+		});
+
+		this.docsState = states.map((entries, reader) => new Map(entries.map(e => e.read(reader)).filter(isDefined)))
+			.recomputeInitiallyAndOnChange(this._store);
 	}
 }
 
@@ -78,6 +82,7 @@ class TrackedDocumentInfo extends Disposable {
 		private readonly _doc: IObservableDocument,
 		docIsVisible: IObservable<boolean>,
 		private readonly _scm: ScmBridge,
+		private readonly _statsEnabled: IObservable<boolean>,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@ITelemetryService private readonly _telemetryService: ITelemetryService
 	) {
@@ -95,6 +100,7 @@ class TrackedDocumentInfo extends Disposable {
 		const longtermResetSignal = observableSignal('resetSignal');
 
 		this.longtermTracker = derived((reader) => {
+			if (!this._statsEnabled.read(reader)) { return undefined; }
 			longtermResetSignal.read(reader);
 
 			const t = reader.store.add(new DocumentEditSourceTracker(docWithJustReason, undefined));
@@ -134,6 +140,8 @@ class TrackedDocumentInfo extends Disposable {
 		const resetSignal = observableSignal('resetSignal');
 
 		this.windowedTracker = derived((reader) => {
+			if (!this._statsEnabled.read(reader)) { return undefined; }
+
 			if (!docIsVisible.read(reader)) {
 				return undefined;
 			}

src/vs/workbench/contrib/editTelemetry/browser/editTelemetry.contribution.ts

@@ -7,7 +7,7 @@ import { Registry } from '../../../../platform/registry/common/platform.js';
 import { EditTelemetryService } from './editTelemetryService.js';
 import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
 import { localize } from '../../../../nls.js';
-import { EDIT_TELEMETRY_SETTING_ID, EDIT_TELEMETRY_SHOW_DECORATIONS, EDIT_TELEMETRY_SHOW_STATUS_BAR } from './settings.js';
+import { EDIT_TELEMETRY_DETAILS_SETTING_ID, EDIT_TELEMETRY_SETTING_ID, EDIT_TELEMETRY_SHOW_DECORATIONS, EDIT_TELEMETRY_SHOW_STATUS_BAR } from './settings.js';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
 
 registerWorkbenchContribution2('EditTelemetryService', EditTelemetryService, WorkbenchPhase.AfterRestored);
@@ -25,6 +25,12 @@ configurationRegistry.registerConfiguration({
 			default: true,
 			tags: ['experimental'],
 		},
+		[EDIT_TELEMETRY_DETAILS_SETTING_ID]: {
+			markdownDescription: localize('telemetry.editStats.detailed.enabled', "Controls whether to enable telemetry for detailed edit statistics (only sends statistics if general telemetry is enabled)."),
+			type: 'boolean',
+			default: false,
+			tags: ['experimental'],
+		},
 		[EDIT_TELEMETRY_SHOW_STATUS_BAR]: {
 			markdownDescription: localize('telemetry.editStats.showStatusBar', "Controls whether to show the status bar for edit telemetry."),
 			type: 'boolean',

src/vs/workbench/contrib/editTelemetry/browser/settings.ts

@@ -4,5 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 export const EDIT_TELEMETRY_SETTING_ID = 'telemetry.editStats.enabled';
+export const EDIT_TELEMETRY_DETAILS_SETTING_ID = 'telemetry.editStats.details.enabled';
 export const EDIT_TELEMETRY_SHOW_DECORATIONS = 'telemetry.editStats.showDecorations';
 export const EDIT_TELEMETRY_SHOW_STATUS_BAR = 'telemetry.editStats.showStatusBar';