@google/gemini-cli-core 0.0.3-preview.4 → 0.0.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +2 -2
- package/README.md +12 -2
- package/dist/index.d.ts +6 -2
- package/dist/index.js +6 -2
- package/dist/index.js.map +1 -1
- package/dist/src/code_assist/codeAssist.d.ts +2 -0
- package/dist/src/code_assist/codeAssist.js +12 -0
- package/dist/src/code_assist/codeAssist.js.map +1 -1
- package/dist/src/code_assist/converter.d.ts +3 -1
- package/dist/src/code_assist/converter.js +2 -1
- package/dist/src/code_assist/converter.js.map +1 -1
- package/dist/src/code_assist/converter.test.js +10 -0
- package/dist/src/code_assist/converter.test.js.map +1 -1
- package/dist/src/code_assist/oauth-credential-storage.d.ts +25 -0
- package/dist/src/code_assist/oauth-credential-storage.js +109 -0
- package/dist/src/code_assist/oauth-credential-storage.js.map +1 -0
- package/dist/src/code_assist/oauth-credential-storage.test.js +136 -0
- package/dist/src/code_assist/oauth-credential-storage.test.js.map +1 -0
- package/dist/src/code_assist/oauth2.js +92 -29
- package/dist/src/code_assist/oauth2.js.map +1 -1
- package/dist/src/code_assist/oauth2.test.js +729 -339
- package/dist/src/code_assist/oauth2.test.js.map +1 -1
- package/dist/src/code_assist/server.d.ts +1 -1
- package/dist/src/code_assist/server.js +24 -1
- package/dist/src/code_assist/server.js.map +1 -1
- package/dist/src/code_assist/server.test.js +25 -0
- package/dist/src/code_assist/server.test.js.map +1 -1
- package/dist/src/code_assist/types.d.ts +17 -2
- package/dist/src/config/config.d.ts +72 -12
- package/dist/src/config/config.js +196 -64
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +305 -178
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/models.d.ts +16 -0
- package/dist/src/config/models.js +29 -0
- package/dist/src/config/models.js.map +1 -1
- package/dist/src/config/models.test.d.ts +6 -0
- package/dist/src/config/models.test.js +55 -0
- package/dist/src/config/models.test.js.map +1 -0
- package/dist/src/config/storage.d.ts +2 -0
- package/dist/src/config/storage.js +6 -1
- package/dist/src/config/storage.js.map +1 -1
- package/dist/src/config/storage.test.js +4 -0
- package/dist/src/config/storage.test.js.map +1 -1
- package/dist/src/confirmation-bus/index.d.ts +7 -0
- package/dist/src/confirmation-bus/index.js +8 -0
- package/dist/src/confirmation-bus/index.js.map +1 -0
- package/dist/src/confirmation-bus/message-bus.d.ts +17 -0
- package/dist/src/confirmation-bus/message-bus.js +81 -0
- package/dist/src/confirmation-bus/message-bus.js.map +1 -0
- package/dist/src/confirmation-bus/message-bus.test.d.ts +6 -0
- package/dist/src/confirmation-bus/message-bus.test.js +164 -0
- package/dist/src/confirmation-bus/message-bus.test.js.map +1 -0
- package/dist/src/confirmation-bus/types.d.ts +38 -0
- package/dist/src/confirmation-bus/types.js +15 -0
- package/dist/src/confirmation-bus/types.js.map +1 -0
- package/dist/src/core/baseLlmClient.d.ts +46 -0
- package/dist/src/core/baseLlmClient.js +112 -0
- package/dist/src/core/baseLlmClient.js.map +1 -0
- package/dist/src/core/baseLlmClient.test.d.ts +6 -0
- package/dist/src/core/baseLlmClient.test.js +253 -0
- package/dist/src/core/baseLlmClient.test.js.map +1 -0
- package/dist/src/core/client.d.ts +16 -21
- package/dist/src/core/client.js +145 -232
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/client.test.js +393 -492
- package/dist/src/core/client.test.js.map +1 -1
- package/dist/src/core/contentGenerator.d.ts +2 -3
- package/dist/src/core/contentGenerator.js +0 -4
- package/dist/src/core/contentGenerator.js.map +1 -1
- package/dist/src/core/contentGenerator.test.js +1 -3
- package/dist/src/core/contentGenerator.test.js.map +1 -1
- package/dist/src/core/coreToolScheduler.d.ts +8 -3
- package/dist/src/core/coreToolScheduler.js +106 -5
- package/dist/src/core/coreToolScheduler.js.map +1 -1
- package/dist/src/core/coreToolScheduler.test.js +233 -5
- package/dist/src/core/coreToolScheduler.test.js.map +1 -1
- package/dist/src/core/geminiChat.d.ts +38 -32
- package/dist/src/core/geminiChat.js +209 -219
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/geminiChat.test.js +674 -386
- package/dist/src/core/geminiChat.test.js.map +1 -1
- package/dist/src/core/loggingContentGenerator.js +13 -16
- package/dist/src/core/loggingContentGenerator.js.map +1 -1
- package/dist/src/core/nonInteractiveToolExecutor.test.js +59 -1
- package/dist/src/core/nonInteractiveToolExecutor.test.js.map +1 -1
- package/dist/src/core/prompts.d.ts +5 -0
- package/dist/src/core/prompts.js +63 -42
- package/dist/src/core/prompts.js.map +1 -1
- package/dist/src/core/prompts.test.js +130 -1
- package/dist/src/core/prompts.test.js.map +1 -1
- package/dist/src/core/subagent.js +7 -10
- package/dist/src/core/subagent.js.map +1 -1
- package/dist/src/core/subagent.test.js +32 -22
- package/dist/src/core/subagent.test.js.map +1 -1
- package/dist/src/core/turn.d.ts +21 -5
- package/dist/src/core/turn.js +45 -11
- package/dist/src/core/turn.js.map +1 -1
- package/dist/src/core/turn.test.js +340 -100
- package/dist/src/core/turn.test.js.map +1 -1
- package/dist/src/fallback/handler.d.ts +7 -0
- package/dist/src/fallback/handler.js +51 -0
- package/dist/src/fallback/handler.js.map +1 -0
- package/dist/src/fallback/handler.test.d.ts +6 -0
- package/dist/src/fallback/handler.test.js +130 -0
- package/dist/src/fallback/handler.test.js.map +1 -0
- package/dist/src/fallback/types.d.ts +14 -0
- package/dist/src/fallback/types.js +7 -0
- package/dist/src/fallback/types.js.map +1 -0
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/generated/git-commit.js.map +1 -1
- package/dist/src/ide/constants.d.ts +3 -0
- package/dist/src/ide/constants.js +3 -0
- package/dist/src/ide/constants.js.map +1 -1
- package/dist/src/ide/detect-ide.d.ts +42 -14
- package/dist/src/ide/detect-ide.js +22 -68
- package/dist/src/ide/detect-ide.js.map +1 -1
- package/dist/src/ide/detect-ide.test.js +11 -51
- package/dist/src/ide/detect-ide.test.js.map +1 -1
- package/dist/src/ide/ide-client.d.ts +60 -18
- package/dist/src/ide/ide-client.js +275 -53
- package/dist/src/ide/ide-client.js.map +1 -1
- package/dist/src/ide/ide-client.test.js +239 -6
- package/dist/src/ide/ide-client.test.js.map +1 -1
- package/dist/src/ide/ide-installer.d.ts +2 -2
- package/dist/src/ide/ide-installer.js +15 -11
- package/dist/src/ide/ide-installer.js.map +1 -1
- package/dist/src/ide/ide-installer.test.js +30 -12
- package/dist/src/ide/ide-installer.test.js.map +1 -1
- package/dist/src/ide/ideContext.d.ts +35 -365
- package/dist/src/ide/ideContext.js +60 -106
- package/dist/src/ide/ideContext.js.map +1 -1
- package/dist/src/ide/ideContext.test.js +152 -24
- package/dist/src/ide/ideContext.test.js.map +1 -1
- package/dist/src/ide/process-utils.d.ts +0 -1
- package/dist/src/ide/process-utils.js +43 -25
- package/dist/src/ide/process-utils.js.map +1 -1
- package/dist/src/ide/process-utils.test.js +90 -4
- package/dist/src/ide/process-utils.test.js.map +1 -1
- package/dist/src/ide/types.d.ts +486 -0
- package/dist/src/ide/types.js +138 -0
- package/dist/src/ide/types.js.map +1 -0
- package/dist/src/index.d.ts +10 -2
- package/dist/src/index.js +11 -2
- package/dist/src/index.js.map +1 -1
- package/dist/src/mcp/oauth-provider.d.ts +15 -12
- package/dist/src/mcp/oauth-provider.js +63 -56
- package/dist/src/mcp/oauth-provider.js.map +1 -1
- package/dist/src/mcp/oauth-provider.test.js +74 -35
- package/dist/src/mcp/oauth-provider.test.js.map +1 -1
- package/dist/src/mcp/oauth-token-storage.d.ts +14 -10
- package/dist/src/mcp/oauth-token-storage.js +52 -20
- package/dist/src/mcp/oauth-token-storage.js.map +1 -1
- package/dist/src/mcp/oauth-token-storage.test.js +255 -162
- package/dist/src/mcp/oauth-token-storage.test.js.map +1 -1
- package/dist/src/mcp/token-storage/base-token-storage.d.ts +1 -1
- package/dist/src/mcp/token-storage/base-token-storage.js +1 -1
- package/dist/src/mcp/token-storage/base-token-storage.js.map +1 -1
- package/dist/src/mcp/token-storage/base-token-storage.test.js +1 -1
- package/dist/src/mcp/token-storage/base-token-storage.test.js.map +1 -1
- package/dist/src/mcp/token-storage/file-token-storage.d.ts +24 -0
- package/dist/src/mcp/token-storage/file-token-storage.js +144 -0
- package/dist/src/mcp/token-storage/file-token-storage.js.map +1 -0
- package/dist/src/mcp/token-storage/file-token-storage.test.d.ts +6 -0
- package/dist/src/mcp/token-storage/file-token-storage.test.js +235 -0
- package/dist/src/mcp/token-storage/file-token-storage.test.js.map +1 -0
- package/dist/src/mcp/token-storage/hybrid-token-storage.d.ts +23 -0
- package/dist/src/mcp/token-storage/hybrid-token-storage.js +78 -0
- package/dist/src/mcp/token-storage/hybrid-token-storage.js.map +1 -0
- package/dist/src/mcp/token-storage/hybrid-token-storage.test.d.ts +6 -0
- package/dist/src/mcp/token-storage/hybrid-token-storage.test.js +193 -0
- package/dist/src/mcp/token-storage/hybrid-token-storage.test.js.map +1 -0
- package/dist/src/mcp/token-storage/index.d.ts +11 -0
- package/dist/src/mcp/token-storage/index.js +12 -0
- package/dist/src/mcp/token-storage/index.js.map +1 -0
- package/dist/src/mcp/token-storage/keychain-token-storage.d.ts +31 -0
- package/dist/src/mcp/token-storage/keychain-token-storage.js +190 -0
- package/dist/src/mcp/token-storage/keychain-token-storage.js.map +1 -0
- package/dist/src/mcp/token-storage/keychain-token-storage.test.d.ts +6 -0
- package/dist/src/mcp/token-storage/keychain-token-storage.test.js +254 -0
- package/dist/src/mcp/token-storage/keychain-token-storage.test.js.map +1 -0
- package/dist/src/mcp/token-storage/types.d.ts +4 -0
- package/dist/src/mcp/token-storage/types.js +5 -1
- package/dist/src/mcp/token-storage/types.js.map +1 -1
- package/dist/src/output/json-formatter.d.ts +11 -0
- package/dist/src/output/json-formatter.js +30 -0
- package/dist/src/output/json-formatter.js.map +1 -0
- package/dist/src/output/json-formatter.test.d.ts +6 -0
- package/dist/src/output/json-formatter.test.js +266 -0
- package/dist/src/output/json-formatter.test.js.map +1 -0
- package/dist/src/output/types.d.ts +20 -0
- package/dist/src/output/types.js +11 -0
- package/dist/src/output/types.js.map +1 -0
- package/dist/src/policy/index.d.ts +7 -0
- package/dist/src/policy/index.js +8 -0
- package/dist/src/policy/index.js.map +1 -0
- package/dist/src/policy/policy-engine.d.ts +30 -0
- package/dist/src/policy/policy-engine.js +92 -0
- package/dist/src/policy/policy-engine.js.map +1 -0
- package/dist/src/policy/policy-engine.test.d.ts +6 -0
- package/dist/src/policy/policy-engine.test.js +515 -0
- package/dist/src/policy/policy-engine.test.js.map +1 -0
- package/dist/src/policy/stable-stringify.d.ts +58 -0
- package/dist/src/policy/stable-stringify.js +122 -0
- package/dist/src/policy/stable-stringify.js.map +1 -0
- package/dist/src/policy/types.d.ts +47 -0
- package/dist/src/policy/types.js +12 -0
- package/dist/src/policy/types.js.map +1 -0
- package/dist/src/routing/modelRouterService.d.ts +23 -0
- package/dist/src/routing/modelRouterService.js +70 -0
- package/dist/src/routing/modelRouterService.js.map +1 -0
- package/dist/src/routing/modelRouterService.test.d.ts +6 -0
- package/dist/src/routing/modelRouterService.test.js +98 -0
- package/dist/src/routing/modelRouterService.test.js.map +1 -0
- package/dist/src/routing/routingStrategy.d.ts +62 -0
- package/dist/src/routing/routingStrategy.js +7 -0
- package/dist/src/routing/routingStrategy.js.map +1 -0
- package/dist/src/routing/strategies/classifierStrategy.d.ts +12 -0
- package/dist/src/routing/strategies/classifierStrategy.js +173 -0
- package/dist/src/routing/strategies/classifierStrategy.js.map +1 -0
- package/dist/src/routing/strategies/classifierStrategy.test.d.ts +6 -0
- package/dist/src/routing/strategies/classifierStrategy.test.js +192 -0
- package/dist/src/routing/strategies/classifierStrategy.test.js.map +1 -0
- package/dist/src/routing/strategies/compositeStrategy.d.ts +26 -0
- package/dist/src/routing/strategies/compositeStrategy.js +67 -0
- package/dist/src/routing/strategies/compositeStrategy.js.map +1 -0
- package/dist/src/routing/strategies/compositeStrategy.test.d.ts +6 -0
- package/dist/src/routing/strategies/compositeStrategy.test.js +123 -0
- package/dist/src/routing/strategies/compositeStrategy.test.js.map +1 -0
- package/dist/src/routing/strategies/defaultStrategy.d.ts +12 -0
- package/dist/src/routing/strategies/defaultStrategy.js +20 -0
- package/dist/src/routing/strategies/defaultStrategy.js.map +1 -0
- package/dist/src/routing/strategies/defaultStrategy.test.d.ts +6 -0
- package/dist/src/routing/strategies/defaultStrategy.test.js +26 -0
- package/dist/src/routing/strategies/defaultStrategy.test.js.map +1 -0
- package/dist/src/routing/strategies/fallbackStrategy.d.ts +12 -0
- package/dist/src/routing/strategies/fallbackStrategy.js +25 -0
- package/dist/src/routing/strategies/fallbackStrategy.js.map +1 -0
- package/dist/src/routing/strategies/fallbackStrategy.test.d.ts +6 -0
- package/dist/src/routing/strategies/fallbackStrategy.test.js +55 -0
- package/dist/src/routing/strategies/fallbackStrategy.test.js.map +1 -0
- package/dist/src/routing/strategies/overrideStrategy.d.ts +15 -0
- package/dist/src/routing/strategies/overrideStrategy.js +28 -0
- package/dist/src/routing/strategies/overrideStrategy.js.map +1 -0
- package/dist/src/routing/strategies/overrideStrategy.test.d.ts +6 -0
- package/dist/src/routing/strategies/overrideStrategy.test.js +42 -0
- package/dist/src/routing/strategies/overrideStrategy.test.js.map +1 -0
- package/dist/src/services/chatRecordingService.d.ts +7 -13
- package/dist/src/services/chatRecordingService.js +28 -19
- package/dist/src/services/chatRecordingService.js.map +1 -1
- package/dist/src/services/chatRecordingService.test.js +62 -20
- package/dist/src/services/chatRecordingService.test.js.map +1 -1
- package/dist/src/services/fileDiscoveryService.d.ts +10 -0
- package/dist/src/services/fileDiscoveryService.js +31 -17
- package/dist/src/services/fileDiscoveryService.js.map +1 -1
- package/dist/src/services/gitService.js +9 -12
- package/dist/src/services/gitService.js.map +1 -1
- package/dist/src/services/gitService.test.js +10 -20
- package/dist/src/services/gitService.test.js.map +1 -1
- package/dist/src/services/loopDetectionService.d.ts +5 -0
- package/dist/src/services/loopDetectionService.js +36 -20
- package/dist/src/services/loopDetectionService.js.map +1 -1
- package/dist/src/services/loopDetectionService.test.js +41 -12
- package/dist/src/services/loopDetectionService.test.js.map +1 -1
- package/dist/src/services/shellExecutionService.d.ts +34 -2
- package/dist/src/services/shellExecutionService.js +192 -43
- package/dist/src/services/shellExecutionService.js.map +1 -1
- package/dist/src/services/shellExecutionService.test.js +184 -55
- package/dist/src/services/shellExecutionService.test.js.map +1 -1
- package/dist/src/telemetry/activity-detector.d.ts +41 -0
- package/dist/src/telemetry/activity-detector.js +61 -0
- package/dist/src/telemetry/activity-detector.js.map +1 -0
- package/dist/src/telemetry/activity-detector.test.d.ts +6 -0
- package/dist/src/telemetry/activity-detector.test.js +136 -0
- package/dist/src/telemetry/activity-detector.test.js.map +1 -0
- package/dist/src/telemetry/activity-types.d.ts +19 -0
- package/dist/src/telemetry/activity-types.js +21 -0
- package/dist/src/telemetry/activity-types.js.map +1 -0
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.d.ts +16 -2
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +143 -24
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js +101 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.d.ts +19 -2
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js +48 -2
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js.map +1 -1
- package/dist/src/telemetry/constants.d.ts +8 -0
- package/dist/src/telemetry/constants.js +8 -0
- package/dist/src/telemetry/constants.js.map +1 -1
- package/dist/src/telemetry/gcp-exporters.d.ts +34 -0
- package/dist/src/telemetry/gcp-exporters.js +117 -0
- package/dist/src/telemetry/gcp-exporters.js.map +1 -0
- package/dist/src/telemetry/gcp-exporters.test.d.ts +6 -0
- package/dist/src/telemetry/gcp-exporters.test.js +318 -0
- package/dist/src/telemetry/gcp-exporters.test.js.map +1 -0
- package/dist/src/telemetry/high-water-mark-tracker.d.ts +43 -0
- package/dist/src/telemetry/high-water-mark-tracker.js +88 -0
- package/dist/src/telemetry/high-water-mark-tracker.js.map +1 -0
- package/dist/src/telemetry/high-water-mark-tracker.test.d.ts +6 -0
- package/dist/src/telemetry/high-water-mark-tracker.test.js +152 -0
- package/dist/src/telemetry/high-water-mark-tracker.test.js.map +1 -0
- package/dist/src/telemetry/index.d.ts +7 -2
- package/dist/src/telemetry/index.js +7 -2
- package/dist/src/telemetry/index.js.map +1 -1
- package/dist/src/telemetry/loggers.d.ts +8 -1
- package/dist/src/telemetry/loggers.js +140 -8
- package/dist/src/telemetry/loggers.js.map +1 -1
- package/dist/src/telemetry/loggers.test.js +268 -39
- package/dist/src/telemetry/loggers.test.js.map +1 -1
- package/dist/src/telemetry/metrics.d.ts +4 -3
- package/dist/src/telemetry/metrics.js +33 -10
- package/dist/src/telemetry/metrics.js.map +1 -1
- package/dist/src/telemetry/metrics.test.js +47 -25
- package/dist/src/telemetry/metrics.test.js.map +1 -1
- package/dist/src/telemetry/rate-limiter.d.ts +48 -0
- package/dist/src/telemetry/rate-limiter.js +100 -0
- package/dist/src/telemetry/rate-limiter.js.map +1 -0
- package/dist/src/telemetry/rate-limiter.test.d.ts +6 -0
- package/dist/src/telemetry/rate-limiter.test.js +207 -0
- package/dist/src/telemetry/rate-limiter.test.js.map +1 -0
- package/dist/src/telemetry/sdk.js +16 -1
- package/dist/src/telemetry/sdk.js.map +1 -1
- package/dist/src/telemetry/sdk.test.js +95 -0
- package/dist/src/telemetry/sdk.test.js.map +1 -1
- package/dist/src/telemetry/types.d.ts +70 -6
- package/dist/src/telemetry/types.js +112 -8
- package/dist/src/telemetry/types.js.map +1 -1
- package/dist/src/telemetry/uiTelemetry.d.ts +1 -1
- package/dist/src/telemetry/uiTelemetry.js +6 -7
- package/dist/src/telemetry/uiTelemetry.js.map +1 -1
- package/dist/src/telemetry/uiTelemetry.test.js +15 -15
- package/dist/src/telemetry/uiTelemetry.test.js.map +1 -1
- package/dist/src/test-utils/index.d.ts +6 -0
- package/dist/src/test-utils/index.js +7 -0
- package/dist/src/test-utils/index.js.map +1 -0
- package/dist/src/test-utils/mock-tool.d.ts +41 -0
- package/dist/src/test-utils/mock-tool.js +51 -0
- package/dist/src/test-utils/mock-tool.js.map +1 -0
- package/dist/src/tools/diffOptions.js +21 -13
- package/dist/src/tools/diffOptions.js.map +1 -1
- package/dist/src/tools/diffOptions.test.js +58 -22
- package/dist/src/tools/diffOptions.test.js.map +1 -1
- package/dist/src/tools/edit.d.ts +2 -2
- package/dist/src/tools/edit.js +35 -44
- package/dist/src/tools/edit.js.map +1 -1
- package/dist/src/tools/edit.test.js +124 -13
- package/dist/src/tools/edit.test.js.map +1 -1
- package/dist/src/tools/glob.d.ts +5 -1
- package/dist/src/tools/glob.js +24 -17
- package/dist/src/tools/glob.js.map +1 -1
- package/dist/src/tools/glob.test.js +51 -0
- package/dist/src/tools/glob.test.js.map +1 -1
- package/dist/src/tools/ls.js +19 -32
- package/dist/src/tools/ls.js.map +1 -1
- package/dist/src/tools/ls.test.js +140 -280
- package/dist/src/tools/ls.test.js.map +1 -1
- package/dist/src/tools/mcp-client-manager.d.ts +5 -3
- package/dist/src/tools/mcp-client-manager.js +13 -4
- package/dist/src/tools/mcp-client-manager.js.map +1 -1
- package/dist/src/tools/mcp-client-manager.test.js +20 -1
- package/dist/src/tools/mcp-client-manager.test.js.map +1 -1
- package/dist/src/tools/mcp-client.d.ts +5 -5
- package/dist/src/tools/mcp-client.js +40 -35
- package/dist/src/tools/mcp-client.js.map +1 -1
- package/dist/src/tools/mcp-client.test.js +3 -3
- package/dist/src/tools/mcp-client.test.js.map +1 -1
- package/dist/src/tools/mcp-tool.d.ts +3 -2
- package/dist/src/tools/mcp-tool.js +9 -9
- package/dist/src/tools/mcp-tool.js.map +1 -1
- package/dist/src/tools/mcp-tool.test.js +28 -7
- package/dist/src/tools/mcp-tool.test.js.map +1 -1
- package/dist/src/tools/memoryTool.js +5 -33
- package/dist/src/tools/memoryTool.js.map +1 -1
- package/dist/src/tools/read-file.js +8 -3
- package/dist/src/tools/read-file.js.map +1 -1
- package/dist/src/tools/read-file.test.js +29 -0
- package/dist/src/tools/read-file.test.js.map +1 -1
- package/dist/src/tools/read-many-files.d.ts +1 -1
- package/dist/src/tools/read-many-files.js +18 -50
- package/dist/src/tools/read-many-files.js.map +1 -1
- package/dist/src/tools/read-many-files.test.js +4 -4
- package/dist/src/tools/read-many-files.test.js.map +1 -1
- package/dist/src/tools/ripGrep.d.ts +8 -0
- package/dist/src/tools/ripGrep.js +26 -1
- package/dist/src/tools/ripGrep.js.map +1 -1
- package/dist/src/tools/ripGrep.test.js +107 -5
- package/dist/src/tools/ripGrep.test.js.map +1 -1
- package/dist/src/tools/shell.d.ts +12 -2
- package/dist/src/tools/shell.js +20 -24
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/shell.test.js +35 -70
- package/dist/src/tools/shell.test.js.map +1 -1
- package/dist/src/tools/smart-edit.d.ts +72 -0
- package/dist/src/tools/smart-edit.js +594 -0
- package/dist/src/tools/smart-edit.js.map +1 -0
- package/dist/src/tools/smart-edit.test.d.ts +6 -0
- package/dist/src/tools/smart-edit.test.js +419 -0
- package/dist/src/tools/smart-edit.test.js.map +1 -0
- package/dist/src/tools/tool-registry.d.ts +2 -1
- package/dist/src/tools/tool-registry.js +6 -5
- package/dist/src/tools/tool-registry.js.map +1 -1
- package/dist/src/tools/tools.d.ts +14 -7
- package/dist/src/tools/tools.js +9 -2
- package/dist/src/tools/tools.js.map +1 -1
- package/dist/src/tools/web-fetch.js +4 -3
- package/dist/src/tools/web-fetch.js.map +1 -1
- package/dist/src/tools/web-search.d.ts +1 -1
- package/dist/src/tools/web-search.js +3 -1
- package/dist/src/tools/web-search.js.map +1 -1
- package/dist/src/tools/write-file.js +14 -19
- package/dist/src/tools/write-file.js.map +1 -1
- package/dist/src/tools/write-file.test.js +99 -19
- package/dist/src/tools/write-file.test.js.map +1 -1
- package/dist/src/utils/bfsFileSearch.js +11 -5
- package/dist/src/utils/bfsFileSearch.js.map +1 -1
- package/dist/src/utils/editCorrector.d.ts +7 -6
- package/dist/src/utils/editCorrector.js +61 -18
- package/dist/src/utils/editCorrector.js.map +1 -1
- package/dist/src/utils/editCorrector.test.js +30 -79
- package/dist/src/utils/editCorrector.test.js.map +1 -1
- package/dist/src/utils/editor.js +31 -44
- package/dist/src/utils/editor.js.map +1 -1
- package/dist/src/utils/editor.test.js +61 -75
- package/dist/src/utils/editor.test.js.map +1 -1
- package/dist/src/utils/errorParsing.js +2 -2
- package/dist/src/utils/errorParsing.js.map +1 -1
- package/dist/src/utils/errorParsing.test.js +7 -7
- package/dist/src/utils/errorParsing.test.js.map +1 -1
- package/dist/src/utils/errors.d.ts +6 -0
- package/dist/src/utils/errors.js +10 -0
- package/dist/src/utils/errors.js.map +1 -1
- package/dist/src/utils/fileUtils.d.ts +20 -3
- package/dist/src/utils/fileUtils.js +154 -32
- package/dist/src/utils/fileUtils.js.map +1 -1
- package/dist/src/utils/fileUtils.test.js +347 -29
- package/dist/src/utils/fileUtils.test.js.map +1 -1
- package/dist/src/utils/flashFallback.test.d.ts +6 -0
- package/dist/src/utils/{flashFallback.integration.test.js → flashFallback.test.js} +31 -27
- package/dist/src/utils/flashFallback.test.js.map +1 -0
- package/dist/src/utils/geminiIgnoreParser.d.ts +18 -0
- package/dist/src/utils/geminiIgnoreParser.js +61 -0
- package/dist/src/utils/geminiIgnoreParser.js.map +1 -0
- package/dist/src/utils/geminiIgnoreParser.test.d.ts +6 -0
- package/dist/src/utils/geminiIgnoreParser.test.js +50 -0
- package/dist/src/utils/geminiIgnoreParser.test.js.map +1 -0
- package/dist/src/utils/gitIgnoreParser.d.ts +3 -7
- package/dist/src/utils/gitIgnoreParser.js +125 -34
- package/dist/src/utils/gitIgnoreParser.js.map +1 -1
- package/dist/src/utils/gitIgnoreParser.test.js +66 -35
- package/dist/src/utils/gitIgnoreParser.test.js.map +1 -1
- package/dist/src/utils/llm-edit-fixer.d.ts +26 -0
- package/dist/src/utils/llm-edit-fixer.js +121 -0
- package/dist/src/utils/llm-edit-fixer.js.map +1 -0
- package/dist/src/utils/llm-edit-fixer.test.d.ts +6 -0
- package/dist/src/utils/llm-edit-fixer.test.js +105 -0
- package/dist/src/utils/llm-edit-fixer.test.js.map +1 -0
- package/dist/src/utils/memoryDiscovery.d.ts +5 -4
- package/dist/src/utils/memoryDiscovery.js +10 -9
- package/dist/src/utils/memoryDiscovery.js.map +1 -1
- package/dist/src/utils/memoryDiscovery.test.js +50 -25
- package/dist/src/utils/memoryDiscovery.test.js.map +1 -1
- package/dist/src/utils/nextSpeakerChecker.d.ts +2 -2
- package/dist/src/utils/nextSpeakerChecker.js +8 -2
- package/dist/src/utils/nextSpeakerChecker.js.map +1 -1
- package/dist/src/utils/nextSpeakerChecker.test.js +75 -64
- package/dist/src/utils/nextSpeakerChecker.test.js.map +1 -1
- package/dist/src/utils/promptIdContext.d.ts +7 -0
- package/dist/src/utils/promptIdContext.js +8 -0
- package/dist/src/utils/promptIdContext.js.map +1 -0
- package/dist/src/utils/shell-utils.d.ts +5 -0
- package/dist/src/utils/shell-utils.js +23 -0
- package/dist/src/utils/shell-utils.js.map +1 -1
- package/dist/src/utils/terminalSerializer.d.ts +28 -0
- package/dist/src/utils/terminalSerializer.js +432 -0
- package/dist/src/utils/terminalSerializer.js.map +1 -0
- package/dist/src/utils/terminalSerializer.test.d.ts +6 -0
- package/dist/src/utils/terminalSerializer.test.js +176 -0
- package/dist/src/utils/terminalSerializer.test.js.map +1 -0
- package/dist/src/utils/textUtils.d.ts +5 -0
- package/dist/src/utils/textUtils.js +14 -0
- package/dist/src/utils/textUtils.js.map +1 -1
- package/dist/src/utils/textUtils.test.d.ts +6 -0
- package/dist/src/utils/textUtils.test.js +59 -0
- package/dist/src/utils/textUtils.test.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +9 -3
- package/dist/google-gemini-cli-core-0.3.0-preview.3.tgz +0 -0
- package/dist/src/utils/flashFallback.integration.test.js.map +0 -1
- /package/dist/src/{utils/flashFallback.integration.test.d.ts → code_assist/oauth-credential-storage.test.d.ts} +0 -0
|
@@ -0,0 +1,207 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { describe, it, expect, beforeEach, vi } from 'vitest';
|
|
7
|
+
import { RateLimiter } from './rate-limiter.js';
|
|
8
|
+
describe('RateLimiter', () => {
|
|
9
|
+
let rateLimiter;
|
|
10
|
+
beforeEach(() => {
|
|
11
|
+
rateLimiter = new RateLimiter(1000); // 1 second interval for testing
|
|
12
|
+
});
|
|
13
|
+
describe('constructor', () => {
|
|
14
|
+
it('should initialize with default interval', () => {
|
|
15
|
+
const defaultLimiter = new RateLimiter();
|
|
16
|
+
expect(defaultLimiter).toBeInstanceOf(RateLimiter);
|
|
17
|
+
});
|
|
18
|
+
it('should initialize with custom interval', () => {
|
|
19
|
+
const customLimiter = new RateLimiter(5000);
|
|
20
|
+
expect(customLimiter).toBeInstanceOf(RateLimiter);
|
|
21
|
+
});
|
|
22
|
+
it('should throw on negative interval', () => {
|
|
23
|
+
expect(() => new RateLimiter(-1)).toThrow('minIntervalMs must be non-negative.');
|
|
24
|
+
});
|
|
25
|
+
});
|
|
26
|
+
describe('shouldRecord', () => {
|
|
27
|
+
it('should allow first recording', () => {
|
|
28
|
+
const result = rateLimiter.shouldRecord('test_metric');
|
|
29
|
+
expect(result).toBe(true);
|
|
30
|
+
});
|
|
31
|
+
it('should block immediate subsequent recordings', () => {
|
|
32
|
+
rateLimiter.shouldRecord('test_metric'); // First call
|
|
33
|
+
const result = rateLimiter.shouldRecord('test_metric'); // Immediate second call
|
|
34
|
+
expect(result).toBe(false);
|
|
35
|
+
});
|
|
36
|
+
it('should allow recording after interval', () => {
|
|
37
|
+
vi.useFakeTimers();
|
|
38
|
+
rateLimiter.shouldRecord('test_metric'); // First call
|
|
39
|
+
// Advance time past interval
|
|
40
|
+
vi.advanceTimersByTime(1500);
|
|
41
|
+
const result = rateLimiter.shouldRecord('test_metric');
|
|
42
|
+
expect(result).toBe(true);
|
|
43
|
+
vi.useRealTimers();
|
|
44
|
+
});
|
|
45
|
+
it('should handle different metric keys independently', () => {
|
|
46
|
+
rateLimiter.shouldRecord('metric_a'); // First call for metric_a
|
|
47
|
+
const resultA = rateLimiter.shouldRecord('metric_a'); // Second call for metric_a
|
|
48
|
+
const resultB = rateLimiter.shouldRecord('metric_b'); // First call for metric_b
|
|
49
|
+
expect(resultA).toBe(false); // Should be blocked
|
|
50
|
+
expect(resultB).toBe(true); // Should be allowed
|
|
51
|
+
});
|
|
52
|
+
it('should use shorter interval for high priority events', () => {
|
|
53
|
+
vi.useFakeTimers();
|
|
54
|
+
rateLimiter.shouldRecord('test_metric', true); // High priority
|
|
55
|
+
// Advance time by half the normal interval
|
|
56
|
+
vi.advanceTimersByTime(500);
|
|
57
|
+
const result = rateLimiter.shouldRecord('test_metric', true);
|
|
58
|
+
expect(result).toBe(true); // Should be allowed due to high priority
|
|
59
|
+
vi.useRealTimers();
|
|
60
|
+
});
|
|
61
|
+
it('should still block high priority events if interval not met', () => {
|
|
62
|
+
vi.useFakeTimers();
|
|
63
|
+
rateLimiter.shouldRecord('test_metric', true); // High priority
|
|
64
|
+
// Advance time by less than half interval
|
|
65
|
+
vi.advanceTimersByTime(300);
|
|
66
|
+
const result = rateLimiter.shouldRecord('test_metric', true);
|
|
67
|
+
expect(result).toBe(false); // Should still be blocked
|
|
68
|
+
vi.useRealTimers();
|
|
69
|
+
});
|
|
70
|
+
});
|
|
71
|
+
describe('forceRecord', () => {
|
|
72
|
+
it('should update last record time', () => {
|
|
73
|
+
const before = rateLimiter.getTimeUntilNextAllowed('test_metric');
|
|
74
|
+
rateLimiter.forceRecord('test_metric');
|
|
75
|
+
const after = rateLimiter.getTimeUntilNextAllowed('test_metric');
|
|
76
|
+
expect(after).toBeGreaterThan(before);
|
|
77
|
+
});
|
|
78
|
+
it('should block subsequent recordings after force record', () => {
|
|
79
|
+
rateLimiter.forceRecord('test_metric');
|
|
80
|
+
const result = rateLimiter.shouldRecord('test_metric');
|
|
81
|
+
expect(result).toBe(false);
|
|
82
|
+
});
|
|
83
|
+
});
|
|
84
|
+
describe('getTimeUntilNextAllowed', () => {
|
|
85
|
+
it('should return 0 for new metric', () => {
|
|
86
|
+
const time = rateLimiter.getTimeUntilNextAllowed('new_metric');
|
|
87
|
+
expect(time).toBe(0);
|
|
88
|
+
});
|
|
89
|
+
it('should return correct time after recording', () => {
|
|
90
|
+
vi.useFakeTimers();
|
|
91
|
+
rateLimiter.shouldRecord('test_metric');
|
|
92
|
+
// Advance time partially
|
|
93
|
+
vi.advanceTimersByTime(300);
|
|
94
|
+
const timeRemaining = rateLimiter.getTimeUntilNextAllowed('test_metric');
|
|
95
|
+
expect(timeRemaining).toBeCloseTo(700, -1); // Approximately 700ms remaining
|
|
96
|
+
vi.useRealTimers();
|
|
97
|
+
});
|
|
98
|
+
it('should return 0 after interval has passed', () => {
|
|
99
|
+
vi.useFakeTimers();
|
|
100
|
+
rateLimiter.shouldRecord('test_metric');
|
|
101
|
+
// Advance time past interval
|
|
102
|
+
vi.advanceTimersByTime(1500);
|
|
103
|
+
const timeRemaining = rateLimiter.getTimeUntilNextAllowed('test_metric');
|
|
104
|
+
expect(timeRemaining).toBe(0);
|
|
105
|
+
vi.useRealTimers();
|
|
106
|
+
});
|
|
107
|
+
it('should account for high priority interval', () => {
|
|
108
|
+
vi.useFakeTimers();
|
|
109
|
+
rateLimiter.shouldRecord('hp_metric', true);
|
|
110
|
+
// After 300ms, with 1000ms base interval, half rounded is 500ms
|
|
111
|
+
vi.advanceTimersByTime(300);
|
|
112
|
+
const timeRemaining = rateLimiter.getTimeUntilNextAllowed('hp_metric', true);
|
|
113
|
+
expect(timeRemaining).toBeCloseTo(200, -1);
|
|
114
|
+
vi.useRealTimers();
|
|
115
|
+
});
|
|
116
|
+
});
|
|
117
|
+
describe('getStats', () => {
|
|
118
|
+
it('should return empty stats initially', () => {
|
|
119
|
+
const stats = rateLimiter.getStats();
|
|
120
|
+
expect(stats).toEqual({
|
|
121
|
+
totalMetrics: 0,
|
|
122
|
+
oldestRecord: 0,
|
|
123
|
+
newestRecord: 0,
|
|
124
|
+
averageInterval: 0,
|
|
125
|
+
});
|
|
126
|
+
});
|
|
127
|
+
it('should return correct stats after recordings', () => {
|
|
128
|
+
vi.useFakeTimers();
|
|
129
|
+
rateLimiter.shouldRecord('metric_a');
|
|
130
|
+
vi.advanceTimersByTime(500);
|
|
131
|
+
rateLimiter.shouldRecord('metric_b');
|
|
132
|
+
vi.advanceTimersByTime(500);
|
|
133
|
+
rateLimiter.shouldRecord('metric_c');
|
|
134
|
+
const stats = rateLimiter.getStats();
|
|
135
|
+
expect(stats.totalMetrics).toBe(3);
|
|
136
|
+
expect(stats.averageInterval).toBeCloseTo(500, -1);
|
|
137
|
+
vi.useRealTimers();
|
|
138
|
+
});
|
|
139
|
+
it('should handle single recording correctly', () => {
|
|
140
|
+
rateLimiter.shouldRecord('test_metric');
|
|
141
|
+
const stats = rateLimiter.getStats();
|
|
142
|
+
expect(stats.totalMetrics).toBe(1);
|
|
143
|
+
expect(stats.averageInterval).toBe(0);
|
|
144
|
+
});
|
|
145
|
+
});
|
|
146
|
+
describe('reset', () => {
|
|
147
|
+
it('should clear all rate limiting state', () => {
|
|
148
|
+
rateLimiter.shouldRecord('metric_a');
|
|
149
|
+
rateLimiter.shouldRecord('metric_b');
|
|
150
|
+
rateLimiter.reset();
|
|
151
|
+
const stats = rateLimiter.getStats();
|
|
152
|
+
expect(stats.totalMetrics).toBe(0);
|
|
153
|
+
// Should allow immediate recording after reset
|
|
154
|
+
const result = rateLimiter.shouldRecord('metric_a');
|
|
155
|
+
expect(result).toBe(true);
|
|
156
|
+
});
|
|
157
|
+
});
|
|
158
|
+
describe('cleanup', () => {
|
|
159
|
+
it('should remove old entries', () => {
|
|
160
|
+
vi.useFakeTimers();
|
|
161
|
+
rateLimiter.shouldRecord('old_metric');
|
|
162
|
+
// Advance time beyond cleanup threshold
|
|
163
|
+
vi.advanceTimersByTime(4000000); // More than 1 hour
|
|
164
|
+
rateLimiter.cleanup(3600000); // 1 hour cleanup
|
|
165
|
+
// Should allow immediate recording of old metric after cleanup
|
|
166
|
+
const result = rateLimiter.shouldRecord('old_metric');
|
|
167
|
+
expect(result).toBe(true);
|
|
168
|
+
vi.useRealTimers();
|
|
169
|
+
});
|
|
170
|
+
it('should preserve recent entries', () => {
|
|
171
|
+
vi.useFakeTimers();
|
|
172
|
+
rateLimiter.shouldRecord('recent_metric');
|
|
173
|
+
// Advance time but not beyond cleanup threshold
|
|
174
|
+
vi.advanceTimersByTime(1800000); // 30 minutes
|
|
175
|
+
rateLimiter.cleanup(3600000); // 1 hour cleanup
|
|
176
|
+
// Should no longer be rate limited after 30 minutes (way past 1 minute default interval)
|
|
177
|
+
const result = rateLimiter.shouldRecord('recent_metric');
|
|
178
|
+
expect(result).toBe(true);
|
|
179
|
+
vi.useRealTimers();
|
|
180
|
+
});
|
|
181
|
+
it('should use default cleanup age', () => {
|
|
182
|
+
vi.useFakeTimers();
|
|
183
|
+
rateLimiter.shouldRecord('test_metric');
|
|
184
|
+
// Advance time beyond default cleanup (1 hour)
|
|
185
|
+
vi.advanceTimersByTime(4000000);
|
|
186
|
+
rateLimiter.cleanup(); // Use default age
|
|
187
|
+
const result = rateLimiter.shouldRecord('test_metric');
|
|
188
|
+
expect(result).toBe(true);
|
|
189
|
+
vi.useRealTimers();
|
|
190
|
+
});
|
|
191
|
+
});
|
|
192
|
+
describe('edge cases', () => {
|
|
193
|
+
it('should handle zero interval', () => {
|
|
194
|
+
const zeroLimiter = new RateLimiter(0);
|
|
195
|
+
zeroLimiter.shouldRecord('test_metric');
|
|
196
|
+
const result = zeroLimiter.shouldRecord('test_metric');
|
|
197
|
+
expect(result).toBe(true); // Should allow with zero interval
|
|
198
|
+
});
|
|
199
|
+
it('should handle very large intervals', () => {
|
|
200
|
+
const longLimiter = new RateLimiter(Number.MAX_SAFE_INTEGER);
|
|
201
|
+
longLimiter.shouldRecord('test_metric');
|
|
202
|
+
const timeRemaining = longLimiter.getTimeUntilNextAllowed('test_metric');
|
|
203
|
+
expect(timeRemaining).toBeGreaterThan(1000000);
|
|
204
|
+
});
|
|
205
|
+
});
|
|
206
|
+
});
|
|
207
|
+
//# sourceMappingURL=rate-limiter.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rate-limiter.test.js","sourceRoot":"","sources":["../../../src/telemetry/rate-limiter.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,IAAI,WAAwB,CAAC;IAE7B,UAAU,CAAC,GAAG,EAAE;QACd,WAAW,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,gCAAgC;IACvE,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;QAC3B,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;YACjD,MAAM,cAAc,GAAG,IAAI,WAAW,EAAE,CAAC;YACzC,MAAM,CAAC,cAAc,CAAC,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;YAChD,MAAM,aAAa,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC;YAC5C,MAAM,CAAC,aAAa,CAAC,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;YAC3C,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CACvC,qCAAqC,CACtC,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;QAC5B,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;YACtC,MAAM,MAAM,GAAG,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;YACvD,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;YACtD,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa;YACtD,MAAM,MAAM,GAAG,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC,wBAAwB;YAChF,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;YAC/C,EAAE,CAAC,aAAa,EAAE,CAAC;YAEnB,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa;YAEtD,6BAA6B;YAC7B,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;YAE7B,MAAM,MAAM,GAAG,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;YACvD,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAE1B,EAAE,CAAC,aAAa,EAAE,CAAC;QACrB,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;YAC3D,WAAW,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,0BAA0B;YAEhE,MAAM,OAAO,GAAG,WAAW,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,2BAA2B;YACjF,MAAM,OAAO,GAAG,WAAW,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,0BAA0B;YAEhF,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,oBAAoB;YACjD,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,oBAAoB;QAClD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;YAC9D,EAAE,CAAC,aAAa,EAAE,CAAC;YAEnB,WAAW,CAAC,YAAY,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC,CAAC,gBAAgB;YAE/D,2CAA2C;YAC3C,EAAE,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;YAE5B,MAAM,MAAM,GAAG,WAAW,CAAC,YAAY,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;YAC7D,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,yCAAyC;YAEpE,EAAE,CAAC,aAAa,EAAE,CAAC;QACrB,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;YACrE,EAAE,CAAC,aAAa,EAAE,CAAC;YAEnB,WAAW,CAAC,YAAY,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC,CAAC,gBAAgB;YAE/D,0CAA0C;YAC1C,EAAE,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;YAE5B,MAAM,MAAM,GAAG,WAAW,CAAC,YAAY,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;YAC7D,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,0BAA0B;YAEtD,EAAE,CAAC,aAAa,EAAE,CAAC;QACrB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;QAC3B,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;YACxC,MAAM,MAAM,GAAG,WAAW,CAAC,uBAAuB,CAAC,aAAa,CAAC,CAAC;YAElE,WAAW,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;YAEvC,MAAM,KAAK,GAAG,WAAW,CAAC,uBAAuB,CAAC,aAAa,CAAC,CAAC;YACjE,MAAM,CAAC,KAAK,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;YAC/D,WAAW,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;YAEvC,MAAM,MAAM,GAAG,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;YACvD,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACvC,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;YACxC,MAAM,IAAI,GAAG,WAAW,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAC;YAC/D,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;YACpD,EAAE,CAAC,aAAa,EAAE,CAAC;YAEnB,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;YAExC,yBAAyB;YACzB,EAAE,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;YAE5B,MAAM,aAAa,GAAG,WAAW,CAAC,uBAAuB,CAAC,aAAa,CAAC,CAAC;YACzE,MAAM,CAAC,aAAa,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,gCAAgC;YAE5E,EAAE,CAAC,aAAa,EAAE,CAAC;QACrB,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;YACnD,EAAE,CAAC,aAAa,EAAE,CAAC;YAEnB,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;YAExC,6BAA6B;YAC7B,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;YAE7B,MAAM,aAAa,GAAG,WAAW,CAAC,uBAAuB,CAAC,aAAa,CAAC,CAAC;YACzE,MAAM,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAE9B,EAAE,CAAC,aAAa,EAAE,CAAC;QACrB,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;YACnD,EAAE,CAAC,aAAa,EAAE,CAAC;YAEnB,WAAW,CAAC,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;YAE5C,gEAAgE;YAChE,EAAE,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;YAE5B,MAAM,aAAa,GAAG,WAAW,CAAC,uBAAuB,CACvD,WAAW,EACX,IAAI,CACL,CAAC;YACF,MAAM,CAAC,aAAa,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;YAE3C,EAAE,CAAC,aAAa,EAAE,CAAC;QACrB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;QACxB,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;YAC7C,MAAM,KAAK,GAAG,WAAW,CAAC,QAAQ,EAAE,CAAC;YACrC,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC;gBACpB,YAAY,EAAE,CAAC;gBACf,YAAY,EAAE,CAAC;gBACf,YAAY,EAAE,CAAC;gBACf,eAAe,EAAE,CAAC;aACnB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;YACtD,EAAE,CAAC,aAAa,EAAE,CAAC;YAEnB,WAAW,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;YACrC,EAAE,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;YAC5B,WAAW,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;YACrC,EAAE,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;YAC5B,WAAW,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;YAErC,MAAM,KAAK,GAAG,WAAW,CAAC,QAAQ,EAAE,CAAC;YACrC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACnC,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;YAEnD,EAAE,CAAC,aAAa,EAAE,CAAC;QACrB,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;YAClD,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;YAExC,MAAM,KAAK,GAAG,WAAW,CAAC,QAAQ,EAAE,CAAC;YACrC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACnC,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE;QACrB,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;YAC9C,WAAW,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;YACrC,WAAW,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;YAErC,WAAW,CAAC,KAAK,EAAE,CAAC;YAEpB,MAAM,KAAK,GAAG,WAAW,CAAC,QAAQ,EAAE,CAAC;YACrC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAEnC,+CAA+C;YAC/C,MAAM,MAAM,GAAG,WAAW,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;YACpD,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;QACvB,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;YACnC,EAAE,CAAC,aAAa,EAAE,CAAC;YAEnB,WAAW,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;YAEvC,wCAAwC;YACxC,EAAE,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,mBAAmB;YAEpD,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,iBAAiB;YAE/C,+DAA+D;YAC/D,MAAM,MAAM,GAAG,WAAW,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;YACtD,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAE1B,EAAE,CAAC,aAAa,EAAE,CAAC;QACrB,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;YACxC,EAAE,CAAC,aAAa,EAAE,CAAC;YAEnB,WAAW,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;YAE1C,gDAAgD;YAChD,EAAE,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa;YAE9C,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,iBAAiB;YAE/C,yFAAyF;YACzF,MAAM,MAAM,GAAG,WAAW,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;YACzD,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAE1B,EAAE,CAAC,aAAa,EAAE,CAAC;QACrB,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;YACxC,EAAE,CAAC,aAAa,EAAE,CAAC;YAEnB,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;YAExC,+CAA+C;YAC/C,EAAE,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;YAEhC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,kBAAkB;YAEzC,MAAM,MAAM,GAAG,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;YACvD,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAE1B,EAAE,CAAC,aAAa,EAAE,CAAC;QACrB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;QAC1B,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;YACrC,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC;YAEvC,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;YACxC,MAAM,MAAM,GAAG,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;YAEvD,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,kCAAkC;QAC/D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;YAC5C,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;YAE7D,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;YACxC,MAAM,aAAa,GAAG,WAAW,CAAC,uBAAuB,CAAC,aAAa,CAAC,CAAC;YAEzE,MAAM,CAAC,aAAa,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -22,6 +22,8 @@ import { SERVICE_NAME } from './constants.js';
|
|
|
22
22
|
import { initializeMetrics } from './metrics.js';
|
|
23
23
|
import { ClearcutLogger } from './clearcut-logger/clearcut-logger.js';
|
|
24
24
|
import { FileLogExporter, FileMetricExporter, FileSpanExporter, } from './file-exporters.js';
|
|
25
|
+
import { GcpTraceExporter, GcpMetricExporter, GcpLogExporter, } from './gcp-exporters.js';
|
|
26
|
+
import { TelemetryTarget } from './index.js';
|
|
25
27
|
// For troubleshooting, set the log level to DiagLogLevel.DEBUG
|
|
26
28
|
diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.INFO);
|
|
27
29
|
let sdk;
|
|
@@ -61,13 +63,26 @@ export function initializeTelemetry(config) {
|
|
|
61
63
|
});
|
|
62
64
|
const otlpEndpoint = config.getTelemetryOtlpEndpoint();
|
|
63
65
|
const otlpProtocol = config.getTelemetryOtlpProtocol();
|
|
66
|
+
const telemetryTarget = config.getTelemetryTarget();
|
|
67
|
+
const useCollector = config.getTelemetryUseCollector();
|
|
64
68
|
const parsedEndpoint = parseOtlpEndpoint(otlpEndpoint, otlpProtocol);
|
|
65
69
|
const useOtlp = !!parsedEndpoint;
|
|
66
70
|
const telemetryOutfile = config.getTelemetryOutfile();
|
|
71
|
+
const gcpProjectId = process.env['OTLP_GOOGLE_CLOUD_PROJECT'] ||
|
|
72
|
+
process.env['GOOGLE_CLOUD_PROJECT'];
|
|
73
|
+
const useDirectGcpExport = telemetryTarget === TelemetryTarget.GCP && !!gcpProjectId && !useCollector;
|
|
67
74
|
let spanExporter;
|
|
68
75
|
let logExporter;
|
|
69
76
|
let metricReader;
|
|
70
|
-
if (
|
|
77
|
+
if (useDirectGcpExport) {
|
|
78
|
+
spanExporter = new GcpTraceExporter(gcpProjectId);
|
|
79
|
+
logExporter = new GcpLogExporter(gcpProjectId);
|
|
80
|
+
metricReader = new PeriodicExportingMetricReader({
|
|
81
|
+
exporter: new GcpMetricExporter(gcpProjectId),
|
|
82
|
+
exportIntervalMillis: 30000,
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
else if (useOtlp) {
|
|
71
86
|
if (otlpProtocol === 'http') {
|
|
72
87
|
spanExporter = new OTLPTraceExporterHttp({
|
|
73
88
|
url: parsedEndpoint,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sdk.js","sourceRoot":"","sources":["../../../src/telemetry/sdk.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAC/E,OAAO,EAAE,iBAAiB,IAAI,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AACrG,OAAO,EAAE,eAAe,IAAI,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAChG,OAAO,EAAE,kBAAkB,IAAI,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AACzG,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EACL,kBAAkB,EAClB,mBAAmB,GACpB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,uBAAuB,EACvB,wBAAwB,GACzB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,qBAAqB,EACrB,6BAA6B,GAC9B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAE1E,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,gBAAgB,GACjB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"sdk.js","sourceRoot":"","sources":["../../../src/telemetry/sdk.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,8 @@ import { OTLPTraceExporter as OTLPTraceExporterHttp } from '@opentelemetry/expor
|
|
|
12
12
|
import { OTLPLogExporter as OTLPLogExporterHttp } from '@opentelemetry/exporter-logs-otlp-http';
|
|
13
13
|
import { OTLPMetricExporter as OTLPMetricExporterHttp } from '@opentelemetry/exporter-metrics-otlp-http';
|
|
14
14
|
import { NodeSDK } from '@opentelemetry/sdk-node';
|
|
15
|
+
import { GcpTraceExporter, GcpLogExporter, GcpMetricExporter, } from './gcp-exporters.js';
|
|
16
|
+
import { TelemetryTarget } from './index.js';
|
|
15
17
|
vi.mock('@opentelemetry/exporter-trace-otlp-grpc');
|
|
16
18
|
vi.mock('@opentelemetry/exporter-logs-otlp-grpc');
|
|
17
19
|
vi.mock('@opentelemetry/exporter-metrics-otlp-grpc');
|
|
@@ -19,6 +21,7 @@ vi.mock('@opentelemetry/exporter-trace-otlp-http');
|
|
|
19
21
|
vi.mock('@opentelemetry/exporter-logs-otlp-http');
|
|
20
22
|
vi.mock('@opentelemetry/exporter-metrics-otlp-http');
|
|
21
23
|
vi.mock('@opentelemetry/sdk-node');
|
|
24
|
+
vi.mock('./gcp-exporters.js');
|
|
22
25
|
describe('Telemetry SDK', () => {
|
|
23
26
|
let mockConfig;
|
|
24
27
|
beforeEach(() => {
|
|
@@ -27,6 +30,8 @@ describe('Telemetry SDK', () => {
|
|
|
27
30
|
getTelemetryEnabled: () => true,
|
|
28
31
|
getTelemetryOtlpEndpoint: () => 'http://localhost:4317',
|
|
29
32
|
getTelemetryOtlpProtocol: () => 'grpc',
|
|
33
|
+
getTelemetryTarget: () => 'local',
|
|
34
|
+
getTelemetryUseCollector: () => false,
|
|
30
35
|
getTelemetryOutfile: () => undefined,
|
|
31
36
|
getDebugMode: () => false,
|
|
32
37
|
getSessionId: () => 'test-session',
|
|
@@ -78,5 +83,95 @@ describe('Telemetry SDK', () => {
|
|
|
78
83
|
initializeTelemetry(mockConfig);
|
|
79
84
|
expect(OTLPTraceExporterHttp).toHaveBeenCalledWith(expect.objectContaining({ url: 'https://my-collector.com/' }));
|
|
80
85
|
});
|
|
86
|
+
it('should use direct GCP exporters when target is gcp, project ID is set, and useCollector is false', () => {
|
|
87
|
+
vi.spyOn(mockConfig, 'getTelemetryTarget').mockReturnValue(TelemetryTarget.GCP);
|
|
88
|
+
vi.spyOn(mockConfig, 'getTelemetryUseCollector').mockReturnValue(false);
|
|
89
|
+
vi.spyOn(mockConfig, 'getTelemetryOtlpEndpoint').mockReturnValue('');
|
|
90
|
+
const originalEnv = process.env['OTLP_GOOGLE_CLOUD_PROJECT'];
|
|
91
|
+
process.env['OTLP_GOOGLE_CLOUD_PROJECT'] = 'test-project';
|
|
92
|
+
try {
|
|
93
|
+
initializeTelemetry(mockConfig);
|
|
94
|
+
expect(GcpTraceExporter).toHaveBeenCalledWith('test-project');
|
|
95
|
+
expect(GcpLogExporter).toHaveBeenCalledWith('test-project');
|
|
96
|
+
expect(GcpMetricExporter).toHaveBeenCalledWith('test-project');
|
|
97
|
+
expect(NodeSDK.prototype.start).toHaveBeenCalled();
|
|
98
|
+
}
|
|
99
|
+
finally {
|
|
100
|
+
if (originalEnv) {
|
|
101
|
+
process.env['OTLP_GOOGLE_CLOUD_PROJECT'] = originalEnv;
|
|
102
|
+
}
|
|
103
|
+
else {
|
|
104
|
+
delete process.env['OTLP_GOOGLE_CLOUD_PROJECT'];
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
});
|
|
108
|
+
it('should use OTLP exporters when target is gcp but useCollector is true', () => {
|
|
109
|
+
vi.spyOn(mockConfig, 'getTelemetryTarget').mockReturnValue(TelemetryTarget.GCP);
|
|
110
|
+
vi.spyOn(mockConfig, 'getTelemetryUseCollector').mockReturnValue(true);
|
|
111
|
+
initializeTelemetry(mockConfig);
|
|
112
|
+
expect(OTLPTraceExporter).toHaveBeenCalledWith({
|
|
113
|
+
url: 'http://localhost:4317',
|
|
114
|
+
compression: 'gzip',
|
|
115
|
+
});
|
|
116
|
+
expect(OTLPLogExporter).toHaveBeenCalledWith({
|
|
117
|
+
url: 'http://localhost:4317',
|
|
118
|
+
compression: 'gzip',
|
|
119
|
+
});
|
|
120
|
+
expect(OTLPMetricExporter).toHaveBeenCalledWith({
|
|
121
|
+
url: 'http://localhost:4317',
|
|
122
|
+
compression: 'gzip',
|
|
123
|
+
});
|
|
124
|
+
});
|
|
125
|
+
it('should not use GCP exporters when project ID environment variable is not set', () => {
|
|
126
|
+
vi.spyOn(mockConfig, 'getTelemetryTarget').mockReturnValue(TelemetryTarget.GCP);
|
|
127
|
+
vi.spyOn(mockConfig, 'getTelemetryUseCollector').mockReturnValue(false);
|
|
128
|
+
vi.spyOn(mockConfig, 'getTelemetryOtlpEndpoint').mockReturnValue('');
|
|
129
|
+
const originalOtlpEnv = process.env['OTLP_GOOGLE_CLOUD_PROJECT'];
|
|
130
|
+
const originalGoogleEnv = process.env['GOOGLE_CLOUD_PROJECT'];
|
|
131
|
+
delete process.env['OTLP_GOOGLE_CLOUD_PROJECT'];
|
|
132
|
+
delete process.env['GOOGLE_CLOUD_PROJECT'];
|
|
133
|
+
try {
|
|
134
|
+
initializeTelemetry(mockConfig);
|
|
135
|
+
expect(GcpTraceExporter).not.toHaveBeenCalled();
|
|
136
|
+
expect(GcpLogExporter).not.toHaveBeenCalled();
|
|
137
|
+
expect(GcpMetricExporter).not.toHaveBeenCalled();
|
|
138
|
+
expect(NodeSDK.prototype.start).toHaveBeenCalled();
|
|
139
|
+
}
|
|
140
|
+
finally {
|
|
141
|
+
if (originalOtlpEnv) {
|
|
142
|
+
process.env['OTLP_GOOGLE_CLOUD_PROJECT'] = originalOtlpEnv;
|
|
143
|
+
}
|
|
144
|
+
if (originalGoogleEnv) {
|
|
145
|
+
process.env['GOOGLE_CLOUD_PROJECT'] = originalGoogleEnv;
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
});
|
|
149
|
+
it('should use GOOGLE_CLOUD_PROJECT as fallback when OTLP_GOOGLE_CLOUD_PROJECT is not set', () => {
|
|
150
|
+
vi.spyOn(mockConfig, 'getTelemetryTarget').mockReturnValue(TelemetryTarget.GCP);
|
|
151
|
+
vi.spyOn(mockConfig, 'getTelemetryUseCollector').mockReturnValue(false);
|
|
152
|
+
vi.spyOn(mockConfig, 'getTelemetryOtlpEndpoint').mockReturnValue('');
|
|
153
|
+
const originalOtlpEnv = process.env['OTLP_GOOGLE_CLOUD_PROJECT'];
|
|
154
|
+
const originalGoogleEnv = process.env['GOOGLE_CLOUD_PROJECT'];
|
|
155
|
+
delete process.env['OTLP_GOOGLE_CLOUD_PROJECT'];
|
|
156
|
+
process.env['GOOGLE_CLOUD_PROJECT'] = 'fallback-project';
|
|
157
|
+
try {
|
|
158
|
+
initializeTelemetry(mockConfig);
|
|
159
|
+
expect(GcpTraceExporter).toHaveBeenCalledWith('fallback-project');
|
|
160
|
+
expect(GcpLogExporter).toHaveBeenCalledWith('fallback-project');
|
|
161
|
+
expect(GcpMetricExporter).toHaveBeenCalledWith('fallback-project');
|
|
162
|
+
expect(NodeSDK.prototype.start).toHaveBeenCalled();
|
|
163
|
+
}
|
|
164
|
+
finally {
|
|
165
|
+
if (originalOtlpEnv) {
|
|
166
|
+
process.env['OTLP_GOOGLE_CLOUD_PROJECT'] = originalOtlpEnv;
|
|
167
|
+
}
|
|
168
|
+
if (originalGoogleEnv) {
|
|
169
|
+
process.env['GOOGLE_CLOUD_PROJECT'] = originalGoogleEnv;
|
|
170
|
+
}
|
|
171
|
+
else {
|
|
172
|
+
delete process.env['GOOGLE_CLOUD_PROJECT'];
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
});
|
|
81
176
|
});
|
|
82
177
|
//# sourceMappingURL=sdk.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sdk.test.js","sourceRoot":"","sources":["../../../src/telemetry/sdk.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEzE,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAC/E,OAAO,EAAE,iBAAiB,IAAI,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AACrG,OAAO,EAAE,eAAe,IAAI,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAChG,OAAO,EAAE,kBAAkB,IAAI,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AACzG,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"sdk.test.js","sourceRoot":"","sources":["../../../src/telemetry/sdk.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,11 +7,11 @@ import type { GenerateContentResponseUsageMetadata } from '@google/genai';
|
|
|
7
7
|
import type { Config } from '../config/config.js';
|
|
8
8
|
import type { ApprovalMode } from '../config/config.js';
|
|
9
9
|
import type { CompletedToolCall } from '../core/coreToolScheduler.js';
|
|
10
|
-
import type { DiffStat } from '../tools/tools.js';
|
|
11
10
|
import { ToolCallDecision } from './tool-call-decision.js';
|
|
12
11
|
import type { FileOperation } from './metrics.js';
|
|
13
12
|
export { ToolCallDecision };
|
|
14
13
|
import type { ToolRegistry } from '../tools/tool-registry.js';
|
|
14
|
+
import type { OutputFormat } from '../output/types.js';
|
|
15
15
|
export interface BaseTelemetryEvent {
|
|
16
16
|
'event.name': string;
|
|
17
17
|
/** Current timestamp in ISO 8601 format */
|
|
@@ -36,6 +36,7 @@ export declare class StartSessionEvent implements BaseTelemetryEvent {
|
|
|
36
36
|
mcp_servers_count: number;
|
|
37
37
|
mcp_tools_count?: number;
|
|
38
38
|
mcp_tools?: string;
|
|
39
|
+
output_format: OutputFormat;
|
|
39
40
|
constructor(config: Config, toolRegistry?: ToolRegistry);
|
|
40
41
|
}
|
|
41
42
|
export declare class EndSessionEvent implements BaseTelemetryEvent {
|
|
@@ -65,6 +66,7 @@ export declare class ToolCallEvent implements BaseTelemetryEvent {
|
|
|
65
66
|
error_type?: string;
|
|
66
67
|
prompt_id: string;
|
|
67
68
|
tool_type: 'native' | 'mcp';
|
|
69
|
+
content_length?: number;
|
|
68
70
|
metadata?: {
|
|
69
71
|
[key: string]: any;
|
|
70
72
|
};
|
|
@@ -96,7 +98,6 @@ export declare class ApiResponseEvent implements BaseTelemetryEvent {
|
|
|
96
98
|
model: string;
|
|
97
99
|
status_code?: number | string;
|
|
98
100
|
duration_ms: number;
|
|
99
|
-
error?: string;
|
|
100
101
|
input_token_count: number;
|
|
101
102
|
output_token_count: number;
|
|
102
103
|
cached_content_token_count: number;
|
|
@@ -106,7 +107,7 @@ export declare class ApiResponseEvent implements BaseTelemetryEvent {
|
|
|
106
107
|
response_text?: string;
|
|
107
108
|
prompt_id: string;
|
|
108
109
|
auth_type?: string;
|
|
109
|
-
constructor(model: string, duration_ms: number, prompt_id: string, auth_type?: string, usage_data?: GenerateContentResponseUsageMetadata, response_text?: string
|
|
110
|
+
constructor(model: string, duration_ms: number, prompt_id: string, auth_type?: string, usage_data?: GenerateContentResponseUsageMetadata, response_text?: string);
|
|
110
111
|
}
|
|
111
112
|
export declare class FlashFallbackEvent implements BaseTelemetryEvent {
|
|
112
113
|
'event.name': 'flash_fallback';
|
|
@@ -114,6 +115,12 @@ export declare class FlashFallbackEvent implements BaseTelemetryEvent {
|
|
|
114
115
|
auth_type: string;
|
|
115
116
|
constructor(auth_type: string);
|
|
116
117
|
}
|
|
118
|
+
export declare class RipgrepFallbackEvent implements BaseTelemetryEvent {
|
|
119
|
+
error?: string | undefined;
|
|
120
|
+
'event.name': 'ripgrep_fallback';
|
|
121
|
+
'event.timestamp': string;
|
|
122
|
+
constructor(error?: string | undefined);
|
|
123
|
+
}
|
|
117
124
|
export declare enum LoopType {
|
|
118
125
|
CONSECUTIVE_IDENTICAL_TOOL_CALLS = "consecutive_identical_tool_calls",
|
|
119
126
|
CHANTING_IDENTICAL_SENTENCES = "chanting_identical_sentences",
|
|
@@ -126,6 +133,12 @@ export declare class LoopDetectedEvent implements BaseTelemetryEvent {
|
|
|
126
133
|
prompt_id: string;
|
|
127
134
|
constructor(loop_type: LoopType, prompt_id: string);
|
|
128
135
|
}
|
|
136
|
+
export declare class LoopDetectionDisabledEvent implements BaseTelemetryEvent {
|
|
137
|
+
'event.name': 'loop_detection_disabled';
|
|
138
|
+
'event.timestamp': string;
|
|
139
|
+
prompt_id: string;
|
|
140
|
+
constructor(prompt_id: string);
|
|
141
|
+
}
|
|
129
142
|
export declare class NextSpeakerCheckEvent implements BaseTelemetryEvent {
|
|
130
143
|
'event.name': 'next_speaker_check';
|
|
131
144
|
'event.timestamp': string;
|
|
@@ -191,9 +204,8 @@ export declare class FileOperationEvent implements BaseTelemetryEvent {
|
|
|
191
204
|
lines?: number;
|
|
192
205
|
mimetype?: string;
|
|
193
206
|
extension?: string;
|
|
194
|
-
diff_stat?: DiffStat;
|
|
195
207
|
programming_language?: string;
|
|
196
|
-
constructor(tool_name: string, operation: FileOperation, lines?: number, mimetype?: string, extension?: string,
|
|
208
|
+
constructor(tool_name: string, operation: FileOperation, lines?: number, mimetype?: string, extension?: string, programming_language?: string);
|
|
197
209
|
}
|
|
198
210
|
export declare class InvalidChunkEvent implements BaseTelemetryEvent {
|
|
199
211
|
'event.name': 'invalid_chunk';
|
|
@@ -217,4 +229,56 @@ export declare class ContentRetryFailureEvent implements BaseTelemetryEvent {
|
|
|
217
229
|
total_duration_ms?: number;
|
|
218
230
|
constructor(total_attempts: number, final_error_type: string, total_duration_ms?: number);
|
|
219
231
|
}
|
|
220
|
-
export
|
|
232
|
+
export declare class ModelRoutingEvent implements BaseTelemetryEvent {
|
|
233
|
+
'event.name': 'model_routing';
|
|
234
|
+
'event.timestamp': string;
|
|
235
|
+
decision_model: string;
|
|
236
|
+
decision_source: string;
|
|
237
|
+
routing_latency_ms: number;
|
|
238
|
+
reasoning?: string;
|
|
239
|
+
failed: boolean;
|
|
240
|
+
error_message?: string;
|
|
241
|
+
constructor(decision_model: string, decision_source: string, routing_latency_ms: number, reasoning: string | undefined, failed: boolean, error_message: string | undefined);
|
|
242
|
+
}
|
|
243
|
+
export type TelemetryEvent = StartSessionEvent | EndSessionEvent | UserPromptEvent | ToolCallEvent | ApiRequestEvent | ApiErrorEvent | ApiResponseEvent | FlashFallbackEvent | LoopDetectedEvent | LoopDetectionDisabledEvent | NextSpeakerCheckEvent | KittySequenceOverflowEvent | MalformedJsonResponseEvent | IdeConnectionEvent | ConversationFinishedEvent | SlashCommandEvent | FileOperationEvent | InvalidChunkEvent | ContentRetryEvent | ContentRetryFailureEvent | ExtensionEnableEvent | ExtensionInstallEvent | ExtensionUninstallEvent | ModelRoutingEvent | ToolOutputTruncatedEvent;
|
|
244
|
+
export declare class ExtensionInstallEvent implements BaseTelemetryEvent {
|
|
245
|
+
'event.name': 'extension_install';
|
|
246
|
+
'event.timestamp': string;
|
|
247
|
+
extension_name: string;
|
|
248
|
+
extension_version: string;
|
|
249
|
+
extension_source: string;
|
|
250
|
+
status: 'success' | 'error';
|
|
251
|
+
constructor(extension_name: string, extension_version: string, extension_source: string, status: 'success' | 'error');
|
|
252
|
+
}
|
|
253
|
+
export declare class ToolOutputTruncatedEvent implements BaseTelemetryEvent {
|
|
254
|
+
readonly eventName = "tool_output_truncated";
|
|
255
|
+
readonly 'event.timestamp': string;
|
|
256
|
+
'event.name': string;
|
|
257
|
+
tool_name: string;
|
|
258
|
+
original_content_length: number;
|
|
259
|
+
truncated_content_length: number;
|
|
260
|
+
threshold: number;
|
|
261
|
+
lines: number;
|
|
262
|
+
prompt_id: string;
|
|
263
|
+
constructor(prompt_id: string, details: {
|
|
264
|
+
toolName: string;
|
|
265
|
+
originalContentLength: number;
|
|
266
|
+
truncatedContentLength: number;
|
|
267
|
+
threshold: number;
|
|
268
|
+
lines: number;
|
|
269
|
+
});
|
|
270
|
+
}
|
|
271
|
+
export declare class ExtensionUninstallEvent implements BaseTelemetryEvent {
|
|
272
|
+
'event.name': 'extension_uninstall';
|
|
273
|
+
'event.timestamp': string;
|
|
274
|
+
extension_name: string;
|
|
275
|
+
status: 'success' | 'error';
|
|
276
|
+
constructor(extension_name: string, status: 'success' | 'error');
|
|
277
|
+
}
|
|
278
|
+
export declare class ExtensionEnableEvent implements BaseTelemetryEvent {
|
|
279
|
+
'event.name': 'extension_enable';
|
|
280
|
+
'event.timestamp': string;
|
|
281
|
+
extension_name: string;
|
|
282
|
+
setting_scope: string;
|
|
283
|
+
constructor(extension_name: string, settingScope: string);
|
|
284
|
+
}
|