From 69accf6190f8779272a8ca2005d89b89ba6b7ed9 Mon Sep 17 00:00:00 2001 From: kieferrm Date: Mon, 4 Dec 2017 16:26:25 -0800 Subject: [PATCH] remove UserIdleStart and UserIdleStop events --- .../platform/telemetry/browser/idleMonitor.ts | 78 ------------------- src/vs/workbench/electron-browser/shell.ts | 18 +---- 2 files changed, 2 insertions(+), 94 deletions(-) delete mode 100644 src/vs/platform/telemetry/browser/idleMonitor.ts diff --git a/src/vs/platform/telemetry/browser/idleMonitor.ts b/src/vs/platform/telemetry/browser/idleMonitor.ts deleted file mode 100644 index 8b76f60b9a4..00000000000 --- a/src/vs/platform/telemetry/browser/idleMonitor.ts +++ /dev/null @@ -1,78 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -'use strict'; - -import { TimeoutTimer } from 'vs/base/common/async'; -import Event, { Emitter } from 'vs/base/common/event'; -import { Disposable } from 'vs/base/common/lifecycle'; -import * as dom from 'vs/base/browser/dom'; - -export enum UserStatus { - Idle, - Active -} - -export class IdleMonitor extends Disposable { - - private _lastActiveTime: number; - private _idleCheckTimeout: TimeoutTimer; - private _status: UserStatus; - private _idleTime: number; - - private _onStatusChange: Emitter; - get onStatusChange(): Event { return this._onStatusChange.event; } - - constructor(idleTime: number) { - super(); - - this._status = null; - this._idleCheckTimeout = this._register(new TimeoutTimer()); - this._lastActiveTime = -1; - this._idleTime = idleTime; - this._onStatusChange = new Emitter(); - - this._register(dom.addDisposableListener(document, 'mousemove', () => this._onUserActive())); - this._register(dom.addDisposableListener(document, 'keydown', () => this._onUserActive())); - this._onUserActive(); - } - - get status(): UserStatus { - return this._status; - } - - private _onUserActive(): void { - this._lastActiveTime = (new Date()).getTime(); - - if (this._status !== UserStatus.Active) { - this._status = UserStatus.Active; - this._scheduleIdleCheck(); - this._onStatusChange.fire(this._status); - } - } - - private _onUserIdle(): void { - if (this._status !== UserStatus.Idle) { - this._status = UserStatus.Idle; - this._onStatusChange.fire(this._status); - } - } - - private _scheduleIdleCheck(): void { - const minimumTimeWhenUserCanBecomeIdle = this._lastActiveTime + this._idleTime; - const timeout = minimumTimeWhenUserCanBecomeIdle - (new Date()).getTime(); - - this._idleCheckTimeout.setIfNotSet(() => this._checkIfUserIsIdle(), timeout); - } - - private _checkIfUserIsIdle(): void { - const actualIdleTime = (new Date()).getTime() - this._lastActiveTime; - - if (actualIdleTime >= this._idleTime) { - this._onUserIdle(); - } else { - this._scheduleIdleCheck(); - } - } -} diff --git a/src/vs/workbench/electron-browser/shell.ts b/src/vs/workbench/electron-browser/shell.ts index 6051ab8ebdf..632873d458c 100644 --- a/src/vs/workbench/electron-browser/shell.ts +++ b/src/vs/workbench/electron-browser/shell.ts @@ -25,7 +25,6 @@ import { NullTelemetryService, configurationTelemetry, lifecycleTelemetry } from import { IExperimentService, ExperimentService } from 'vs/platform/telemetry/common/experiments'; import { ITelemetryAppenderChannel, TelemetryAppenderClient } from 'vs/platform/telemetry/common/telemetryIpc'; import { TelemetryService, ITelemetryServiceConfig } from 'vs/platform/telemetry/common/telemetryService'; -import { IdleMonitor, UserStatus } from 'vs/platform/telemetry/browser/idleMonitor'; import ErrorTelemetry from 'vs/platform/telemetry/browser/errorTelemetry'; import { ElectronWindow } from 'vs/workbench/electron-browser/window'; import { resolveWorkbenchCommonProperties } from 'vs/platform/telemetry/node/workbenchCommonProperties'; @@ -334,21 +333,8 @@ export class WorkbenchShell { this.telemetryService = telemetryService; const errorTelemetry = new ErrorTelemetry(telemetryService); - const idleMonitor = new IdleMonitor(2 * 60 * 1000); // 2 minutes - - const listener = idleMonitor.onStatusChange(status => - /* __GDPR__ - "UserIdleStart" : {} - */ - /* __GDPR__ - "UserIdleStop" : {} - */ - this.telemetryService.publicLog(status === UserStatus.Active - ? TelemetryService.IDLE_STOP_EVENT_NAME - : TelemetryService.IDLE_START_EVENT_NAME - )); - - disposables.push(telemetryService, errorTelemetry, listener, idleMonitor); + + disposables.push(telemetryService, errorTelemetry); } else { this.telemetryService = NullTelemetryService; } -- GitLab