Improve stack traces, fix mac build arch (#295)

Author: satyakigh

.github/workflows/release.yml

@@ -92,7 +92,7 @@ jobs:
           VERSION=$(node -p "require('./package.json').version")
           NODE_VERSION=${{ matrix.node-version }}
           NODE_MAJOR=$(echo $NODE_VERSION | cut -d. -f1)
-          
+
           TAG=${{ needs.version-and-tag.outputs.tag }}
           if [[ "$TAG" =~ -alpha$ ]]; then
             FILE_NAME="${APP_NAME}-${VERSION}-alpha-linux-${{ matrix.arch }}-node${NODE_MAJOR}"
@@ -101,7 +101,7 @@ jobs:
           else
             FILE_NAME="${APP_NAME}-${VERSION}-linux-${{ matrix.arch }}-node${NODE_MAJOR}"
           fi
-          
+
           ASSET_NAME=$(echo "$FILE_NAME" | tr '[:upper:]' '[:lower:]')
           echo "ASSET_NAME=${ASSET_NAME}" >> $GITHUB_OUTPUT
 
@@ -117,17 +117,17 @@ jobs:
             /bin/bash -c '
               set -ex
               yum install -y make gcc-c++ python3 tar gzip wget tree
-          
+
               wget -q https://go.dev/dl/go${{ needs.get-configs.outputs.go-version }}.linux-${{ matrix.go-arch }}.tar.gz
               tar -C /usr/local -xzf go${{ needs.get-configs.outputs.go-version }}.linux-${{ matrix.go-arch }}.tar.gz
               export PATH=$PATH:/usr/local/go/bin
-          
+
               curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash
               export NVM_DIR="$HOME/.nvm"
               . "$NVM_DIR/nvm.sh"
               nvm install ${{ matrix.node-version }}
               nvm use ${{ matrix.node-version }}
-          
+
               npm ci
 
               TAG="${{ needs.version-and-tag.outputs.tag }}"
@@ -138,10 +138,10 @@ jobs:
               else
                 npm run bundle:prod
               fi
-          
+
               tree -f bundle/production/node_modules/tree-sitter
               tree -f bundle/production/node_modules/tree-sitter-json
-          
+
               GOARCH=${{ matrix.go-arch }} go build -C ./cfn-init/cmd -v -o ../../bundle/production/bin/cfn-init
               cp ./cfn-init/THIRD-PARTY-LICENSES.txt ./bundle/production/bin/
             '
@@ -161,7 +161,7 @@ jobs:
       fail-fast: true
       matrix:
         include:
-          - { os: "macos-latest", arch: "x64", platform: "darwin", go-arch: "amd64", node-version: "22.x" }
+          - { os: "macos-15-intel", arch: "x64", platform: "darwin", go-arch: "amd64", node-version: "22.x" }
           - { os: "macos-latest", arch: "arm64", platform: "darwin", go-arch: "arm64", node-version: "22.x" }
           - { os: "windows-latest", arch: "x64", platform: "win32", go-arch: "amd64", node-version: "22.x" }
           - { os: "windows-11-arm", arch: "arm64", platform: "win32", go-arch: "arm64", node-version: "22.x" }

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "@aws/cloudformation-languageserver",
   "displayName": "AWS CloudFormation",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "id": "aws-cloudformation-languageserver",
   "description": "AWS CloudFormation Language Server implementation",
   "publisher": "aws",

package.json

@@ -11,6 +11,7 @@ import { TelemetrySettings } from './TelemetryConfig';
 
 export class LoggerFactory implements Closeable {
     private static readonly MaxFileSize = 50 * 1024 * 1024; // 50MB
+    private static readonly FileName = `${ExtensionId}-${DateTime.utc().toFormat('yyyy-MM-dd')}.log`;
 
     private static _instance: LoggerFactory;
 
@@ -43,10 +44,7 @@ export class LoggerFactory implements Closeable {
                     {
                         target: 'pino/file',
                         options: {
-                            destination: join(
-                                this.logsDirectory,
-                                `${ExtensionId}-${DateTime.utc().toFormat('yyyy-MM-dd')}.log`,
-                            ),
+                            destination: join(this.logsDirectory, LoggerFactory.FileName),
                             mkdir: true,
                         },
                     },
@@ -74,17 +72,13 @@ export class LoggerFactory implements Closeable {
             const oneWeekAgo = DateTime.utc().minus({ weeks: 1 });
 
             for (const file of files) {
-                if (!file.endsWith('.log')) continue;
-
                 const filePath = join(this.logsDirectory, file);
                 const stats = await stat(filePath);
 
-                if (DateTime.fromJSDate(stats.mtime) < oneWeekAgo) {
+                if (file !== LoggerFactory.FileName && DateTime.fromJSDate(stats.mtime) < oneWeekAgo) {
                     await unlink(filePath);
                 }
             }
-
-            await this.trimLogs();
         } catch (err) {
             this.baseLogger.error(err, 'Error cleaning up old logs');
         }

src/telemetry/LoggerFactory.ts

@@ -48,7 +48,8 @@ Metrics includes the following metadata:
 | `RequestId` | Random unique identifier for each operation (UUID) | `5555-6666-7777-8888`                                       |
 
 ## Data Transmission
-Metrics export every 30 seconds via HTTPS with TLS 1.2+ encryption using OpenTelemetry Protocol (OTLP).
+Metrics export every 60 seconds via HTTPS with TLS 1.2+ encryption using OpenTelemetry Protocol (OTLP).
+All metrics are stored in AWS [us-east-1](https://docs.aws.amazon.com/global-infrastructure/latest/regions/aws-regions.html) region
 
 ## Enable or Disable Telemetry
 Your LSP client (AWS ToolKit, VSCode, JetBrains, etc.) controls telemetry enablement via initialization options. For example:

src/telemetry/README.md

@@ -1,3 +1,5 @@
+import os from 'os';
+import { resolve, basename } from 'path';
 import { ErrorCodes, ResponseError } from 'vscode-languageserver';
 import { toString } from './String';
 
@@ -20,30 +22,77 @@ export function handleLspError(error: unknown, contextMessage: string): never {
     throw new ResponseError(ErrorCodes.InternalError, `${contextMessage}: ${extractErrorMessage(error)}`);
 }
 
+const UserInfo = os.userInfo();
+const SensitiveInfo = [
+    UserInfo.username,
+    `${UserInfo.uid}`,
+    `${UserInfo.gid}`,
+    UserInfo.shell,
+    UserInfo.homedir,
+    resolve(__dirname),
+]
+    .filter((v): v is string => typeof v === 'string' && v.length > 0)
+    .sort((a, b) => b.length - a.length);
+
+const BaseDir = basename(resolve(__dirname));
+
+function sanitizePath(path: string): string {
+    let sanitized = path;
+
+    // Strip sensitive info first
+    for (const info of SensitiveInfo) {
+        sanitized = sanitized.replaceAll(info, 'REDACTED');
+    }
+
+    // Normalize path separators for consistent processing
+    const normalized = sanitized.replaceAll('\\', '/');
+
+    // Strip cloudformation-languageserver prefix
+    for (const partial of ['cloudformation-languageserver', BaseDir]) {
+        const idx = normalized.indexOf(partial);
+        if (idx !== -1) {
+            return '/' + normalized.slice(idx + partial.length + 1);
+        }
+    }
+
+    // Restore original separators if no prefix found
+    return sanitized;
+}
+
 /**
  * Best effort extraction of location of exception based on stack trace
  */
-export function extractLocationFromStack(stack?: string): {
-    'error.file'?: string;
-    'error.line'?: number;
-    'error.column'?: number;
-} {
+export function extractLocationFromStack(stack?: string): Record<string, string> {
     if (!stack) return {};
 
-    // Match first line with file location: at ... (/path/to/file.ts:line:column)
-    const match = stack.match(/at .+\((.+):(\d+):(\d+)\)|at (.+):(\d+):(\d+)/);
-    if (!match) return {};
+    const matches = [...stack.matchAll(/at (.*)/g)];
+
+    if (matches.length === 0) return {};
+
+    const result: Record<string, string> = {};
 
-    const fullPath = match[1] || match[4];
-    const line = parseInt(match[2] || match[5], 10); // eslint-disable-line unicorn/prefer-number-properties
-    const column = parseInt(match[3] || match[6], 10); // eslint-disable-line unicorn/prefer-number-properties
+    for (const [index, match] of matches.entries()) {
+        if (!match[1]) {
+            continue;
+        }
 
-    // Extract only filename without path
-    const filename = fullPath?.split('/').pop()?.split('\\').pop();
+        let line = match[1].trim();
+        if (!line) {
+            continue;
+        }
+
+        // Extract function name and path separately
+        const parenMatch = line.match(/^(.+?)\s+\((.+)\)$/);
+        if (parenMatch) {
+            const funcName = parenMatch[1];
+            const path = sanitizePath(parenMatch[2]);
+            line = `${funcName} (${path})`;
+        } else {
+            line = sanitizePath(line);
+        }
+
+        result[`stack${index}`] = line.trim();
+    }
 
-    return {
-        'error.file': filename,
-        'error.line': line,
-        'error.column': column,
-    };
+    return result;
 }