Skip to content

Commit 8c15ca4

Browse files
TylerLeonhardtTylerLeonhardt
authored
Move IRequestLogger into common (#309121)
* Move IRequestLogger into common so that it can be used in common files. also two tiny feedbacks in claude from #309119 * format
1 parent 01667d8 commit 8c15ca4

File tree

50 files changed

+387
-361
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+387
-361
lines changed

‎extensions/copilot/src/extension/byok/vscode-node/anthropicProvider.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ import { IResponseDelta, OpenAiFunctionTool } from '../../../platform/networking
1717
import { APIUsage } from '../../../platform/networking/common/openai';
1818
import { CopilotChatAttr, emitInferenceDetailsEvent, GenAiAttr, GenAiMetrics, GenAiOperationName, type OTelModelOptions, StdAttr, truncateForOTel } from '../../../platform/otel/common/index';
1919
import { IOTelService, SpanKind, SpanStatusCode } from '../../../platform/otel/common/otelService';
20-
import { IRequestLogger, retrieveCapturingTokenByCorrelation, runWithCapturingToken } from '../../../platform/requestLogger/node/requestLogger';
20+
import { IRequestLogger } from '../../../platform/requestLogger/common/requestLogger';
21+
import { retrieveCapturingTokenByCorrelation, runWithCapturingToken } from '../../../platform/requestLogger/node/requestLogger';
2122
import { IExperimentationService } from '../../../platform/telemetry/common/nullExperimentationService';
2223
import { ITelemetryService } from '../../../platform/telemetry/common/telemetry';
2324
import { toErrorMessage } from '../../../util/common/errorMessage';

‎extensions/copilot/src/extension/byok/vscode-node/geminiNativeProvider.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ import { IResponseDelta, OpenAiFunctionTool } from '../../../platform/networking
1111
import { APIUsage } from '../../../platform/networking/common/openai';
1212
import { CopilotChatAttr, emitInferenceDetailsEvent, GenAiAttr, GenAiMetrics, GenAiOperationName, type OTelModelOptions, StdAttr, truncateForOTel } from '../../../platform/otel/common/index';
1313
import { IOTelService, SpanKind, SpanStatusCode } from '../../../platform/otel/common/otelService';
14-
import { IRequestLogger, retrieveCapturingTokenByCorrelation, runWithCapturingToken } from '../../../platform/requestLogger/node/requestLogger';
14+
import { IRequestLogger } from '../../../platform/requestLogger/common/requestLogger';
15+
import { retrieveCapturingTokenByCorrelation, runWithCapturingToken } from '../../../platform/requestLogger/node/requestLogger';
1516
import { ITelemetryService } from '../../../platform/telemetry/common/telemetry';
1617
import { toErrorMessage } from '../../../util/common/errorMessage';
1718
import { RecordedProgress } from '../../../util/common/progressRecorder';
@@ -508,4 +509,4 @@ export class GeminiNativeBYOKLMProvider extends AbstractLanguageModelChatProvide
508509
throw error;
509510
}
510511
}
511-
}
512+
}

‎extensions/copilot/src/extension/byok/vscode-node/test/geminiNativeProvider.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';
77
import * as vscode from 'vscode';
88
import { NoopOTelService, resolveOTelConfig } from '../../../../platform/otel/common/index';
99
import type { CapturingToken } from '../../../../platform/requestLogger/common/capturingToken';
10-
import type { IRequestLogger } from '../../../../platform/requestLogger/node/requestLogger';
10+
import type { IRequestLogger } from '../../../../platform/requestLogger/common/requestLogger';
1111
import { NullTelemetryService } from '../../../../platform/telemetry/common/nullTelemetryService';
1212
import { TestLogService } from '../../../../platform/testing/common/testLogService';
1313
import type { IBYOKStorageService } from '../byokStorageService';

