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
5 changes: 2 additions & 3 deletions extensions/vscode-containers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3431,8 +3431,8 @@
"@azure/arm-containerregistry": "^10.1.0",
"@azure/storage-blob": "^12.14.0",
"@microsoft/compose-language-service": "workspace:*",
"@microsoft/vscode-azext-azureauth": "^6.0.0-alpha.8",
"@microsoft/vscode-azext-azureutils": "^4.0.0",
"@microsoft/vscode-azext-azureauth": "^6.1.0-alpha.2",
"@microsoft/vscode-azext-azureutils": "^5.0.0",
"@microsoft/vscode-azext-utils": "catalog:",
"@microsoft/vscode-container-client": "workspace:*",
"@microsoft/vscode-docker-registries": "workspace:*",
Expand All @@ -3447,7 +3447,6 @@
"semver": "^7.5.2",
"tar": "^7.5.21",
"vscode-languageclient": "catalog:",
"vscode-tas-client": "^0.1.75",
"zod": "catalog:"
}
}
11 changes: 1 addition & 10 deletions extensions/vscode-containers/src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@
*--------------------------------------------------------------------------------------------*/

import type { TelemetryEvent } from '@microsoft/compose-language-service/client';
import { callWithTelemetryAndErrorHandling, createExperimentationService, IActionContext, registerErrorHandler, registerEvent, registerUIExtensionVariables, UserCancelledError } from '@microsoft/vscode-azext-utils';
import { callWithTelemetryAndErrorHandling, IActionContext, registerErrorHandler, registerEvent, registerUIExtensionVariables, UserCancelledError } from '@microsoft/vscode-azext-utils';
import * as path from 'path';
import * as semver from 'semver';
import * as vscode from 'vscode';
import type { ConfigurationParams, DidChangeConfigurationNotification, DocumentSelector, LanguageClient, LanguageClientOptions, Middleware, ServerOptions } from 'vscode-languageclient/node';
import * as tas from 'vscode-tas-client';
import { registerCommands } from './commands/registerCommands';
import { configPrefix } from './constants';
import { registerContainersLMTools } from './copilot/registerContainersLMTools';
Expand Down Expand Up @@ -68,18 +67,10 @@ export async function activateInternal(ctx: vscode.ExtensionContext, perfStats:
}
}

// All of these internally handle telemetry opt-in
ext.activityMeasurementService = new ActivityMeasurementService(ctx.globalState);
Comment thread
bwateratmsft marked this conversation as resolved.
ext.experimentationService = await createExperimentationService(
ctx,
process.env.VSCODE_DOCKER_TEAM === '1' ? tas.TargetPopulation.Team : undefined // If VSCODE_DOCKER_TEAM isn't set, let @microsoft/vscode-azext-utils decide target population
);

logSystemInfo(ext.outputChannel);

// Disabled for now
// (new SurveyManager()).activate();

// Remove the "Report Issue" button from all error messages in favor of the command
registerErrorHandler(ctx => ctx.errorHandling.suppressReportIssue = true);

Expand Down
3 changes: 1 addition & 2 deletions extensions/vscode-containers/src/extensionVariables.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Licensed under the MIT License. See LICENSE.md in the project root for license information.
*--------------------------------------------------------------------------------------------*/

import { AzExtTreeDataProvider, AzExtTreeItem, IExperimentationServiceAdapter } from '@microsoft/vscode-azext-utils';
import { AzExtTreeDataProvider, AzExtTreeItem } from '@microsoft/vscode-azext-utils';
import { DockerHubRegistryDataProvider, GenericRegistryV2DataProvider, GitHubRegistryDataProvider } from '@microsoft/vscode-docker-registries';
import { ExtensionContext, StatusBarItem, TreeView } from 'vscode';
import { ContainerRuntimeManager } from './runtimes/ContainerRuntimeManager';
Expand All @@ -27,7 +27,6 @@ export namespace ext {
export let context: ExtensionContext;
export let outputChannel: AzExtLogOutputChannelWrapper;

export let experimentationService: IExperimentationServiceAdapter;
export let activityMeasurementService: IActivityMeasurementService;

export let treeInitError: unknown;
Expand Down
105 changes: 0 additions & 105 deletions extensions/vscode-containers/src/telemetry/surveys/SurveyManager.ts

This file was deleted.

31 changes: 0 additions & 31 deletions extensions/vscode-containers/src/telemetry/surveys/awareness.ts

This file was deleted.

22 changes: 0 additions & 22 deletions extensions/vscode-containers/src/telemetry/surveys/nps2.ts

This file was deleted.

26 changes: 0 additions & 26 deletions extensions/vscode-containers/src/telemetry/surveys/survey3.ts

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"vscode": "^1.105.0"
},
"devDependencies": {
"@microsoft/vscode-azext-eng": "^1.1.0-alpha.3",
"@microsoft/vscode-azext-eng": "^1.1.0-alpha.6",
"@types/node": "22.x",
"@types/vscode": "1.109.0",
"@typescript/native": "npm:typescript@7.0.2"
Expand Down
Loading
Loading