PR Comments 1

Author: rosen-vladimirov

lib/services/analytics/analytics-service.ts

@@ -21,19 +21,12 @@ export class AnalyticsService extends AnalyticsServiceBase implements IAnalytics
 		super($logger, $options, $staticConfig, $prompter, $userSettingsService, $analyticsSettingsService, $progressIndicator, $osInfo);
 	}
 
-	public async track(featureName: string, featureValue: string): Promise<void> {
-		await this.sendDataForTracking(featureName, featureValue);
+	public track(featureName: string, featureValue: string): Promise<void> {
+		return this.sendDataForTracking(featureName, featureValue);
 	}
 
-	public async trackException(exception: any, message: string): Promise<void> {
-		await this.sendExceptionForTracking(exception, message);
-	}
-
-	public async trackFeature(featureValue: string): Promise<void> {
-		const featureName = this.$options.analyticsClient ||
-			(helpers.isInteractive() ? "CLI" : "Non-interactive");
-
-		await this.sendDataForTracking(featureName, featureValue);
+	public trackException(exception: any, message: string): Promise<void> {
+		return this.sendExceptionForTracking(exception, message);
 	}
 
 	protected async checkConsentCore(trackFeatureUsage: boolean): Promise<void> {
@@ -93,56 +86,41 @@ export class AnalyticsService extends AnalyticsServiceBase implements IAnalytics
 					type: TrackingTypes.Finish
 				});
 			});
-
 		});
-
 	}
 
 	private async sendDataForTracking(featureName: string, featureValue: string): Promise<void> {
 		await this.initAnalyticsStatuses();
 
 		if (this.analyticsStatuses[this.$staticConfig.TRACK_FEATURE_USAGE_SETTING_NAME] === AnalyticsStatus.enabled) {
-			const broker = await this.getAnalyticsBroker();
-
-			return new Promise<void>((resolve, reject) => {
-				broker.send(
-					{
-						type: TrackingTypes.Feature,
-						featureName: featureName,
-						featureValue: featureValue
-					},
-					() => {
-						resolve();
-					});
-			});
-
+			return this.sendMessageToBroker(
+				{
+					type: TrackingTypes.Feature,
+					featureName: featureName,
+					featureValue: featureValue
+				}
+			);
 		}
-
 	}
 
 	private async sendExceptionForTracking(exception: Error, message: string): Promise<void> {
 		await this.initAnalyticsStatuses();
 
 		if (this.analyticsStatuses[this.$staticConfig.ERROR_REPORT_SETTING_NAME] === AnalyticsStatus.enabled) {
-			const broker = await this.getAnalyticsBroker();
-
-			return new Promise<void>((resolve, reject) => {
-				broker.send(
-					{
-						type: TrackingTypes.Exception,
-						exception,
-						message
-					},
-					() => {
-						resolve();
-					});
-
-			});
-
+			return this.sendMessageToBroker(
+				{
+					type: TrackingTypes.Exception,
+					exception,
+					message
+				}
+			);
 		}
-
 	}
 
+	private async sendMessageToBroker(message: any): Promise<void> {
+		const broker = await this.getAnalyticsBroker();
+		return new Promise<void>((resolve, reject) => broker.send(message, resolve));
+	}
 }
 
 $injector.register("analyticsService", AnalyticsService);

lib/services/analytics/eqatec-analytics-process.ts

@@ -30,7 +30,7 @@ const stopAnalyticsProcess = async () => {
 		eqatecAnalyticsService = null;
 		process.disconnect();
 	} catch (err) {
-		process.exit(0);
+		process.exit(ErrorCodes.FAILED_EQATEC_ANALYTICS_PROCESS);
 	}
 };
 

lib/services/analytics/eqatec-analytics-provider.ts

@@ -18,15 +18,13 @@ export class EqatecAnalyticsProvider implements IAnalyticsProvider {
 		return this._eqatecFeatureChildProcesses;
 	}
 
-	@cache()
 	private get _eqatecFeatureProjectAPIKeys(): string[] {
 		return [
 			this.$staticConfig.ANALYTICS_API_KEY,
 			EqatecAnalyticsProvider.NEW_PROJECT_ANALYTICS_API_KEY
 		];
 	}
 
-	@cache()
 	private get _eqatecExceptionProjectAPIKey(): string {
 		return this.$staticConfig.ANALYTICS_EXCEPTIONS_API_KEY;
 	}

lib/services/analytics/eqatec-analytics.ts

@@ -24,7 +24,7 @@ export class EqatectAnalyticsService extends AnalyticsServiceBase {
 				await this.waitForSending();
 			}
 		} catch (e) {
-			this.$logger.trace("Analytics exception: '%s'", e.toString());
+			this.$logger.trace(`Analytics exception: ${e}`);
 		}
 	}
 
@@ -37,7 +37,7 @@ export class EqatectAnalyticsService extends AnalyticsServiceBase {
 				await this.waitForSending();
 			}
 		} catch (e) {
-			this.$logger.trace("Analytics exception: '%s'", e.toString());
+			this.$logger.trace(`Analytics exception: ${e}`);
 		}
 	}