Skip to content

chore(telemetry): include repoId and headCommitHash in repo telemetry for all users #3956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhichli merged 3 commits into from
Feb 24, 2026
+36 −49
Merged

chore(telemetry): include repoId and headCommitHash in repo telemetry for all users #3956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bcec993
chore(telemetry): include repoId and headCommitHash in repo telemetry…
zhichli Feb 24, 2026
30a8037
fix(repoInfoTelemetry): handle potential null value for activeRepository
zhichli Feb 24, 2026
4c1e2ed
Merge branch 'main' into pleasant-swift
zhichli Feb 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions src/extension/prompt/node/repoInfoTelemetry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

import { ICopilotTokenStore } from '../../../platform/authentication/common/copilotTokenStore';
import { IFileSystemService } from '../../../platform/filesystem/common/fileSystemService';
import { IGitDiffService } from '../../../platform/git/common/gitDiffService';
import { IGitExtensionService } from '../../../platform/git/common/gitExtensionService';
Expand Down Expand Up @@ -49,6 +48,7 @@ type RepoInfoTelemetryResult = 'success' | 'filesChanged' | 'diffTooLarge' | 'no

type RepoInfoTelemetryProperties = {
remoteUrl: string | undefined;
repoId: string | undefined;
repoType: 'github' | 'ado';
headCommitHash: string | undefined;
diffsJSON: string | undefined;
Expand Down Expand Up @@ -77,7 +77,9 @@ function shouldSendEndTelemetry(result: RepoInfoTelemetryResult | undefined): bo
}

/*
* Handles sending internal only telemetry about the current git repository
* Handles sending telemetry about the current git repository.
* headCommitHash and repoId are sent for all users via sendMSFTTelemetryEvent.
* Full data (remoteUrl, diffs) is only sent for internal users via sendInternalMSFTTelemetryEvent.
*/
export class RepoInfoTelemetry {
private _beginTelemetrySent = false;
Expand All @@ -90,7 +92,6 @@ export class RepoInfoTelemetry {
@IGitService private readonly _gitService: IGitService,
@IGitDiffService private readonly _gitDiffService: IGitDiffService,
@IGitExtensionService private readonly _gitExtensionService: IGitExtensionService,
@ICopilotTokenStore private readonly _copilotTokenStore: ICopilotTokenStore,
@ILogService private readonly _logService: ILogService,
@IFileSystemService private readonly _fileSystemService: IFileSystemService,
@IWorkspaceFileIndex private readonly _workspaceFileIndex: IWorkspaceFileIndex,
Expand Down Expand Up @@ -136,28 +137,34 @@ export class RepoInfoTelemetry {
}

private async _sendRepoInfoTelemetry(location: 'begin' | 'end'): Promise<RepoInfoTelemetryData | undefined> {
if (this._copilotTokenStore.copilotToken?.isInternal !== true) {
return undefined;
}

const repoInfo = await this._getRepoInfoTelemetry();
if (!repoInfo) {
return undefined;
}

const properties: RepoInfoInternalTelemetryProperties = {
// Send headCommitHash and repoId for all users
this._telemetryService.sendMSFTTelemetryEvent('request.repoInfo', {
repoId: repoInfo.properties.repoId,
repoType: repoInfo.properties.repoType,
headCommitHash: repoInfo.properties.headCommitHash,
result: repoInfo.properties.result,
location,
telemetryMessageId: this._telemetryMessageId,
}, repoInfo.measurements);

// Send full data including remoteUrl and diffs for internal users only
const internalProperties: RepoInfoInternalTelemetryProperties = {
...repoInfo.properties,
location,
telemetryMessageId: this._telemetryMessageId
};

this._telemetryService.sendInternalMSFTTelemetryEvent('request.repoInfo', properties, repoInfo.measurements);
this._telemetryService.sendInternalMSFTTelemetryEvent('request.repoInfo', internalProperties, repoInfo.measurements);

return repoInfo;
}

private async _getRepoInfoTelemetry(): Promise<RepoInfoTelemetryData | undefined> {
const repoContext = this._gitService.activeRepository.get();
const repoContext = this._gitService.activeRepository?.get();

if (!repoContext) {
return;
Expand Down Expand Up @@ -203,6 +210,7 @@ export class RepoInfoTelemetry {
try {
const baseProperties: Omit<RepoInfoTelemetryProperties, 'diffsJSON' | 'result'> = {
remoteUrl: normalizedFetchUrl,
repoId: repoInfo.repoId.toString(),
repoType: repoInfo.repoId.type,
headCommitHash: upstreamCommit,
};
Expand Down
Loading