Merge pull request microsoft#269558 from microsoft/benibenj/smoggy-ptarmigan

Send fewer telemetry events

Author: benibenj

src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts

@@ -12,12 +12,14 @@ import { Disposable, DisposableStore, IDisposable, MutableDisposable, toDisposab
 import { derived, IObservable, IObservableWithChange, ITransaction, observableValue, recordChangesLazy, transaction } from '../../../../../base/common/observable.js';
 // eslint-disable-next-line local/code-no-deep-import-of-internal
 import { observableReducerSettable } from '../../../../../base/common/observableInternal/experimental/reducer.js';
-import { isDefined } from '../../../../../base/common/types.js';
+import { isDefined, isObject } from '../../../../../base/common/types.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 import { DataChannelForwardingTelemetryService, forwardToChannelIf, isCopilotLikeExtension } from '../../../../../platform/dataChannel/browser/forwardingTelemetryService.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../../../platform/log/common/log.js';
 import { observableConfigValue } from '../../../../../platform/observable/common/platformObservableUtils.js';
+import product from '../../../../../platform/product/common/product.js';
 import { StringEdit } from '../../../../common/core/edits/stringEdit.js';
 import { Position } from '../../../../common/core/position.js';
 import { InlineCompletionEndOfLifeReasonKind, InlineCompletionTriggerKind, InlineCompletionsProvider } from '../../../../common/languages.js';
@@ -73,6 +75,8 @@ export class InlineCompletionsSource extends Disposable {
 	public readonly inlineCompletions = this._state.map(this, v => v.inlineCompletions);
 	public readonly suggestWidgetInlineCompletions = this._state.map(this, v => v.suggestWidgetInlineCompletions);
 
+	private _completionsEnabled: Record<string, boolean> | undefined = undefined;
+
 	constructor(
 		private readonly _textModel: ITextModel,
 		private readonly _versionId: IObservableWithChange<number | null, IModelContentChangedEvent | undefined>,
@@ -82,6 +86,7 @@ export class InlineCompletionsSource extends Disposable {
 		@ILogService private readonly _logService: ILogService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
 	) {
 		super();
 		this._loggingEnabled = observableConfigValue('editor.inlineSuggest.logFetch', false, this._configurationService).recomputeInitiallyAndOnChange(this._store);
@@ -94,6 +99,25 @@ export class InlineCompletionsSource extends Disposable {
 		));
 
 		this.clearOperationOnTextModelChange.recomputeInitiallyAndOnChange(this._store);
+
+		const enablementSetting = product.defaultChatAgent?.completionsEnablementSetting ?? undefined;
+		if (enablementSetting) {
+			this._updateCompletionsEnablement(enablementSetting);
+			this._register(this._configurationService.onDidChangeConfiguration(e => {
+				if (e.affectsConfiguration(enablementSetting)) {
+					this._updateCompletionsEnablement(enablementSetting);
+				}
+			}));
+		}
+	}
+
+	private _updateCompletionsEnablement(enalementSetting: string) {
+		const result = this._configurationService.getValue<Record<string, boolean>>(enalementSetting);
+		if (!isObject(result)) {
+			this._completionsEnabled = undefined;
+		} else {
+			this._completionsEnabled = result;
+		}
 	}
 
 	public readonly clearOperationOnTextModelChange = derived(this, reader => {
@@ -260,7 +284,8 @@ export class InlineCompletionsSource extends Disposable {
 					if (source.token.isCancellationRequested) {
 						requestResponseInfo.setNoSuggestionReasonIfNotSet('canceled:whileFetching');
 					} else {
-						requestResponseInfo.setNoSuggestionReasonIfNotSet('noSuggestion');
+						const completionsQuotaExceeded = this._contextKeyService.getContextKeyValue<boolean>('completionsQuotaExceeded');
+						requestResponseInfo.setNoSuggestionReasonIfNotSet(completionsQuotaExceeded ? 'completionsQuotaExceeded' : 'noSuggestion');
 					}
 				}
 
@@ -356,14 +381,23 @@ export class InlineCompletionsSource extends Disposable {
 	private sendInlineCompletionsRequestTelemetry(
 		requestResponseInfo: RequestResponseData
 	): void {
-		if (!this._sendRequestData.get()) {
+		if (!this._sendRequestData.get() && !this._contextKeyService.getContextKeyValue<boolean>('isRunningUnificationExperiment')) {
 			return;
 		}
 
 		if (requestResponseInfo.requestUuid === undefined || requestResponseInfo.hasProducedSuggestion) {
 			return;
 		}
 
+
+		if (!isCompletionsEnabled(this._completionsEnabled, this._textModel.getLanguageId())) {
+			return;
+		}
+
+		if (!requestResponseInfo.providers.some(p => isCopilotLikeExtension(p.providerId?.extensionId))) {
+			return;
+		}
+
 		const emptyEndOfLifeEvent: InlineCompletionEndOfLifeEvent = {
 			id: requestResponseInfo.requestUuid,
 			opportunityId: requestResponseInfo.requestUuid,
@@ -472,6 +506,18 @@ function isSubset<T>(set1: Set<T>, set2: Set<T>): boolean {
 	return [...set1].every(item => set2.has(item));
 }
 
+function isCompletionsEnabled(completionsEnablementObject: Record<string, boolean> | undefined, modeId: string = '*'): boolean {
+	if (completionsEnablementObject === undefined) {
+		return false; // default to disabled if setting is not available
+	}
+
+	if (typeof completionsEnablementObject[modeId] !== 'undefined') {
+		return Boolean(completionsEnablementObject[modeId]); // go with setting if explicitly defined
+	}
+
+	return Boolean(completionsEnablementObject['*']); // fallback to global setting otherwise
+}
+
 class UpdateOperation implements IDisposable {
 	constructor(
 		public readonly request: UpdateRequest,

src/vs/workbench/services/inlineCompletions/common/inlineCompletionsUnification.ts

@@ -6,6 +6,7 @@
 import { equals } from '../../../../base/common/arrays.js';
 import { Event, Emitter } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { IWorkbenchAssignmentService } from '../../assignment/common/assignmentService.js';
@@ -29,19 +30,25 @@ const CODE_UNIFICATION_PREFIX = 'cmp-cht-';
 const CODE_UNIFICATION_FF = 'inlineCompletionsUnificationCode';
 const MODEL_UNIFICATION_FF = 'inlineCompletionsUnificationModel';
 
+export const isRunningUnificationExperiment = new RawContextKey<boolean>('isRunningUnificationExperiment', false);
+
 export class InlineCompletionsUnificationImpl extends Disposable implements IInlineCompletionsUnificationService {
 	readonly _serviceBrand: undefined;
 
 	private _state = new InlineCompletionsUnificationState(false, false, []);
 	public get state(): IInlineCompletionsUnificationState { return this._state; }
 
+	private isRunningUnificationExperiment;
+
 	private readonly _onDidStateChange = this._register(new Emitter<void>());
 	public readonly onDidStateChange = this._onDidStateChange.event;
 
 	constructor(
-		@IWorkbenchAssignmentService private readonly _assignmentService: IWorkbenchAssignmentService
+		@IWorkbenchAssignmentService private readonly _assignmentService: IWorkbenchAssignmentService,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
 	) {
 		super();
+		this.isRunningUnificationExperiment = isRunningUnificationExperiment.bindTo(this._contextKeyService);
 		this._register(this._assignmentService.onDidRefetchAssignments(() => this._update()));
 		this._update();
 	}
@@ -62,6 +69,7 @@ export class InlineCompletionsUnificationImpl extends Disposable implements IInl
 			return;
 		}
 		this._state = newState;
+		this.isRunningUnificationExperiment.set(this._state.codeUnification || this._state.modelUnification);
 		this._onDidStateChange.fire();
 	}
 }