Use existing stack trace logic

Author: watson

packages/debugger/src/domain/stacktrace.spec.ts

@@ -5,7 +5,6 @@ describe('stacktrace', () => {
     it('should parse Chrome/V8 stack trace format with function names', () => {
       const error = {
         stack: `Error: test error
-    at captureStackTrace (http://example.com/stacktrace.js:1:1)
     at myFunction (http://example.com/app.js:42:10)
     at anotherFunction (http://example.com/app.js:100:5)`,
       } as Error
@@ -31,7 +30,6 @@ describe('stacktrace', () => {
     it('should parse Chrome/V8 stack trace format without function names', () => {
       const error = {
         stack: `Error: test error
-    at captureStackTrace (http://example.com/stacktrace.js:1:1)
     at http://example.com/app.js:42:10
     at http://example.com/app.js:100:5`,
       } as Error
@@ -57,7 +55,6 @@ describe('stacktrace', () => {
     it('should parse Firefox stack trace format', () => {
       const error = {
         stack: `test error
-captureStackTrace@http://example.com/stacktrace.js:1:1
 myFunction@http://example.com/app.js:42:10
 anotherFunction@http://example.com/app.js:100:5`,
       } as Error
@@ -83,7 +80,6 @@ anotherFunction@http://example.com/app.js:100:5`,
     it('should skip frames when skipFrames is specified', () => {
       const error = {
         stack: `Error: test error
-    at captureStackTrace (http://example.com/stacktrace.js:1:1)
     at frameToSkip (http://example.com/app.js:10:5)
     at myFunction (http://example.com/app.js:42:10)
     at anotherFunction (http://example.com/app.js:100:5)`,
@@ -126,7 +122,6 @@ anotherFunction@http://example.com/app.js:100:5`,
     it('should skip malformed stack lines', () => {
       const error = {
         stack: `Error: test error
-    at captureStackTrace (http://example.com/stacktrace.js:1:1)
     at myFunction (http://example.com/app.js:42:10)
     some malformed line without proper format
     at anotherFunction (http://example.com/app.js:100:5)`,
@@ -153,7 +148,6 @@ anotherFunction@http://example.com/app.js:100:5`,
     it('should handle file paths with spaces', () => {
       const error = {
         stack: `Error: test error
-    at captureStackTrace (http://example.com/stacktrace.js:1:1)
     at myFunction (http://example.com/my app.js:42:10)`,
       } as Error
 
@@ -168,25 +162,6 @@ anotherFunction@http://example.com/app.js:100:5`,
         },
       ])
     })
-
-    it('should trim whitespace from function and file names', () => {
-      const error = {
-        stack: `Error: test error
-    at captureStackTrace (http://example.com/stacktrace.js:1:1)
-    at  myFunction  ( http://example.com/app.js :42:10)`,
-      } as Error
-
-      const result = parseStackTrace(error)
-
-      expect(result).toEqual([
-        {
-          fileName: 'http://example.com/app.js',
-          function: 'myFunction',
-          lineNumber: 42,
-          columnNumber: 10,
-        },
-      ])
-    })
   })
 
   describe('captureStackTrace', () => {
@@ -205,16 +180,16 @@ anotherFunction@http://example.com/app.js:100:5`,
     })
 
     it('should skip frames when specified', () => {
-      function testFunction() {
-        return captureStackTrace(0)
+      function testFunction(skipFrames = 0) {
+        return captureStackTrace(skipFrames)
       }
 
       function wrapperFunction() {
         return testFunction()
       }
 
       const resultWithoutSkip = wrapperFunction()
-      const resultWithSkip = captureStackTrace(1)
+      const resultWithSkip = testFunction(1)
 
       // When skipping frames, we should have fewer frames
       expect(resultWithSkip.length).toBeLessThan(resultWithoutSkip.length)

packages/debugger/src/domain/stacktrace.ts

@@ -1,3 +1,6 @@
+import type { StackTrace } from '@datadog/browser-core'
+import { computeStackTrace } from '@datadog/browser-core'
+
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions -- `type` is needed for implicit index signature compatibility with Context
 export type StackFrame = {
   fileName: string
@@ -14,48 +17,47 @@ export type StackFrame = {
  */
 export function captureStackTrace(skipFrames = 0): StackFrame[] {
   const error = new Error()
-  return parseStackTrace(error, skipFrames)
+  const stackTrace = computeStackTrace(error)
+
+  // Skip this helper itself so callers get their own frame first.
+  return mapStackFrames(stackTrace.stack, 1 + skipFrames)
 }
 
 /**
  * Parse a stack trace from an Error object
  *
  * @param error - Error object with stack property
- * @param skipFrames - Number of frames to skip from the top of the stack (default: 0)
+ * @param skipFrames - Number of frames to skip from the top of the parsed stack (default: 0)
  * @returns Array of stack frames
  */
 export function parseStackTrace(error: Error, skipFrames = 0): StackFrame[] {
-  const stack: StackFrame[] = []
-  if (!error.stack) {
-    return stack
+  return mapStackFrames(computeStackTrace(error).stack, skipFrames)
+}
+
+function mapStackFrame(frame: StackTrace['stack'][number]): StackFrame | undefined {
+  if (!frame.url || frame.line === undefined || frame.column === undefined) {
+    return
   }
-  const stackLines = error.stack.split('\n')
-
-  // Skip the first line (error message), the captureStackTrace frame, and any additional frames to skip
-  for (let i = 2 + skipFrames; i < stackLines.length; i++) {
-    const line = stackLines[i].trim()
-
-    // Match various stack frame formats:
-    // Chrome/V8: "at functionName (file:line:column)" or "at file:line:column"
-    // Firefox: "functionName@file:line:column"
-    const chromeMatch = line.match(/at\s+(?:(.+?)\s+\()?(.+?):(\d+):(\d+)\)?/)
-    const firefoxMatch = line.match(/(.+?)@(.+?):(\d+):(\d+)/)
-
-    const match = chromeMatch || firefoxMatch
-    if (match) {
-      const functionName = match[1] || ''
-      const fileName = match[2]
-      const lineNumber = parseInt(match[3], 10)
-      const columnNumber = parseInt(match[4], 10)
-
-      stack.push({
-        fileName: fileName.trim(),
-        function: functionName.trim(),
-        lineNumber,
-        columnNumber,
-      })
-    }
+
+  return {
+    fileName: frame.url.trim(),
+    function: frame.func === '?' || !frame.func ? '' : frame.func.trim(),
+    lineNumber: frame.line,
+    columnNumber: frame.column,
   }
+}
+
+function mapStackFrames(stack: StackTrace['stack'], skipFrames = 0): StackFrame[] {
+  return stack.reduce<StackFrame[]>((result, frame, index) => {
+    if (index < skipFrames) {
+      return result
+    }
+
+    const mappedFrame = mapStackFrame(frame)
+    if (mappedFrame) {
+      result.push(mappedFrame)
+    }
 
-  return stack
+    return result
+  }, [])
 }