Review change

Author: Vandita Patidar

packages/core/src/awsService/appBuilder/activation.ts

@@ -202,7 +202,7 @@ async function registerAppBuilderCommands(context: ExtContext): Promise<void> {
             }
         }),
         Commands.register({ id: 'aws.toolkit.lambda.createServerlessLandProject', autoconnect: false }, async () => {
-            await telemetry.serverlessland_createProject.run(async () => {
+            await telemetry.lambda_createServerlessLandProject.run(async () => {
                 await createNewServerlessLandProject(context)
             })
         })

packages/core/src/awsService/appBuilder/serverlessLand/main.ts

@@ -73,7 +73,7 @@ export async function createNewServerlessLandProject(extContext: ExtContext): Pr
         )
         getLogger().error('Error creating new Serverless Land Application: %O', err as Error)
     } finally {
-        telemetry.serverlessland_createProject.emit({
+        telemetry.lambda_createServerlessLandProject.emit({
             result: createResult,
             reason: reason,
         })
@@ -103,7 +103,7 @@ export async function downloadPatternCode(config: CreateServerlessLandWizardForm
             result: 'Succeeded',
         })
     } catch (error) {
-        telemetry.serverlessland_downloadPattern.emit({
+        telemetry.lambda_downloadServerlessLandPattern.emit({
             result: 'Failed',
             reason: getTelemetryReason(error),
         })
@@ -119,22 +119,11 @@ export async function openReadmeFile(config: CreateServerlessLandWizardForm): Pr
         const readmeUri = await getProjectUri(config, readmeFile)
         if (!readmeUri) {
             getLogger().warn('README.md file not found in the project directory')
-            telemetry.serverlessland_readme.emit({
-                result: 'Failed',
-                reason: 'FileNotFound',
-            })
             return
         }
         await vscode.commands.executeCommand('workbench.action.focusFirstEditorGroup')
         await vscode.commands.executeCommand('markdown.showPreview', readmeUri)
-        telemetry.serverlessland_readme.emit({
-            result: 'Succeeded',
-        })
     } catch (err) {
-        telemetry.serverlessland_readme.emit({
-            result: 'Failed',
-            reason: getTelemetryReason(err),
-        })
         getLogger().error(`Error in openReadmeFile: ${err}`)
         throw new ToolkitError('Error processing README file')
     }

packages/core/src/shared/telemetry/vscodeTelemetry.json

@@ -645,19 +645,15 @@
             "description": "Records a call to remove a region from the explorer"
         },
         {
-            "name": "serverlessland_createProject",
+            "name": "lambda_createServerlessLandProject",
             "description": "Called when creating a new Serverless Project"
         },
         {
-            "name": "serverlessland_downloadPattern",
+            "name": "lambda_downloadServerlessLandPattern",
             "description": "Called when downloading a Serverless Pattern"
         },
         {
-            "name": "serverlessland_readme",
-            "description": "Called when opening the Serverless Pattern Readme"
-        },
-        {
-            "name": "serverlessland_wizard",
+            "name": "lambda_serverlessLandWizard",
             "description": "Called when opening the Serverless Pattern Wizard"
         },
         {

packages/core/src/test/awsService/appBuilder/serverlessLand/main.test.ts

@@ -35,7 +35,7 @@ describe('createNewServerlessLandProject', () => {
             getCredentialDefaultRegion: () => 'us-west-2',
         },
     } as unknown as ExtContext
-    const assertTelemetry = assertTelemetryCurried('serverlessland_createProject')
+    const assertTelemetry = assertTelemetryCurried('lambda_createServerlessLandProject')
     const mockWizardResponse = {
         name: 'test-project',
         location: vscode.Uri.file('/test'),
@@ -63,7 +63,7 @@ describe('createNewServerlessLandProject', () => {
         const readmeStub = sandbox.stub(main, 'openReadmeFile').resolves()
         const addFolderStub = sandbox.stub(workspaceUtils, 'addFolderToWorkspace').resolves()
 
-        await main.createNewServerlessLandProject(mockExtContext)
+        await createNewServerlessLandProject(mockExtContext)
 
         sandbox.assert.calledOnce(wizardStub)
         sandbox.assert.calledOnce(metadataStub)
@@ -140,7 +140,7 @@ describe('launchProjectCreationWizard', () => {
 
 describe('downloadPatternCode', () => {
     let getPatternStub: sinon.SinonStub
-    const assertTelemetry = assertTelemetryCurried('serverlessland_downloadPattern')
+    const assertTelemetry = assertTelemetryCurried('lambda_downloadServerlessLandPattern')
 
     beforeEach(function () {
         getPatternStub = sinon.stub(downloadPatterns, 'getPattern')

packages/core/src/test/awsService/appBuilder/serverlessLand/wizard.test.ts

@@ -47,7 +47,7 @@ describe('CreateWizard', async () => {
                     Object.entries(parseMetadata.patterns).map(([key, pattern]) => {
                         options.find((option) => option.label === key && option.detail === pattern.description)
                     })
-                    assert.strictEqual(options[0].label, 'Image resizing')
+                    assert.strictEqual(options[0].label, 'Image Resizing')
                     quickPick.acceptItem(quickPick.items[0])
                 })
                 .handleQuickPick('Select Runtime', async (quickPick) => {
@@ -64,7 +64,7 @@ describe('CreateWizard', async () => {
                     quickPick.acceptItem(quickPick.items[0])
                 })
                 .handleInputBox('Enter Project Name', (inputBox) => {
-                    inputBox.acceptValue('python-cdk-project')
+                    inputBox.acceptValue('python-sam-project')
                 })
                 .build()
 
@@ -81,12 +81,10 @@ describe('CreateWizard', async () => {
 
             assert.ok(projectNode)
             const resourceNodes = await projectNode.getChildren()
-            console.log('resourceNodes', resourceNodes)
             assert.strictEqual(resourceNodes.length, 3)
             assert.ok(resourceNodes[0] instanceof ResourceNode)
 
             const lambdaResource = resourceNodes[2] as ResourceNode
-            console.log('retgbgbhtt', lambdaResource.resource.resource.Runtime)
             assert.strictEqual(lambdaResource.resource.resource.Runtime, 'python3.12')
 
             prompterTester.assertCallAll()