Skip to content

feat: improve analytics #4153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 22, 2018
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
1 change: 0 additions & 1 deletion lib/bootstrap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
1 change: 0 additions & 1 deletion lib/commands/debug.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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});
Expand Down
4 changes: 2 additions & 2 deletions lib/common/commands/analytics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 4 additions & 1 deletion lib/common/commands/proxy/proxy-base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
16 changes: 1 addition & 15 deletions lib/common/declarations.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -2035,4 +2021,4 @@ declare module "stringify-package" {
declare module "detect-newline" {
function detectNewline(data: string): string | null;
export = detectNewline
}
}
5 changes: 0 additions & 5 deletions lib/common/definitions/cli-global.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@ interface ICliGlobal extends NodeJS.Global {
*/
_: any;

/**
* Eqatec analytics instance.
*/
_eqatec: IEqatec;

/**
* Global instance of the module used for dependency injection.
*/
Expand Down
2 changes: 0 additions & 2 deletions lib/common/definitions/config.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
35 changes: 0 additions & 35 deletions lib/common/definitions/eqatec-analytics.d.ts

This file was deleted.

28 changes: 0 additions & 28 deletions lib/common/definitions/eqatec.d.ts

This file was deleted.

Loading