#6679 telemetry logging

Author: sandy081

src/vs/base/parts/tree/browser/treeDefaults.ts

@@ -432,19 +432,21 @@ export class DefaultAccessibilityProvider implements _.IAccessibilityProvider {
 
 export class CollapseAllAction extends Action {
 
-	constructor(viewer: _.ITree, enabled: boolean) {
-		super('workbench.action.collapse', nls.localize('collapse', "Collapse All"), 'monaco-tree-action collapse-all', enabled, (context: any) => {
-			if (viewer.getHighlight()) {
-				return TPromise.as(null); // Global action disabled if user is in edit mode from another action
-			}
+	constructor(private viewer: _.ITree, enabled: boolean) {
+		super('workbench.action.collapse', nls.localize('collapse', "Collapse All"), 'monaco-tree-action collapse-all', enabled);
+	}
 
-			viewer.collapseAll();
-			viewer.clearSelection();
-			viewer.clearFocus();
-			viewer.DOMFocus();
-			viewer.focusFirst();
+	public run(context?: any): TPromise<any> {
+		if (this.viewer.getHighlight()) {
+			return TPromise.as(null); // Global action disabled if user is in edit mode from another action
+		}
 
-			return TPromise.as(null);
-		});
+		this.viewer.collapseAll();
+		this.viewer.clearSelection();
+		this.viewer.clearFocus();
+		this.viewer.DOMFocus();
+		this.viewer.focusFirst();
+
+		return TPromise.as(null);
 	}
 }

src/vs/workbench/browser/panel.ts

@@ -73,7 +73,7 @@ export abstract class TogglePanelAction extends Action {
 		id: string,
 		label: string,
 		panelId: string,
-		private panelService: IPanelService,
+		protected panelService: IPanelService,
 		private editorService: IWorkbenchEditorService
 	) {
 		super(id, name);
@@ -100,7 +100,7 @@ export abstract class TogglePanelAction extends Action {
 		return panel && panel.getId() === this.panelId;
 	}
 
-	private isPanelFocussed(): boolean {
+	protected isPanelFocussed(): boolean {
 		let activePanel = this.panelService.getActivePanel();
 		let activeElement = document.activeElement;
 

src/vs/workbench/parts/markers/browser/markersPanel.ts

@@ -27,12 +27,11 @@ import Constants from 'vs/workbench/parts/markers/common/constants';
 import { IProblemsConfiguration, MarkersModel, Marker, Resource } from 'vs/workbench/parts/markers/common/markersModel';
 import {Controller} from 'vs/workbench/parts/markers/browser/markersTreeController';
 import Tree = require('vs/base/parts/tree/browser/tree');
-import {CollapseAllAction} from 'vs/base/parts/tree/browser/treeDefaults';
 import TreeImpl = require('vs/base/parts/tree/browser/treeImpl');
 import * as Viewer from 'vs/workbench/parts/markers/browser/markersTreeViewer';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ActionProvider } from 'vs/workbench/parts/markers/browser/markersActionProvider';
-import { FilterAction, FilterInputBoxActionItem } from 'vs/workbench/parts/markers/browser/markersPanelActions';
+import { CollapseAllAction, FilterAction, FilterInputBoxActionItem } from 'vs/workbench/parts/markers/browser/markersPanelActions';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 
 export class MarkersPanel extends Panel {
@@ -90,8 +89,6 @@ export class MarkersPanel extends Panel {
 
 		this.render();
 
-		// this.telemetryService.publicLog('problems.used');
-
 		return TPromise.as(null);
 	}
 

src/vs/workbench/parts/markers/browser/markersPanelActions.ts

@@ -6,6 +6,7 @@
 import { Delayer } from 'vs/base/common/async';
 import * as DOM from 'vs/base/browser/dom';
 import * as lifecycle from 'vs/base/common/lifecycle';
+import { TPromise } from 'vs/base/common/winjs.base';
 import { IAction, Action } from 'vs/base/common/actions';
 import { BaseActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
 import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
@@ -20,7 +21,9 @@ import { MarkersPanel } from 'vs/workbench/parts/markers/browser/markersPanel';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService';
+import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { CollapseAllAction as TreeCollapseAction } from 'vs/base/parts/tree/browser/treeDefaults';
+import Tree = require('vs/base/parts/tree/browser/tree');
 
 export class ToggleProblemsPanelAction extends TogglePanelAction {
 
@@ -34,6 +37,28 @@ export class ToggleProblemsPanelAction extends TogglePanelAction {
 	) {
 		super(id, label, Constants.MARKERS_PANEL_ID, panelService, editorService);
 	}
+
+	public run(): TPromise<any> {
+		let promise= super.run();
+		if (this.isPanelFocussed()) {
+			this.telemetryService.publicLog('problems.used');
+		}
+		return promise;
+	}
+}
+
+export class CollapseAllAction extends TreeCollapseAction {
+
+	constructor(viewer: Tree.ITree, enabled: boolean,
+				@ITelemetryService private telemetryService: ITelemetryService) {
+		super(viewer, enabled);
+	}
+
+	public run(context?: any): TPromise<any> {
+		this.telemetryService.publicLog('problems.collapseAll.used');
+		return super.run(context);
+	}
+
 }
 
 export class FilterAction extends Action {
@@ -75,8 +100,11 @@ export class FilterInputBoxActionItem extends BaseActionItem {
 	}
 
 	private reportFilteringUsed(): void {
-		// Report only filtering is used, do not use the input from the user
-		// this.telemetryService.publicLog('problems.filtered');
+		let data= {};
+		data['errors']= this.markersPanel.markersModel.filterOptions.filterErrors;
+		data['warnings']= this.markersPanel.markersModel.filterOptions.filterWarnings;
+		data['infos']= this.markersPanel.markersModel.filterOptions.filterInfos;
+		this.telemetryService.publicLog('problems.filter', data);
 	}
 
 	public dispose(): void {

src/vs/workbench/parts/markers/browser/markersTreeController.ts

@@ -12,10 +12,12 @@ import treedefaults = require('vs/base/parts/tree/browser/treeDefaults');
 import { MarkersModel, Marker } from 'vs/workbench/parts/markers/common/markersModel';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IMarker } from 'vs/platform/markers/common/markers';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 
 export class Controller extends treedefaults.DefaultController {
 
-	constructor(@IWorkbenchEditorService private editorService: IWorkbenchEditorService) {
+	constructor(@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
+				@ITelemetryService private telemetryService: ITelemetryService) {
 		super();
 	}
 
@@ -46,6 +48,7 @@ export class Controller extends treedefaults.DefaultController {
 
 	private openFileAtElement(element: any, preserveFocus: boolean, sideByside: boolean) {
 		if (element instanceof Marker) {
+			this.telemetryService.publicLog('problems.marker.opened', {source: element.source});
 			let marker = <IMarker>element.marker;
 			this.editorService.openEditor({
 				resource: marker.resource,