ref: Make it easier to use stackParser

AbhiPrasad · AbhiPrasad · commit 5fab95a07c50 · 2022-04-29T14:59:03.000-04:00
diff --git a/packages/browser/src/eventbuilder.ts b/packages/browser/src/eventbuilder.ts
@@ -14,7 +14,7 @@ import {
 } from '@sentry/utils';
 
 /**
- * This function creates an exception from an TraceKitStackTrace
+ * This function creates an exception from a JavaScript Error
  */
 export function exceptionFromError(stackParser: StackParser, ex: Error): Exception {
   // Get the frames first since Opera can lose the stack if we touch anything else first
diff --git a/packages/browser/src/exports.ts b/packages/browser/src/exports.ts
@@ -45,12 +45,13 @@ export {
 
 export { BrowserClient } from './client';
 export {
-  defaultStackParsers,
-  chromeStackParser,
-  geckoStackParser,
-  opera10StackParser,
-  opera11StackParser,
-  winjsStackParser,
+  defaultStackParser,
+  defaultStackLineParsers,
+  chromeStackLineParser,
+  geckoStackLineParser,
+  opera10StackLineParser,
+  opera11StackLineParser,
+  winjsStackLineParser,
 } from './stack-parsers';
 export { defaultIntegrations, forceLoad, init, lastEventId, onLoad, showReportDialog, flush, close, wrap } from './sdk';
 export { SDK_NAME } from './version';
diff --git a/packages/browser/src/sdk.ts b/packages/browser/src/sdk.ts
@@ -11,15 +11,15 @@ import {
   getGlobalObject,
   logger,
   resolvedSyncPromise,
-  stackParserFromOptions,
+  stackParserFromStackParserOptions,
   supportsFetch,
 } from '@sentry/utils';
 
 import { BrowserClient, BrowserClientOptions, BrowserOptions } from './client';
 import { IS_DEBUG_BUILD } from './flags';
 import { ReportDialogOptions, wrap as internalWrap } from './helpers';
 import { Breadcrumbs, Dedupe, GlobalHandlers, LinkedErrors, TryCatch, UserAgent } from './integrations';
-import { defaultStackParsers } from './stack-parsers';
+import { defaultStackParser } from './stack-parsers';
 import { makeFetchTransport, makeXHRTransport } from './transports';
 
 export const defaultIntegrations = [
@@ -110,7 +110,7 @@ export function init(options: BrowserOptions = {}): void {
 
   const clientOptions: BrowserClientOptions = {
     ...options,
-    stackParser: stackParserFromOptions(options.stackParser || defaultStackParsers),
+    stackParser: stackParserFromStackParserOptions(options.stackParser || defaultStackParser),
     integrations: getIntegrationsToSetup(options),
     transport: options.transport || (supportsFetch() ? makeFetchTransport : makeXHRTransport),
   };
diff --git a/packages/browser/src/stack-parsers.ts b/packages/browser/src/stack-parsers.ts
@@ -1,4 +1,5 @@
 import { StackFrame, StackLineParser, StackLineParserFn } from '@sentry/types';
+import { createStackParser } from '@sentry/utils';
 
 // global reference to slice
 const UNKNOWN_FUNCTION = '?';
@@ -60,7 +61,7 @@ const chrome: StackLineParserFn = line => {
   return;
 };
 
-export const chromeStackParser: StackLineParser = [CHROME_PRIORITY, chrome];
+export const chromeStackLineParser: StackLineParser = [CHROME_PRIORITY, chrome];
 
 // gecko regex: `(?:bundle|\d+\.js)`: `bundle` is for react native, `\d+\.js` also but specifically for ram bundles because it
 // generates filenames without a prefix like `file://` the filenames in the stacktrace are just 42.js
@@ -96,7 +97,7 @@ const gecko: StackLineParserFn = line => {
   return;
 };
 
-export const geckoStackParser: StackLineParser = [GECKO_PRIORITY, gecko];
+export const geckoStackLineParser: StackLineParser = [GECKO_PRIORITY, gecko];
 
 const winjsRegex =
   /^\s*at (?:((?:\[object object\])?.+) )?\(?((?:file|ms-appx|https?|webpack|blob):.*?):(\d+)(?::(\d+))?\)?\s*$/i;
@@ -109,7 +110,7 @@ const winjs: StackLineParserFn = line => {
     : undefined;
 };
 
-export const winjsStackParser: StackLineParser = [WINJS_PRIORITY, winjs];
+export const winjsStackLineParser: StackLineParser = [WINJS_PRIORITY, winjs];
 
 const opera10Regex = / line (\d+).*script (?:in )?(\S+)(?:: in function (\S+))?$/i;
 
@@ -118,7 +119,7 @@ const opera10: StackLineParserFn = line => {
   return parts ? createFrame(parts[2], parts[3] || UNKNOWN_FUNCTION, +parts[1]) : undefined;
 };
 
-export const opera10StackParser: StackLineParser = [OPERA10_PRIORITY, opera10];
+export const opera10StackLineParser: StackLineParser = [OPERA10_PRIORITY, opera10];
 
 const opera11Regex =
   / line (\d+), column (\d+)\s*(?:in (?:<anonymous function: ([^>]+)>|([^)]+))\(.*\))? in (.*):\s*$/i;
@@ -128,9 +129,11 @@ const opera11: StackLineParserFn = line => {
   return parts ? createFrame(parts[5], parts[3] || parts[4] || UNKNOWN_FUNCTION, +parts[1], +parts[2]) : undefined;
 };
 
-export const opera11StackParser: StackLineParser = [OPERA11_PRIORITY, opera11];
+export const opera11StackLineParser: StackLineParser = [OPERA11_PRIORITY, opera11];
 
-export const defaultStackParsers = [chromeStackParser, geckoStackParser, winjsStackParser];
+export const defaultStackLineParsers = [chromeStackLineParser, geckoStackLineParser, winjsStackLineParser];
+
+export const defaultStackParser = createStackParser(...defaultStackLineParsers);
 
 /**
  * Safari web extensions, starting version unknown, can produce "frames-only" stacktraces.
diff --git a/packages/browser/test/unit/integrations/linkederrors.test.ts b/packages/browser/test/unit/integrations/linkederrors.test.ts
@@ -1,13 +1,10 @@
 import { Event as SentryEvent, Exception, ExtendedError } from '@sentry/types';
-import { createStackParser } from '@sentry/utils';
 
 import { BrowserClient } from '../../../src/client';
 import * as LinkedErrorsModule from '../../../src/integrations/linkederrors';
-import { defaultStackParsers } from '../../../src/stack-parsers';
+import { defaultStackParser as parser } from '../../../src/stack-parsers';
 import { getDefaultBrowserClientOptions } from '../helper/browser-client-options';
 
-const parser = createStackParser(...defaultStackParsers);
-
 type EventWithException = SentryEvent & {
   exception: {
     values: Exception[];
diff --git a/packages/browser/test/unit/tracekit/chromium.test.ts b/packages/browser/test/unit/tracekit/chromium.test.ts
@@ -1,9 +1,5 @@
-import { createStackParser } from '@sentry/utils';
-
 import { exceptionFromError } from '../../../src/eventbuilder';
-import { defaultStackParsers } from '../../../src/stack-parsers';
-
-const parser = createStackParser(...defaultStackParsers);
+import { defaultStackParser as parser } from '../../../src/stack-parsers';
 
 describe('Tracekit - Chrome Tests', () => {
   it('should parse Chrome error with no location', () => {
diff --git a/packages/browser/test/unit/tracekit/firefox.test.ts b/packages/browser/test/unit/tracekit/firefox.test.ts
@@ -1,9 +1,5 @@
-import { createStackParser } from '@sentry/utils';
-
 import { exceptionFromError } from '../../../src/eventbuilder';
-import { defaultStackParsers } from '../../../src/stack-parsers';
-
-const parser = createStackParser(...defaultStackParsers);
+import { defaultStackParser as parser } from '../../../src/stack-parsers';
 
 describe('Tracekit - Firefox Tests', () => {
   it('should parse Firefox 3 error', () => {
diff --git a/packages/browser/test/unit/tracekit/ie.test.ts b/packages/browser/test/unit/tracekit/ie.test.ts
@@ -1,9 +1,5 @@
-import { createStackParser } from '@sentry/utils';
-
 import { exceptionFromError } from '../../../src/eventbuilder';
-import { defaultStackParsers } from '../../../src/stack-parsers';
-
-const parser = createStackParser(...defaultStackParsers);
+import { defaultStackParser as parser } from '../../../src/stack-parsers';
 
 describe('Tracekit - IE Tests', () => {
   it('should parse IE 10 error', () => {
diff --git a/packages/browser/test/unit/tracekit/misc.test.ts b/packages/browser/test/unit/tracekit/misc.test.ts
@@ -1,9 +1,5 @@
-import { createStackParser } from '@sentry/utils';
-
 import { exceptionFromError } from '../../../src/eventbuilder';
-import { defaultStackParsers } from '../../../src/stack-parsers';
-
-const parser = createStackParser(...defaultStackParsers);
+import { defaultStackParser as parser } from '../../../src/stack-parsers';
 
 describe('Tracekit - Misc Tests', () => {
   it('should parse PhantomJS 1.19 error', () => {
diff --git a/packages/browser/test/unit/tracekit/opera.test.ts b/packages/browser/test/unit/tracekit/opera.test.ts
@@ -1,10 +1,10 @@
 import { createStackParser } from '@sentry/utils';
 
 import { exceptionFromError } from '../../../src/eventbuilder';
-import { defaultStackParsers, opera10StackParser, opera11StackParser } from '../../../src/stack-parsers';
+import { defaultStackParser, opera10StackLineParser, opera11StackLineParser } from '../../../src/stack-parsers';
 
-const operaParser = createStackParser(opera10StackParser, opera11StackParser);
-const chromiumParser = createStackParser(...defaultStackParsers);
+const operaParser = createStackParser(opera10StackLineParser, opera11StackLineParser);
+const chromiumParser = defaultStackParser;
 
 describe('Tracekit - Opera Tests', () => {
   it('should parse Opera 10 error', () => {
diff --git a/packages/browser/test/unit/tracekit/react-native.test.ts b/packages/browser/test/unit/tracekit/react-native.test.ts
@@ -1,9 +1,5 @@
-import { createStackParser } from '@sentry/utils';
-
 import { exceptionFromError } from '../../../src/eventbuilder';
-import { defaultStackParsers } from '../../../src/stack-parsers';
-
-const parser = createStackParser(...defaultStackParsers);
+import { defaultStackParser as parser } from '../../../src/stack-parsers';
 
 describe('Tracekit - React Native Tests', () => {
   it('should parse exceptions for react-native-v8', () => {
diff --git a/packages/browser/test/unit/tracekit/react.test.ts b/packages/browser/test/unit/tracekit/react.test.ts
@@ -1,9 +1,5 @@
-import { createStackParser } from '@sentry/utils';
-
 import { exceptionFromError } from '../../../src/eventbuilder';
-import { defaultStackParsers } from '../../../src/stack-parsers';
-
-const parser = createStackParser(...defaultStackParsers);
+import { defaultStackParser as parser } from '../../../src/stack-parsers';
 
 describe('Tracekit - React Tests', () => {
   it('should correctly parse Invariant Violation errors and use framesToPop to drop info message', () => {
diff --git a/packages/browser/test/unit/tracekit/safari.test.ts b/packages/browser/test/unit/tracekit/safari.test.ts
@@ -1,9 +1,5 @@
-import { createStackParser } from '@sentry/utils';
-
 import { exceptionFromError } from '../../../src/eventbuilder';
-import { defaultStackParsers } from '../../../src/stack-parsers';
-
-const parser = createStackParser(...defaultStackParsers);
+import { defaultStackParser as parser } from '../../../src/stack-parsers';
 
 describe('Tracekit - Safari Tests', () => {
   it('should parse Safari 6 error', () => {
diff --git a/packages/node/src/index.ts b/packages/node/src/index.ts
@@ -46,7 +46,7 @@ export { NodeClient } from './client';
 export { defaultIntegrations, init, lastEventId, flush, close, getSentryRelease } from './sdk';
 export { deepReadDirSync } from './utils';
 export { SDK_NAME } from './version';
-export { nodeStackParser } from './stack-parser';
+export { defaultStackParser } from './stack-parser';
 
 import { Integrations as CoreIntegrations } from '@sentry/core';
 import { getMainCarrier } from '@sentry/hub';
diff --git a/packages/node/src/sdk.ts b/packages/node/src/sdk.ts
@@ -1,13 +1,13 @@
 import { getCurrentHub, getIntegrationsToSetup, initAndBind, Integrations as CoreIntegrations } from '@sentry/core';
 import { getMainCarrier, setHubOnCarrier } from '@sentry/hub';
 import { SessionStatus } from '@sentry/types';
-import { getGlobalObject, logger, stackParserFromOptions } from '@sentry/utils';
+import { getGlobalObject, logger, stackParserFromStackParserOptions } from '@sentry/utils';
 import * as domain from 'domain';
 
 import { NodeClient } from './client';
 import { IS_DEBUG_BUILD } from './flags';
 import { Console, ContextLines, Http, LinkedErrors, OnUncaughtException, OnUnhandledRejection } from './integrations';
-import { nodeStackParser } from './stack-parser';
+import { defaultStackParser } from './stack-parser';
 import { makeNodeTransport } from './transports';
 import { NodeClientOptions, NodeOptions } from './types';
 
@@ -130,7 +130,7 @@ export function init(options: NodeOptions = {}): void {
   // TODO(v7): Refactor this to reduce the logic above
   const clientOptions: NodeClientOptions = {
     ...options,
-    stackParser: stackParserFromOptions(options.stackParser || [nodeStackParser]),
+    stackParser: stackParserFromStackParserOptions(options.stackParser || defaultStackParser),
     integrations: getIntegrationsToSetup(options),
     transport: options.transport || makeNodeTransport,
   };
diff --git a/packages/node/src/stack-parser.ts b/packages/node/src/stack-parser.ts
@@ -1,5 +1,5 @@
 import { StackLineParser, StackLineParserFn } from '@sentry/types';
-import { basename, dirname } from '@sentry/utils';
+import { basename, createStackParser, dirname } from '@sentry/utils';
 
 /** Gets the module */
 function getModule(filename: string | undefined): string | undefined {
@@ -114,4 +114,6 @@ const node: StackLineParserFn = (line: string) => {
   };
 };
 
-export const nodeStackParser: StackLineParser = [90, node];
+export const nodeStackLineParser: StackLineParser = [90, node];
+
+export const defaultStackParser = createStackParser(nodeStackLineParser);
diff --git a/packages/node/test/integrations/linkederrors.test.ts b/packages/node/test/integrations/linkederrors.test.ts
@@ -1,13 +1,10 @@
 import { ExtendedError } from '@sentry/types';
-import { createStackParser } from '@sentry/utils';
 
 import { Event, NodeClient } from '../../src';
 import { LinkedErrors } from '../../src/integrations/linkederrors';
-import { nodeStackParser } from '../../src/stack-parser';
+import { defaultStackParser as stackParser } from '../../src/stack-parser';
 import { getDefaultNodeClientOptions } from '../helper/node-client-options';
 
-const stackParser = createStackParser(nodeStackParser);
-
 let linkedErrors: any;
 
 describe('LinkedErrors', () => {
diff --git a/packages/node/test/stacktrace.test.ts b/packages/node/test/stacktrace.test.ts
@@ -10,12 +10,8 @@
  * @license MIT
  */
 
-import { createStackParser } from '@sentry/utils';
-
 import { parseStackFrames } from '../src/eventbuilder';
-import { nodeStackParser } from '../src/stack-parser';
-
-const stackParser = createStackParser(nodeStackParser);
+import { defaultStackParser as stackParser } from '../src/stack-parser';
 
 function testBasic() {
   return new Error('something went wrong');
diff --git a/packages/utils/src/stacktrace.ts b/packages/utils/src/stacktrace.ts
@@ -36,7 +36,7 @@ export function createStackParser(...parsers: StackLineParser[]): StackParser {
  *
  * If options contains an array of line parsers, it is converted into a parser
  */
-export function stackParserFromOptions(stackParser: StackParser | StackLineParser[]): StackParser {
+export function stackParserFromStackParserOptions(stackParser: StackParser | StackLineParser[]): StackParser {
   if (Array.isArray(stackParser)) {
     return createStackParser(...stackParser);
   }
