Fixes microsoft/vscode-internalbacklog#5765

Author: hediet

src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts

@@ -36,7 +36,7 @@ import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions
 import { ExtHostContext, ExtHostLanguageFeaturesShape, HoverWithId, ICallHierarchyItemDto, ICodeActionDto, ICodeActionProviderMetadataDto, IdentifiableInlineCompletion, IdentifiableInlineCompletions, IDocumentDropEditDto, IDocumentDropEditProviderMetadata, IDocumentFilterDto, IIndentationRuleDto, IInlayHintDto, ILanguageConfigurationDto, ILanguageWordDefinitionDto, ILinkDto, ILocationDto, ILocationLinkDto, IOnEnterRuleDto, IPasteEditDto, IPasteEditProviderMetadataDto, IRegExpDto, ISignatureHelpProviderMetadataDto, ISuggestDataDto, ISuggestDataDtoField, ISuggestResultDtoField, ITypeHierarchyItemDto, IWorkspaceSymbolDto, MainContext, MainThreadLanguageFeaturesShape } from '../common/extHost.protocol.js';
 import { InlineCompletionEndOfLifeReasonKind } from '../common/extHostTypes.js';
 import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
-import { DataChannelForwardingTelemetryService } from '../../contrib/editTelemetry/browser/telemetry/forwardingTelemetryService.js';
+import { DataChannelForwardingTelemetryService, forwardToChannelIf, isCopilotLikeExtension } from '../../contrib/editTelemetry/browser/telemetry/forwardingTelemetryService.js';
 
 @extHostNamedCustomer(MainContext.MainThreadLanguageFeatures)
 export class MainThreadLanguageFeatures extends Disposable implements MainThreadLanguageFeaturesShape {
@@ -684,7 +684,8 @@ export class MainThreadLanguageFeatures extends Disposable implements MainThread
 					superseded: reason.kind === InlineCompletionEndOfLifeReasonKind.Ignored && !!reason.supersededBy,
 					reason: reason.kind === InlineCompletionEndOfLifeReasonKind.Accepted ? 'accepted'
 						: reason.kind === InlineCompletionEndOfLifeReasonKind.Rejected ? 'rejected'
-							: 'ignored'
+							: 'ignored',
+					...forwardToChannelIf(isCopilotLikeExtension(extensionId)),
 				};
 
 				const telemetryService = this._instantiationService.createInstance(DataChannelForwardingTelemetryService);

src/vs/workbench/contrib/editTelemetry/browser/telemetry/arcTelemetrySender.ts

@@ -18,6 +18,7 @@ import { IDocumentWithAnnotatedEdits, EditSourceData, createDocWithJustReason }
 import type { ScmRepoBridge } from './editSourceTrackingImpl.js';
 import { ITextModelEditSourceMetadata } from '../../../../../editor/common/textModelEditSource.js';
 import { generateUuid } from '../../../../../base/common/uuid.js';
+import { forwardToChannelIf, isCopilotLikeExtension } from './forwardingTelemetryService.js';
 
 export class InlineEditArcTelemetrySender extends Disposable {
 	constructor(
@@ -87,6 +88,8 @@ export class InlineEditArcTelemetrySender extends Disposable {
 					currentLineCount: res.currentLineCount,
 					originalDeletedLineCount: res.originalDeletedLineCount,
 					currentDeletedLineCount: res.currentDeletedLineCount,
+
+					...forwardToChannelIf(isCopilotLikeExtension(data.$extensionId)),
 				});
 			});
 
@@ -193,6 +196,8 @@ export class ChatArcTelemetrySender extends Disposable {
 					originalLineCount: res.originalLineCount,
 					currentLineCount: res.currentLineCount,
 					originalDeletedLineCount: res.originalDeletedLineCount,
+
+					...forwardToChannelIf(isCopilotLikeExtension(data.props.$extensionId)),
 				});
 			});
 

src/vs/workbench/contrib/editTelemetry/browser/telemetry/forwardingTelemetryService.ts

@@ -83,7 +83,31 @@ export class DataChannelForwardingTelemetryService extends InterceptingTelemetry
 		@IDataChannelService dataChannelService: IDataChannelService,
 	) {
 		super(telemetryService, (eventName, data) => {
-			dataChannelService.getDataChannel<IEditTelemetryData>('editTelemetry').sendData({ eventName, data: data as any });
+			// filter for extension
+			let forward = true;
+			if (data && shouldForwardToChannel in data) {
+				forward = Boolean(data[shouldForwardToChannel]);
+			}
+
+			if (forward) {
+				dataChannelService.getDataChannel<IEditTelemetryData>('editTelemetry').sendData({ eventName, data: data as any });
+			}
 		});
 	}
 }
+
+const shouldForwardToChannel = Symbol('shouldForwardToChannel');
+export function forwardToChannelIf(value: boolean): Record<string, unknown> {
+	return {
+		// This will not be sent via telemetry, it is just a marker
+		[shouldForwardToChannel]: value
+	};
+}
+
+export function isCopilotLikeExtension(extensionId: string | undefined): boolean {
+	if (!extensionId) {
+		return false;
+	}
+	const extIdLowerCase = extensionId.toLowerCase();
+	return extIdLowerCase === 'github.copilot' || extIdLowerCase === 'github.copilot-chat';
+}