Merge branch 'main' into AXON-106-Support-Jira-Checklist-plugin-tasks-and-decisions

Author: BHulovatyi

package.json

@@ -46,7 +46,7 @@
     ],
     "main": "./build/extension/extension",
     "rovoDev": {
-        "version": "0.12.14"
+        "version": "0.12.16"
     },
     "scripts": {
         "vscode:uninstall": "node ./build/extension/uninstall.js",
@@ -517,6 +517,11 @@
                 "command": "atlascode.debug.quickLogout",
                 "title": "[DEBUG] Atlassian: Quick logout",
                 "enablement": "atlascode:debugMode"
+            },
+            {
+                "command": "atlascode.addRecommendedExtension",
+                "title": "Add as Recommended Extension",
+                "category": "Atlassian"
             }
         ],
         "viewsContainers": {

src/analytics.test.ts

@@ -264,7 +264,7 @@ describe('analytics', () => {
             expect(event.trackEvent.attributes.additionalParams).toEqual(additionalParams);
         });
 
-        it('should sanitize stack traces in errorEvent', async () => {
+        it('should sanitize stack traces in errorEvent (/Users)', async () => {
             const errorMessage = 'Test error message';
             const error = new Error('Test error');
             error.stack = 'Error: Test error\n    at TestFunction (/Users/realuser/test.js:10:15)';
@@ -276,6 +276,30 @@ describe('analytics', () => {
             expect(event.trackEvent.attributes.stack).not.toContain('/Users/realuser/');
         });
 
+        it('should sanitize stack traces in errorEvent (/home)', async () => {
+            const errorMessage = 'Test error message';
+            const error = new Error('Test error');
+            error.stack = 'Error: Test error\n    at TestFunction (/home/realuser/test.js:10:15)';
+
+            const event = await analytics.errorEvent(undefined, errorMessage, error);
+
+            // Check if the username was sanitized
+            expect(event.trackEvent.attributes.stack).toContain('/home/<user>/');
+            expect(event.trackEvent.attributes.stack).not.toContain('/home/realuser/');
+        });
+
+        it('should sanitize stack traces in errorEvent (c:\\Users)', async () => {
+            const errorMessage = 'Test error message';
+            const error = new Error('Test error');
+            error.stack = 'Error: Test error\n    at TestFunction (c:\\Users\\realuser\\test.js:10:15)';
+
+            const event = await analytics.errorEvent(undefined, errorMessage, error);
+
+            // Check if the username was sanitized
+            expect(event.trackEvent.attributes.stack).toContain('c:\\Users\\<user>\\');
+            expect(event.trackEvent.attributes.stack).not.toContain('c:\\Users\\realuser\\');
+        });
+
         it('should create uiErrorEvent with UI error information', async () => {
             const errorInfo: UIErrorInfo = {
                 view: 'test-view',

src/analytics.ts

@@ -145,6 +145,7 @@ function sanitazeErrorMessage(message?: string): string | undefined {
 function sanitizeStackTrace(stack?: string): string | undefined {
     if (stack) {
         stack = stack.replace(/\/Users\/[^/]+\//gi, '/Users/<user>/'); // *nix Users folder
+        stack = stack.replace(/\/home\/[^/]+\//gi, '/home/<user>/'); // *nix home folder
         stack = stack.replace(/\\Users\\[^\\]+\\/gi, '\\Users\\<user>\\'); // windows Users folder
     }
     return stack || undefined;
@@ -521,6 +522,12 @@ export async function pmfClosed(): Promise<TrackEvent> {
     return trackEvent('closed', 'atlascodePmf');
 }
 
+export async function addRecommendedExtensionTriggeredEvent(source: string): Promise<TrackEvent> {
+    return trackEvent('triggered', 'addRecommendedExtension', {
+        attributes: { source: source },
+    });
+}
+
 export type DeepLinkEventErrorType = 'Success' | 'NotFound' | 'Exception';
 
 export async function deepLinkEvent(

src/commands.ts

@@ -10,6 +10,7 @@ import {
 } from './analytics';
 import { BasicAuthInfo, DetailedSiteInfo, ProductBitbucket, ProductJira } from './atlclients/authInfo';
 import { showBitbucketDebugInfo } from './bitbucket/bbDebug';
+import { addAtlascodeAsRecommendedExtension } from './commands/addRecommendedExtension';
 import { rerunPipeline } from './commands/bitbucket/rerunPipeline';
 import { runPipeline } from './commands/bitbucket/runPipeline';
 import { assignIssue } from './commands/jira/assignIssue';
@@ -237,6 +238,7 @@ export function registerCommands(vscodeContext: ExtensionContext) {
                     });
                 }
             }),
+            commands.registerCommand(Commands.AddRecommendedExtension, addAtlascodeAsRecommendedExtension),
         );
     } else {
         vscodeContext.subscriptions.push(
@@ -449,6 +451,7 @@ export function registerCommands(vscodeContext: ExtensionContext) {
                     });
                 }
             }),
+            commands.registerCommand(Commands.AddRecommendedExtension, addAtlascodeAsRecommendedExtension),
         );
     }
 }