‎extensions/copilot/src/extension/chatSessions/claude/common/claudeMessageDispatch.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,12 @@ export function handleAssistantMessage(
176176
otelToolSpans.set(item.id, toolSpan);
177177

178178
if (request.editTracker && claudeEditTools.includes(item.name)) {
179-
const uris = getAffectedUrisForEditTool(item.name, item.input);
180-
request.editTracker.trackEdit(item.id, uris, stream, request.token);
179+
try {
180+
const uris = getAffectedUrisForEditTool(item.name, item.input);
181+
void request.editTracker.trackEdit(item.id, uris, stream, request.token);
182+
} catch (e) {
183+
logService.warn(`[ClaudeMessageDispatch] Failed to track edit for ${item.name}: ${e}`);
184+
}
181185
}
182186

183187
const invocation = createFormattedToolInvocation(item, false);

‎extensions/copilot/src/extension/chatSessions/claude/node/claudeCodeAgent.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ import { ILogService } from '../../../../platform/log/common/logService';
1313
import { IMcpService } from '../../../../platform/mcp/common/mcpService';
1414
import { CopilotChatAttr, GenAiAttr, IOTelService, type ISpanHandle, SpanKind, SpanStatusCode, truncateForOTel } from '../../../../platform/otel/common/index';
1515
import { CapturingToken } from '../../../../platform/requestLogger/common/capturingToken';
16-
import { IRequestLogger } from '../../../../platform/requestLogger/node/requestLogger';
16+
import { IRequestLogger } from '../../../../platform/requestLogger/common/requestLogger';
17+
import { runWithCapturingToken } from '../../../../platform/requestLogger/node/requestLogger';
1718
import { IWorkspaceService } from '../../../../platform/workspace/common/workspaceService';
1819
import { DeferredPromise } from '../../../../util/vs/base/common/async';
1920
import { Disposable, DisposableMap } from '../../../../util/vs/base/common/lifecycle';
@@ -609,7 +610,7 @@ export class ClaudeCodeSession extends Disposable {
609610
const response = { content: [new LanguageModelTextPart(resultContent)] };
610611
const capturingToken = this.sessionStateService.getCapturingTokenForSession(this.sessionId);
611612
if (capturingToken) {
612-
this._requestLogger.captureInvocation(capturingToken, async () =>
613+
void runWithCapturingToken(capturingToken, async () =>
613614
this._requestLogger.logToolCall(toolUseId, toolName, toolInput, response));
614615
} else {
615616
this._requestLogger.logToolCall(toolUseId, toolName, toolInput, response);

‎extensions/copilot/src/extension/chatSessions/claude/node/claudeLanguageModelServer.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { FinishedCallback, OptionalChatRequestParams } from '../../../../platfor
1616
import { Response } from '../../../../platform/networking/common/fetcherService';
1717
import { IChatEndpoint, ICreateEndpointBodyOptions, IEndpointBody, IEndpointFetchOptions, IMakeChatRequestOptions } from '../../../../platform/networking/common/networking';
1818
import { ChatCompletion } from '../../../../platform/networking/common/openai';
19-
import { IRequestLogger } from '../../../../platform/requestLogger/node/requestLogger';
19+
import { IRequestLogger } from '../../../../platform/requestLogger/common/requestLogger';
2020
import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry';
2121
import { TelemetryData } from '../../../../platform/telemetry/common/telemetryData';
2222
import { ITokenizer, TokenizerType } from '../../../../util/common/tokenizer';

‎extensions/copilot/src/extension/chatSessions/copilotcli/node/copilotcliSession.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { ILogService } from '../../../../platform/log/common/logService';
1212
import { GenAiMetrics } from '../../../../platform/otel/common/genAiMetrics';
1313
import { CopilotChatAttr, GenAiAttr, GenAiOperationName, IOTelService, ISpanHandle, SpanKind, SpanStatusCode, truncateForOTel } from '../../../../platform/otel/common/index';
1414
import { CapturingToken } from '../../../../platform/requestLogger/common/capturingToken';
15-
import { IRequestLogger, LoggedRequestKind } from '../../../../platform/requestLogger/node/requestLogger';
15+
import { IRequestLogger, LoggedRequestKind } from '../../../../platform/requestLogger/common/requestLogger';
1616
import { IWorkspaceService } from '../../../../platform/workspace/common/workspaceService';
1717
import { raceCancellation } from '../../../../util/vs/base/common/async';
1818
import { CancellationToken } from '../../../../util/vs/base/common/cancellation';

‎extensions/copilot/src/extension/chatSessions/copilotcli/node/test/copilotcliSession.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { ConfigKey, IConfigurationService } from '../../../../../platform/config
1010
import { ILogService } from '../../../../../platform/log/common/logService';
1111
import { NoopOTelService, resolveOTelConfig } from '../../../../../platform/otel/common/index';
1212
import { NullRequestLogger } from '../../../../../platform/requestLogger/node/nullRequestLogger';
13-
import { IRequestLogger } from '../../../../../platform/requestLogger/node/requestLogger';
13+
import { IRequestLogger } from '../../../../../platform/requestLogger/common/requestLogger';
1414
import { TestWorkspaceService } from '../../../../../platform/test/node/testWorkspaceService';
1515
import { IWorkspaceService } from '../../../../../platform/workspace/common/workspaceService';
1616
import { CancellationToken } from '../../../../../util/vs/base/common/cancellation';

‎extensions/copilot/src/extension/completions-core/vscode-node/extension/src/vscodeInlineCompletionItemProvider.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import {
2020
} from 'vscode';
2121
import { ILogger, ILogService, LogTarget } from '../../../../../platform/log/common/logService';
2222
import { CapturingToken } from '../../../../../platform/requestLogger/common/capturingToken';
23-
import { IRequestLogger } from '../../../../../platform/requestLogger/node/requestLogger';
23+
import { IRequestLogger } from '../../../../../platform/requestLogger/common/requestLogger';
2424
import { softAssert } from '../../../../../util/vs/base/common/assert';
2525
import { Disposable } from '../../../../../util/vs/base/common/lifecycle';
2626
import { StopWatch } from '../../../../../util/vs/base/common/stopwatch';

‎extensions/copilot/src/extension/conversation/vscode-node/feedbackReporter.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { ChatLocation } from '../../../platform/chat/common/commonTypes';
1010
import { getTextPart, roleToString } from '../../../platform/chat/common/globalStringUtils';
1111
import { ConfigKey, IConfigurationService } from '../../../platform/configuration/common/configurationService';
1212
import { IEditLogService } from '../../../platform/multiFileEdit/common/editLogService';
13-
import { ILoggedPendingRequest, IRequestLogger, LoggedInfoKind, LoggedRequestKind } from '../../../platform/requestLogger/node/requestLogger';
13+
import { ILoggedPendingRequest, IRequestLogger, LoggedInfoKind, LoggedRequestKind } from '../../../platform/requestLogger/common/requestLogger';
1414
import { ITelemetryService } from '../../../platform/telemetry/common/telemetry';
1515
import { Disposable } from '../../../util/vs/base/common/lifecycle';
1616
import { IObservable } from '../../../util/vs/base/common/observableInternal';

0 commit comments

Comments
 (0)