Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 14 additions & 3 deletions src/client/startupTelemetry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { sendTelemetryEvent } from './telemetry';
import { EventName } from './telemetry/constants';
import { EditorLoadTelemetry } from './telemetry/types';
import { IStartupDurations } from './types';
import { useEnvExtension } from './envExt/api.internal';

export async function sendStartupTelemetry(
activatedPromise: Promise<any>,
Expand Down Expand Up @@ -105,9 +106,19 @@ async function getActivationTelemetryProps(
// finish. API getActiveInterpreter() does not block on windows registry by default as
// it is slow.
await interpreterService.refreshPromise;
const interpreter = await interpreterService
.getActiveInterpreter()
.catch<PythonEnvironment | undefined>(() => undefined);
let interpreter: PythonEnvironment | undefined;

// include main workspace uri if using env extension
if (useEnvExtension()) {
interpreter = await interpreterService
.getActiveInterpreter(mainWorkspaceUri)
.catch<PythonEnvironment | undefined>(() => undefined);
} else {
interpreter = await interpreterService
.getActiveInterpreter()
.catch<PythonEnvironment | undefined>(() => undefined);
}

const pythonVersion = interpreter && interpreter.version ? interpreter.version.raw : undefined;
const interpreterType = interpreter ? interpreter.envType : undefined;
if (interpreterType === EnvironmentType.Unknown) {
Expand Down
3 changes: 3 additions & 0 deletions src/client/terminals/codeExecution/codeExecutionManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ export class CodeExecutionManager implements ICodeExecutionManager {
} catch (ex) {
traceError('Failed to execute file in terminal', ex);
}
sendTelemetryEvent(EventName.ENVIRONMENT_CHECK_TRIGGER, undefined, {
trigger: 'run-in-terminal',
});
return;
}

Expand Down