development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 04:49:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Include slashCommand type in chat telemetry (#186565)

Browse source
This commit is contained in:
Rob Lourens 2023-06-28 14:05:21 -07:00 committed by GitHub
parent 4000c1da1f
commit 68dc2206ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/vs/workbench/contrib/chat/browser/chatWidget.ts
View file

@ -401,7 +401,8 @@ export class ChatWidget extends Disposable implements IChatWidget {
}
this._chatAccessibilityService.acceptRequest();
const input = query ?? editorValue;
const result = await this.chatService.sendRequest(this.viewModel.sessionId, input);
const usedSlashCommand = this.lookupSlashCommand(typeof input === 'string' ? input : input.message);
const result = await this.chatService.sendRequest(this.viewModel.sessionId, input, usedSlashCommand);
if (result) {
this.inputPart.acceptInput(query);
@ -416,6 +417,10 @@ export class ChatWidget extends Disposable implements IChatWidget {
}
}
private lookupSlashCommand(input: string): ISlashCommand | undefined {
return this.lastSlashCommands?.find(sc => input.startsWith(`/${sc.command}`));
}
getCodeBlockInfosForResponse(response: IChatResponseViewModel): IChatCodeBlockInfo[] {
return this.renderer.getCodeBlockInfosForResponse(response);
}

2
src/vs/workbench/contrib/chat/common/chatService.ts
View file

@ -187,7 +187,7 @@ export interface IChatService {
/**
* Returns whether the request was accepted.
*/
sendRequest(sessionId: string, message: string | IChatReplyFollowup): Promise<{ responseCompletePromise: Promise<void> } | undefined>;
sendRequest(sessionId: string, message: string | IChatReplyFollowup, usedSlashCommand?: ISlashCommand): Promise<{ responseCompletePromise: Promise<void> } | undefined>;
removeRequest(sessionid: string, requestId: string): Promise<void>;
cancelCurrentRequestForSession(sessionId: string): void;
getSlashCommands(sessionId: string, token: CancellationToken): Promise<ISlashCommand[] | undefined>;

14
src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
View file

@ -41,6 +41,7 @@ type ChatProviderInvokedEvent = {
totalTime: number;
result: 'success' | 'error' | 'errorWithOutput' | 'cancelled' | 'filtered';
requestType: 'string' | 'followup' | 'slashCommand';
slashCommand: string | undefined;
};
type ChatProviderInvokedClassification = {
@ -49,6 +50,7 @@ type ChatProviderInvokedClassification = {
totalTime: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; isMeasurement: true; comment: 'The total time it took to run the provider\'s `provideResponseWithProgress`.' };
result: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether invoking the ChatProvider resulted in an error.' };
requestType: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The type of request that the user made.' };
slashCommand?: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The type of slashCommand used.' };
owner: 'roblourens';
comment: 'Provides insight into the performance of Chat providers.';
};
@ -357,7 +359,7 @@ export class ChatService extends Disposable implements IChatService {
return this._startSession(data.providerId, data, CancellationToken.None);
}
async sendRequest(sessionId: string, request: string | IChatReplyFollowup): Promise<{ responseCompletePromise: Promise<void> } | undefined> {
async sendRequest(sessionId: string, request: string | IChatReplyFollowup, usedSlashCommand?: ISlashCommand): Promise<{ responseCompletePromise: Promise<void> } | undefined> {
const messageText = typeof request === 'string' ? request : request.message;
this.trace('sendRequest', `sessionId: ${sessionId}, message: ${messageText.substring(0, 20)}${messageText.length > 20 ? '[...]' : ''}}`);
if (!messageText.trim()) {
@ -382,10 +384,10 @@ export class ChatService extends Disposable implements IChatService {
}
// This method is only returning whether the request was accepted - don't block on the actual request
return { responseCompletePromise: this._sendRequestAsync(model, provider, request) };
return { responseCompletePromise: this._sendRequestAsync(model, provider, request, usedSlashCommand) };
}
private async _sendRequestAsync(model: ChatModel, provider: IChatProvider, message: string | IChatReplyFollowup): Promise<void> {
private async _sendRequestAsync(model: ChatModel, provider: IChatProvider, message: string | IChatReplyFollowup, usedSlashCommand?: ISlashCommand): Promise<void> {
const request = model.addRequest(message);
const resolvedCommand = typeof message === 'string' && message.startsWith('/') ? await this.handleSlashCommand(model.sessionId, message) : message;
@ -420,7 +422,8 @@ export class ChatService extends Disposable implements IChatService {
// Normally timings happen inside the EH around the actual provider. For cancellation we can measure how long the user waited before cancelling
totalTime: stopWatch.elapsed(),
result: 'cancelled',
requestType
requestType,
slashCommand: usedSlashCommand?.command
});
model.cancelRequest(request);
@ -443,7 +446,8 @@ export class ChatService extends Disposable implements IChatService {
timeToFirstProgress: rawResponse.timings?.firstProgress ?? 0,
totalTime: rawResponse.timings?.totalElapsed ?? 0,
result,
requestType
requestType,
slashCommand: usedSlashCommand?.command
});
model.completeResponse(request, rawResponse);
this.trace('sendRequest', `Provider returned response for session ${model.sessionId}`);