telemetry(messages): maybeShowMinVscodeWarning

aws · Oct 9, 2024 · addc4fb · addc4fb
1 parent d697f44
commit addc4fb
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 27 deletions.
diff --git a/packages/core/src/shared/extensionStartup.ts b/packages/core/src/shared/extensionStartup.ts
@@ -14,6 +14,7 @@ import { fs } from '../shared/fs/fs'
 import { getIdeProperties, getIdeType, isAmazonQ, isCloud9, isCn, productName } from './extensionUtilities'
 import * as localizedText from './localizedText'
 import { AmazonQPromptSettings, ToolkitPromptSettings } from './settings'
+import { showMessage } from './utilities/messages'
 
 const localize = nls.loadMessageBundle()
 
@@ -27,19 +28,17 @@ export async function maybeShowMinVscodeWarning(minVscode: string) {
     }
     const updateButton = `Update ${vscode.env.appName}`
     if (getIdeType() === 'vscode' && semver.lt(vscode.version, minVscode)) {
-        void vscode.window
-            .showWarningMessage(
-                `${productName()} will soon require VS Code ${minVscode} or newer. The currently running version ${vscode.version} will no longer receive updates.`,
-                updateButton,
-                localizedText.dontShow
-            )
-            .then(async (resp) => {
-                if (resp === updateButton) {
-                    await vscode.commands.executeCommand('update.checkForUpdate')
-                } else if (resp === localizedText.dontShow) {
-                    void settings.disablePrompt('minIdeVersion')
-                }
-            })
+        void showMessage(
+            'warn',
+            `${productName()} will soon require VS Code ${minVscode} or newer. The currently running version ${vscode.version} will no longer receive updates.`,
+            [updateButton, localizedText.dontShow]
+        ).then(async (resp) => {
+            if (resp === updateButton) {
+                await vscode.commands.executeCommand('update.checkForUpdate')
+            } else if (resp === localizedText.dontShow) {
+                void settings.disablePrompt('minIdeVersion')
+            }
+        })
     }
 }
 

diff --git a/packages/core/src/shared/utilities/messages.ts b/packages/core/src/shared/utilities/messages.ts
@@ -35,21 +35,25 @@ export function makeFailedWriteMessage(filename: string): string {
     return message
 }
 
-function showMessageWithItems(
-    message: string,
+export function showMessage(
     kind: 'info' | 'warn' | 'error' = 'error',
+    message: string,
     items: string[] = [],
-    useModal: boolean = false
+    options: vscode.MessageOptions & { telemetry?: boolean } = {}
 ): Thenable<string | undefined> {
-    switch (kind) {
-        case 'info':
-            return vscode.window.showInformationMessage(message, { modal: useModal }, ...items)
-        case 'warn':
-            return vscode.window.showWarningMessage(message, { modal: useModal }, ...items)
-        case 'error':
-        default:
-            return vscode.window.showErrorMessage(message, { modal: useModal }, ...items)
-    }
+    return telemetry.toolkit_showNotification.run(async (span) => {
+        span.record({ passive: true })
+
+        switch (kind) {
+            case 'info':
+                return vscode.window.showInformationMessage(message, options, ...items)
+            case 'warn':
+                return vscode.window.showWarningMessage(message, options, ...items)
+            case 'error':
+            default:
+                return vscode.window.showErrorMessage(message, options, ...items)
+        }
+    })
 }
 
 /**
@@ -75,7 +79,7 @@ export async function showMessageWithUrl(
     const uri = typeof url === 'string' ? vscode.Uri.parse(url) : url
     const items = [...extraItems, urlItem]
 
-    const p = showMessageWithItems(message, kind, items, useModal)
+    const p = showMessage(kind, message, items, { modal: useModal })
     return p.then<string | undefined>((selection) => {
         if (selection === urlItem) {
             void openUrl(uri)
@@ -102,7 +106,7 @@ export async function showViewLogsMessage(
     const logsItem = localize('AWS.generic.message.viewLogs', 'View Logs...')
     const items = [...extraItems, logsItem]
 
-    const p = showMessageWithItems(message, kind, items)
+    const p = showMessage(kind, message, items)
     return p.then<string | undefined>((selection) => {
         if (selection === logsItem) {
             globals.logOutputChannel.show(true)