Adds tracking when opening the upgrade url is cancelled

Author: d13

docs/telemetry-events.md

@@ -1731,7 +1731,16 @@ void
 
 ```typescript
 {
-  'action': 'manage' | 'sign-up' | 'sign-in' | 'sign-out' | 'reactivate' | 'resend-verification' | 'pricing' | 'start-preview-trial' | 'upgrade'
+  'action': 'manage' | 'sign-up' | 'sign-in' | 'sign-out' | 'reactivate' | 'resend-verification' | 'pricing' | 'start-preview-trial'
+}
+```
+
+or
+
+```typescript
+{
+  'aborted': boolean,
+  'action': 'upgrade'
 }
 ```
 

src/constants.telemetry.ts

@@ -784,8 +784,11 @@ type SubscriptionActionEventData =
 				| 'reactivate'
 				| 'resend-verification'
 				| 'pricing'
-				| 'start-preview-trial'
-				| 'upgrade';
+				| 'start-preview-trial';
+	  }
+	| {
+			action: 'upgrade';
+			aborted: boolean;
 	  }
 	| {
 			action: 'visibility';

src/plus/gk/subscriptionService.ts

@@ -62,6 +62,7 @@ import { getLogScope, setLogScopeExit } from '../../system/logger.scope';
 import { flatten } from '../../system/object';
 import { pauseOnCancelOrTimeout } from '../../system/promise';
 import { pluralize } from '../../system/string';
+import { createDisposable } from '../../system/unifiedDisposable';
 import { satisfies } from '../../system/version';
 import { LoginUriPathPrefix } from './authenticationConnection';
 import { authenticationProviderScopes } from './authenticationProvider';
@@ -871,9 +872,22 @@ export class SubscriptionService implements Disposable {
 
 		if (!(await ensurePlusFeaturesEnabled())) return;
 
-		if (this.container.telemetry.enabled) {
-			this.container.telemetry.sendEvent('subscription/action', { action: 'upgrade' }, source);
-		}
+		let aborted = false;
+		using telemetry = this.container.telemetry.enabled
+			? createDisposable(
+					() => {
+						this.container.telemetry.sendEvent(
+							'subscription/action',
+							{
+								action: 'upgrade',
+								aborted: aborted,
+							},
+							source,
+						);
+					},
+					{ once: true },
+			  )
+			: undefined;
 
 		if (this._subscription.account != null) {
 			// Do a pre-check-in to see if we've already upgraded to a paid plan.
@@ -910,27 +924,34 @@ export class SubscriptionService implements Disposable {
 
 		try {
 			if (hasAccount) {
-				const token = await this.container.accountAuthentication.getExchangeToken(
-					SubscriptionUpdatedUriPathPrefix,
-				);
-				query.set('token', token);
-			} else {
+				try {
+					const token = await this.container.accountAuthentication.getExchangeToken(
+						SubscriptionUpdatedUriPathPrefix,
+					);
+					query.set('token', token);
+				} catch (ex) {
+					Logger.error(ex, scope);
+				}
+			}
+
+			if (!query.has('token')) {
 				const successUri = await env.asExternalUri(
 					Uri.parse(`${env.uriScheme}://${this.container.context.extension.id}/${LoginUriPathPrefix}`),
 				);
 				query.set('success_uri', successUri.toString(true));
 			}
-
-			if (!(await openUrl(this.container.getGkDevUri('purchase/checkout', query.toString()).toString(true)))) {
-				return;
-			}
 		} catch (ex) {
 			Logger.error(ex, scope);
-			if (!(await openUrl(this.container.getGkDevUri('purchase/checkout', query.toString()).toString(true)))) {
-				return;
-			}
 		}
 
+		aborted = !(await openUrl(this.container.getGkDevUri('purchase/checkout', query.toString()).toString(true)));
+
+		if (aborted) {
+			return;
+		}
+
+		telemetry?.dispose();
+
 		const completionPromises = [new Promise<boolean>(resolve => setTimeout(() => resolve(false), 5 * 60 * 1000))];
 
 		if (hasAccount) {