Remove duplicate telemetry service registration

We no longer comment out the telemetry service in the workbench so ours
is redundant.

- logTelemetry call was slightly wrong (uses an object rather than an
  array)
- No longer need the telemetry channel since the default uses the
  extension environment channel.
- No longer need disableTelemetry since we don't create the setting.
  This does mean the setting is not toggled off when the disable flag is
  set (it does of course still prevent telemetry) but that appears to be
  the same with upstream.

Author: code-asher

ci/build/build-release.sh

@@ -82,10 +82,12 @@ bundle_vscode() {
   rsync "$VSCODE_SRC_PATH/resources/linux/code.png" "$VSCODE_OUT_PATH/resources/linux/code.png"
   rsync "$VSCODE_SRC_PATH/resources/web/callback.html" "$VSCODE_OUT_PATH/resources/web/callback.html"
 
-  # Adds the commit and date to product.json
+  # Add the commit and date and enable telemetry. This just makes telemetry
+  # available; telemetry can still be disabled by flag or setting.
   jq --slurp '.[0] * .[1]' "$VSCODE_SRC_PATH/product.json" <(
     cat << EOF
   {
+    "enableTelemetry": true,
     "commit": "$(git rev-parse HEAD)",
     "date": $(jq -n 'now | todate')
   }

lib/vscode/src/vs/platform/telemetry/common/telemetryChannel.ts

@@ -240,7 +240,7 @@ export class ExtensionEnvironmentChannel implements IServerChannel {
 				);
 			case 'getDiagnosticInfo': return this.getDiagnosticInfo();
 			case 'disableTelemetry': return this.disableTelemetry();
-			case 'logTelemetry': return this.logTelemetry(args[0], args[1]);
+			case 'logTelemetry': return this.logTelemetry(args.eventName, args.data);
 			case 'flushTelemetry': return this.flushTelemetry();
 		}
 		throw new Error(`Invalid call '${command}'`);

lib/vscode/src/vs/server/channel.ts

@@ -46,7 +46,6 @@ import { TelemetryLogAppender } from 'vs/platform/telemetry/common/telemetryLogA
 import { TelemetryService } from 'vs/platform/telemetry/common/telemetryService';
 import { combinedAppender, NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
 import { AppInsightsAppender } from 'vs/platform/telemetry/node/appInsightsAppender';
-import { TelemetryChannel } from 'vs/platform/telemetry/common/telemetryChannel';
 import { ExtensionEnvironmentChannel, FileProviderChannel, TerminalProviderChannel } from 'vs/server/channel';
 import { Connection, ExtensionHostConnection, ManagementConnection } from 'vs/server/connection';
 import { TelemetryClient } from 'vs/server/insights';
@@ -269,7 +268,8 @@ export class Vscode {
 				instantiationService.createInstance(LogsDataCleaner);
 
 				let telemetryService: ITelemetryService;
-				if (!environmentService.disableTelemetry) {
+
+				if (!environmentService.isExtensionDevelopment && !environmentService.disableTelemetry && !!productService.enableTelemetry) {
 					telemetryService = new TelemetryService({
 						appender: combinedAppender(
 							new AppInsightsAppender('code-server', null, () => new TelemetryClient() as any),
@@ -300,7 +300,6 @@ export class Vscode {
 					environmentService, logService, telemetryService, '',
 				));
 				this.ipc.registerChannel('request', new RequestChannel(accessor.get(IRequestService)));
-				this.ipc.registerChannel('telemetry', new TelemetryChannel(telemetryService));
 				this.ipc.registerChannel('localizations', <IServerChannel<any>>ProxyChannel.fromService(accessor.get(ILocalizationsService)));
 				this.ipc.registerChannel(REMOTE_FILE_SYSTEM_CHANNEL_NAME, new FileProviderChannel(environmentService, logService));
 

lib/vscode/src/vs/server/server.ts

@@ -3,20 +3,14 @@ import { Options } from 'vs/base/common/ipc';
 import { localize } from 'vs/nls';
 import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
 import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { ILogService } from 'vs/platform/log/common/log';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { Registry } from 'vs/platform/registry/common/platform';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { TelemetryChannelClient } from 'vs/platform/telemetry/common/telemetryChannel';
 import { getOptions } from 'vs/base/common/util';
 import 'vs/workbench/contrib/localizations/browser/localizations.contribution'; // eslint-disable-line code-import-patterns
 import 'vs/workbench/services/localizations/browser/localizationsService';
-import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
 
 /**
  * All client-side customization to VS Code should live in this file when
@@ -25,32 +19,6 @@ import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteA
 
 const options = getOptions<Options>();
 
-class TelemetryService extends TelemetryChannelClient {
-	public constructor(
-		@IRemoteAgentService remoteAgentService: IRemoteAgentService,
-	) {
-		super(remoteAgentService.getConnection()!.getChannel('telemetry'));
-	}
-}
-
-const TELEMETRY_SECTION_ID = 'telemetry';
-Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfiguration({
-	'id': TELEMETRY_SECTION_ID,
-	'order': 110,
-	'type': 'object',
-	'title': localize('telemetryConfigurationTitle', 'Telemetry'),
-	'properties': {
-		'telemetry.enableTelemetry': {
-			'type': 'boolean',
-			'description': localize('telemetry.enableTelemetry', 'Enable usage data and errors to be sent to a Microsoft online service.'),
-			'default': !options.disableTelemetry,
-			'tags': ['usesOnlineServices']
-		}
-	}
-});
-
-registerSingleton(ITelemetryService, TelemetryService);
-
 /**
  * This is called by vs/workbench/browser/web.main.ts after the workbench has
  * been initialized so we can initialize our own client-side code.

lib/vscode/src/vs/workbench/browser/client.ts

@@ -49,7 +49,6 @@ router.get("/", async (req, res) => {
       !isDevMode ? content.replace(/<!-- PROD_ONLY/g, "").replace(/END_PROD_ONLY -->/g, "") : content,
       {
         authed: req.args.auth !== "none",
-        disableTelemetry: !!req.args["disable-telemetry"],
         disableUpdateCheck: !!req.args["disable-update-check"],
       },
     )

src/node/routes/vscode.ts

@@ -145,7 +145,7 @@ describe("register", () => {
       mockElement.id = "coder-options"
       mockElement.setAttribute(
         "data-settings",
-        `{"csStaticBase":"${csStaticBasePath}","logLevel":2,"disableTelemetry":false,"disableUpdateCheck":false}`,
+        `{"csStaticBase":"${csStaticBasePath}","logLevel":2,"disableUpdateCheck":false}`,
       )
       // Return mockElement from the spy
       // this way, when we call "getElementById"
@@ -166,7 +166,7 @@ describe("register", () => {
       mockElement.id = "coder-options"
       mockElement.setAttribute(
         "data-settings",
-        `{"base":"proxy/","csStaticBase":"${csStaticBasePath}","logLevel":2,"disableTelemetry":false,"disableUpdateCheck":false}`,
+        `{"base":"proxy/","csStaticBase":"${csStaticBasePath}","logLevel":2,"disableUpdateCheck":false}`,
       )
       // Return mockElement from the spy
       // this way, when we call "getElementById"

test/unit/register.test.ts

@@ -144,7 +144,7 @@ describe("util", () => {
       const mockElement = document.createElement("div")
       mockElement.setAttribute(
         "data-settings",
-        '{"base":".","csStaticBase":"./static/development/Users/jp/Dev/code-server","logLevel":2,"disableTelemetry":false,"disableUpdateCheck":false}',
+        '{"base":".","csStaticBase":"./static/development/Users/jp/Dev/code-server","logLevel":2,"disableUpdateCheck":false}',
       )
       // Return mockElement from the spy
       // this way, when we call "getElementById"
@@ -154,7 +154,6 @@ describe("util", () => {
       expect(util.getOptions()).toStrictEqual({
         base: "",
         csStaticBase: "/static/development/Users/jp/Dev/code-server",
-        disableTelemetry: false,
         disableUpdateCheck: false,
         logLevel: 2,
       })

test/unit/util.test.ts

@@ -9,7 +9,6 @@ export interface Options {
   authed: boolean
   base: string
   csStaticBase: string
-  disableTelemetry: boolean
   disableUpdateCheck: boolean
   logLevel: number
 }