Centralize license_setup_ended in setup.ts

Author: anisaoshafi

src/plugins/setup.ts

@@ -221,9 +221,6 @@ export default createPlugin(
 								await activateLicenseUntilValid(
 									outputChannel,
 									cancellationToken,
-									telemetry,
-									origin_trigger,
-									licenseCheckStartedAt,
 								);
 							}
 
@@ -243,6 +240,19 @@ export default createPlugin(
 								return;
 							}
 
+							telemetry.track({
+								name: "license_setup_ended",
+								payload: {
+									namespace: "onboarding",
+									step_order: 3,
+									origin: origin_trigger,
+									auth_token: await readAuthToken(),
+									started_at: licenseCheckStartedAt,
+									ended_at: new Date().toISOString(),
+									status: "COMPLETED",
+								},
+							});
+
 							/////////////////////////////////////////////////////////////////////
 							progress.report({
 								message: "Configuring AWS profile...",

src/utils/license.ts

@@ -32,28 +32,13 @@ export async function activateLicense(outputChannel: LogOutputChannel) {
 export async function activateLicenseUntilValid(
 	outputChannel: LogOutputChannel,
 	cancellationToken: CancellationToken,
-	telemetry: Telemetry,
-	origin: "manual_trigger" | "extension_startup",
-	startedAt: string,
 ): Promise<void> {
 	while (true) {
 		if (cancellationToken.isCancellationRequested) {
 			break;
 		}
 		const licenseIsValid = await checkIsLicenseValid(outputChannel);
 		if (licenseIsValid) {
-			telemetry.track({
-				name: "license_setup_ended",
-				payload: {
-					namespace: "onboarding",
-					step_order: 3,
-					origin: origin,
-					auth_token: await readAuthToken(),
-					started_at: startedAt,
-					ended_at: new Date().toISOString(),
-					status: "COMPLETED",
-				},
-			});
 			break;
 		}
 		await activateLicense(outputChannel);