Merge pull request #4153 from NativeScript/vladimirov/remove-eqatec-analytics-2

feat: improve analytics

Author: rosen-vladimirov

lib/bootstrap.ts

@@ -35,7 +35,6 @@ $injector.require("androidDebugService", "./services/android-debug-service");
 $injector.require("userSettingsService", "./services/user-settings-service");
 $injector.requirePublic("analyticsSettingsService", "./services/analytics-settings-service");
 $injector.require("analyticsService", "./services/analytics/analytics-service");
-$injector.require("eqatecAnalyticsProvider", "./services/analytics/eqatec-analytics-provider");
 $injector.require("googleAnalyticsProvider", "./services/analytics/google-analytics-provider");
 
 $injector.require("emulatorSettingsService", "./services/emulator-settings-service");

lib/commands/debug.ts

@@ -34,7 +34,6 @@ export class DebugPlatformCommand extends ValidatePlatformCommandBase implements
 
 		const debugOptions = <IDebugOptions>_.cloneDeep(this.$options.argv);
 
-		await this.$platformService.trackProjectType(this.$projectData);
 		const selectedDeviceForDebug = await this.getDeviceForDebug();
 
 		const debugData = this.$debugDataService.createDebugData(this.$projectData, {device: selectedDeviceForDebug.deviceInfo.identifier});

lib/common/commands/analytics.ts

@@ -31,11 +31,11 @@ class AnalyticsCommand implements ICommand {
 		switch (arg.toLowerCase()) {
 			case "enable":
 				await this.$analyticsService.setStatus(this.settingName, true);
-				await this.$analyticsService.track(this.settingName, "enabled");
+				// TODO(Analytics): await this.$analyticsService.track(this.settingName, "enabled");
 				this.$logger.info(`${this.humanReadableSettingName} is now enabled.`);
 				break;
 			case "disable":
-				await this.$analyticsService.track(this.settingName, "disabled");
+				// TODO(Analytics): await this.$analyticsService.track(this.settingName, "disabled");
 				await this.$analyticsService.setStatus(this.settingName, false);
 				this.$logger.info(`${this.humanReadableSettingName} is now disabled.`);
 				break;

lib/common/commands/proxy/proxy-base.ts

@@ -12,7 +12,10 @@ export abstract class ProxyCommandBase implements ICommand {
 
 	protected async tryTrackUsage() {
 		try {
-			await this.$analyticsService.trackFeature(this.commandName);
+			// TODO(Analytics): Check why we have set the `disableAnalytics` to true and we track the command as separate one
+			// instead of tracking it through the commandsService.
+			this.$logger.trace(this.commandName);
+			// await this.$analyticsService.trackFeature(this.commandName);
 		} catch (ex) {
 			this.$logger.trace("Error in trying to track proxy command usage:");
 			this.$logger.trace(ex);

lib/common/declarations.d.ts

@@ -186,11 +186,6 @@ declare const enum TrackingTypes {
 	 */
 	Initialization = "initialization",
 
-	/**
-	 * Defines that the data contains feature that should be tracked.
-	 */
-	Feature = "feature",
-
 	/**
 	 * Defines that the data contains exception that should be tracked.
 	 */
@@ -670,19 +665,10 @@ interface IDictionary<T> {
 
 interface IAnalyticsService {
 	checkConsent(): Promise<void>;
-	trackFeature(featureName: string): Promise<void>;
 	trackException(exception: any, message: string): Promise<void>;
 	setStatus(settingName: string, enabled: boolean): Promise<void>;
 	getStatusMessage(settingName: string, jsonFormat: boolean, readableSettingName: string): Promise<string>;
 	isEnabled(settingName: string): Promise<boolean>;
-	track(featureName: string, featureValue: string): Promise<void>;
-
-	/**
-	 * Tries to stop current eqatec monitor, clean it's state and remove the process.exit event handler.
-	 * @param {string|number} code - Exit code as the method is used for process.exit event handler.
-	 * @return void
-	 */
-	tryStopEqatecMonitors(code?: string | number): void;
 
 	/**
 	 * Tracks the answer of question if user allows to be tracked.
@@ -2035,4 +2021,4 @@ declare module "stringify-package" {
 declare module "detect-newline" {
 	function detectNewline(data: string): string | null;
 	export = detectNewline
-}
+}

lib/common/definitions/cli-global.d.ts

@@ -7,11 +7,6 @@ interface ICliGlobal extends NodeJS.Global {
 	 */
 	_: any;
 
-	/**
-	 * Eqatec analytics instance.
-	 */
-	_eqatec: IEqatec;
-
 	/**
 	 * Global instance of the module used for dependency injection.
 	 */

lib/common/definitions/config.d.ts

@@ -6,8 +6,6 @@ declare module Config {
 		USER_AGENT_NAME: string;
 		CLIENT_NAME_ALIAS?: string;
 		FULL_CLIENT_NAME?: string;
-		ANALYTICS_API_KEY: string;
-		ANALYTICS_EXCEPTIONS_API_KEY: string;
 		ANALYTICS_INSTALLATION_ID_SETTING_NAME: string;
 		TRACK_FEATURE_USAGE_SETTING_NAME: string;
 		ERROR_REPORT_SETTING_NAME: string;