use literal values in place of Severity enum values

lobsterkatie · lobsterkatie · commit ab8aa73f45a8 · 2022-04-11T16:28:12.000-07:00
diff --git a/packages/browser/src/backend.ts b/packages/browser/src/backend.ts
@@ -39,7 +39,7 @@ export class BrowserBackend extends BaseBackend<BrowserOptions> {
   /**
    * @inheritDoc
    */
-  public eventFromMessage(message: string, level: Severity = Severity.Info, hint?: EventHint): PromiseLike<Event> {
+  public eventFromMessage(message: string, level: Severity = 'info' as Severity, hint?: EventHint): PromiseLike<Event> {
     return eventFromMessage(message, level, hint, this._options.attachStacktrace);
   }
 
diff --git a/packages/browser/src/eventbuilder.ts b/packages/browser/src/eventbuilder.ts
@@ -162,7 +162,7 @@ export function eventFromException(
   const syntheticException = (hint && hint.syntheticException) || undefined;
   const event = eventFromUnknownInput(exception, syntheticException, attachStacktrace);
   addExceptionMechanism(event); // defaults to { type: 'generic', handled: true }
-  event.level = Severity.Error;
+  event.level = 'error' as Severity;
   if (hint && hint.event_id) {
     event.event_id = hint.event_id;
   }
@@ -175,7 +175,7 @@ export function eventFromException(
  */
 export function eventFromMessage(
   message: string,
-  level: Severity = Severity.Info,
+  level: Severity = 'info' as Severity,
   hint?: EventHint,
   attachStacktrace?: boolean,
 ): PromiseLike<Event> {
diff --git a/packages/browser/src/integrations/breadcrumbs.ts b/packages/browser/src/integrations/breadcrumbs.ts
@@ -230,7 +230,7 @@ function _fetchBreadcrumb(handlerData: { [key: string]: any }): void {
       {
         category: 'fetch',
         data: handlerData.fetchData,
-        level: Severity.Error,
+        level: 'error' as Severity,
         type: 'http',
       },
       {
diff --git a/packages/browser/src/integrations/globalhandlers.ts b/packages/browser/src/integrations/globalhandlers.ts
@@ -98,7 +98,7 @@ function _installGlobalOnErrorHandler(): void {
               column,
             );
 
-      event.level = Severity.Error;
+      event.level = 'error' as Severity;
 
       addMechanismAndCapture(hub, error, event, 'onerror');
     },
@@ -144,7 +144,7 @@ function _installGlobalOnUnhandledRejectionHandler(): void {
         ? _eventFromRejectionWithPrimitive(error)
         : eventFromUnknownInput(error, undefined, attachStacktrace, true);
 
-      event.level = Severity.Error;
+      event.level = 'error' as Severity;
 
       addMechanismAndCapture(hub, error, event, 'onunhandledrejection');
       return;
diff --git a/packages/core/test/mocks/backend.ts b/packages/core/test/mocks/backend.ts
@@ -38,7 +38,7 @@ export class TestBackend extends BaseBackend<TestOptions> {
     });
   }
 
-  public eventFromMessage(message: string, level: Severity = Severity.Info): PromiseLike<Event> {
+  public eventFromMessage(message: string, level: Severity = 'info' as Severity): PromiseLike<Event> {
     return resolvedSyncPromise({ message, level });
   }
 
diff --git a/packages/hub/test/scope.test.ts b/packages/hub/test/scope.test.ts
@@ -85,8 +85,8 @@ describe('Scope', () => {
 
     test('setLevel', () => {
       const scope = new Scope();
-      scope.setLevel(Severity.Critical);
-      expect((scope as any)._level).toEqual(Severity.Critical);
+      scope.setLevel('critical' as Severity);
+      expect((scope as any)._level).toEqual('critical' as Severity);
     });
 
     test('setTransactionName', () => {
@@ -137,8 +137,8 @@ describe('Scope', () => {
 
     test('chaining', () => {
       const scope = new Scope();
-      scope.setLevel(Severity.Critical).setUser({ id: '1' });
-      expect((scope as any)._level).toEqual(Severity.Critical);
+      scope.setLevel('critical' as Severity).setUser({ id: '1' });
+      expect((scope as any)._level).toEqual('critical' as Severity);
       expect((scope as any)._user).toEqual({ id: '1' });
     });
   });
@@ -202,7 +202,7 @@ describe('Scope', () => {
       scope.setTag('a', 'b');
       scope.setUser({ id: '1' });
       scope.setFingerprint(['abcd']);
-      scope.setLevel(Severity.Warning);
+      scope.setLevel('warning' as Severity);
       scope.setTransactionName('/abc');
       scope.addBreadcrumb({ message: 'test' });
       scope.setContext('os', { id: '1' });
@@ -294,11 +294,11 @@ describe('Scope', () => {
     test('scope level should have priority over event level', () => {
       expect.assertions(1);
       const scope = new Scope();
-      scope.setLevel(Severity.Warning);
+      scope.setLevel('warning' as Severity);
       const event: Event = {};
-      event.level = Severity.Critical;
+      event.level = 'critical' as Severity;
       return scope.applyToEvent(event).then(processedEvent => {
-        expect(processedEvent!.level).toEqual(Severity.Warning);
+        expect(processedEvent!.level).toEqual('warning' as Severity);
       });
     });
 
@@ -410,7 +410,7 @@ describe('Scope', () => {
       scope.setContext('foo', { id: '1' });
       scope.setContext('bar', { id: '2' });
       scope.setUser({ id: '1337' });
-      scope.setLevel(Severity.Info);
+      scope.setLevel('info' as Severity);
       scope.setFingerprint(['foo']);
       scope.setRequestSession({ status: 'ok' });
     });
@@ -458,7 +458,7 @@ describe('Scope', () => {
       localScope.setContext('bar', { id: '3' });
       localScope.setContext('baz', { id: '4' });
       localScope.setUser({ id: '42' });
-      localScope.setLevel(Severity.Warning);
+      localScope.setLevel('warning' as Severity);
       localScope.setFingerprint(['bar']);
       (localScope as any)._requestSession = { status: 'ok' };
 
diff --git a/packages/minimal/test/lib/minimal.test.ts b/packages/minimal/test/lib/minimal.test.ts
@@ -165,8 +165,8 @@ describe('Minimal', () => {
       const client: any = new TestClient({});
       const scope = getCurrentHub().pushScope();
       getCurrentHub().bindClient(client);
-      scope.setLevel(Severity.Warning);
-      expect(global.__SENTRY__.hub._stack[1].scope._level).toEqual(Severity.Warning);
+      scope.setLevel('warning' as Severity);
+      expect(global.__SENTRY__.hub._stack[1].scope._level).toEqual('warning' as Severity);
     });
   });
 
@@ -245,16 +245,16 @@ describe('Minimal', () => {
 
   test('withScope', () => {
     withScope(scope => {
-      scope.setLevel(Severity.Warning);
+      scope.setLevel('warning' as Severity);
       scope.setFingerprint(['1']);
       withScope(scope2 => {
-        scope2.setLevel(Severity.Info);
+        scope2.setLevel('info' as Severity);
         scope2.setFingerprint(['2']);
         withScope(scope3 => {
           scope3.clear();
-          expect(global.__SENTRY__.hub._stack[1].scope._level).toEqual(Severity.Warning);
+          expect(global.__SENTRY__.hub._stack[1].scope._level).toEqual('warning' as Severity);
           expect(global.__SENTRY__.hub._stack[1].scope._fingerprint).toEqual(['1']);
-          expect(global.__SENTRY__.hub._stack[2].scope._level).toEqual(Severity.Info);
+          expect(global.__SENTRY__.hub._stack[2].scope._level).toEqual('info' as Severity);
           expect(global.__SENTRY__.hub._stack[2].scope._fingerprint).toEqual(['2']);
           expect(global.__SENTRY__.hub._stack[3].scope._level).toBeUndefined();
         });
diff --git a/packages/node-integration-tests/suites/public-api/addBreadcrumb/multiple_breadcrumbs/scenario.ts b/packages/node-integration-tests/suites/public-api/addBreadcrumb/multiple_breadcrumbs/scenario.ts
@@ -8,7 +8,7 @@ Sentry.init({
 Sentry.addBreadcrumb({
   category: 'foo',
   message: 'bar',
-  level: Sentry.Severity.Critical,
+  level: 'critical' as Sentry.Severity,
 });
 
 Sentry.addBreadcrumb({
diff --git a/packages/node-integration-tests/suites/public-api/addBreadcrumb/simple_breadcrumb/scenario.ts b/packages/node-integration-tests/suites/public-api/addBreadcrumb/simple_breadcrumb/scenario.ts
@@ -8,7 +8,7 @@ Sentry.init({
 Sentry.addBreadcrumb({
   category: 'foo',
   message: 'bar',
-  level: Sentry.Severity.Critical,
+  level: 'critical' as Sentry.Severity,
 });
 
 Sentry.captureMessage('test_simple');
diff --git a/packages/node-integration-tests/suites/public-api/captureMessage/with_level/scenario.ts b/packages/node-integration-tests/suites/public-api/captureMessage/with_level/scenario.ts
@@ -5,10 +5,10 @@ Sentry.init({
   release: '1.0',
 });
 
-Sentry.captureMessage('debug_message', Sentry.Severity.Debug);
-Sentry.captureMessage('info_message', Sentry.Severity.Info);
-Sentry.captureMessage('warning_message', Sentry.Severity.Warning);
-Sentry.captureMessage('error_message', Sentry.Severity.Error);
-Sentry.captureMessage('fatal_message', Sentry.Severity.Fatal);
-Sentry.captureMessage('critical_message', Sentry.Severity.Critical);
-Sentry.captureMessage('log_message', Sentry.Severity.Log);
+Sentry.captureMessage('debug_message', 'debug' as Sentry.Severity);
+Sentry.captureMessage('info_message', 'info' as Sentry.Severity);
+Sentry.captureMessage('warning_message', 'warning' as Sentry.Severity);
+Sentry.captureMessage('error_message', 'error' as Sentry.Severity);
+Sentry.captureMessage('fatal_message', 'fatal' as Sentry.Severity);
+Sentry.captureMessage('critical_message', 'critical' as Sentry.Severity);
+Sentry.captureMessage('log_message', 'log' as Sentry.Severity);
diff --git a/packages/node/src/backend.ts b/packages/node/src/backend.ts
@@ -22,7 +22,7 @@ export class NodeBackend extends BaseBackend<NodeOptions> {
   /**
    * @inheritDoc
    */
-  public eventFromMessage(message: string, level: Severity = Severity.Info, hint?: EventHint): PromiseLike<Event> {
+  public eventFromMessage(message: string, level: Severity = 'info' as Severity, hint?: EventHint): PromiseLike<Event> {
     return resolvedSyncPromise(eventFromMessage(message, level, hint, this._options.attachStacktrace));
   }
 
diff --git a/packages/node/src/eventbuilder.ts b/packages/node/src/eventbuilder.ts
@@ -92,7 +92,7 @@ export function eventFromUnknownInput(exception: unknown, hint?: EventHint): Eve
  */
 export function eventFromMessage(
   message: string,
-  level: Severity = Severity.Info,
+  level: Severity = 'info' as Severity,
   hint?: EventHint,
   attachStacktrace?: boolean,
 ): Event {
diff --git a/packages/node/src/integrations/onuncaughtexception.ts b/packages/node/src/integrations/onuncaughtexception.ts
@@ -78,7 +78,7 @@ export class OnUncaughtException implements Integration {
 
         if (hub.getIntegration(OnUncaughtException)) {
           hub.withScope((scope: Scope) => {
-            scope.setLevel(Severity.Fatal);
+            scope.setLevel('fatal' as Severity);
             hub.captureException(error, {
               originalException: error,
               data: { mechanism: { handled: false, type: 'onuncaughtexception' } },
diff --git a/packages/serverless/src/awslambda.ts b/packages/serverless/src/awslambda.ts
@@ -277,7 +277,7 @@ export function wrapHandler<TEvent, TResult>(
       timeoutWarningTimer = setTimeout(() => {
         withScope(scope => {
           scope.setTag('timeout', humanReadableTimeout);
-          captureMessage(`Possible function timeout: ${context.functionName}`, Sentry.Severity.Warning);
+          captureMessage(`Possible function timeout: ${context.functionName}`, 'warning' as Sentry.Severity);
         });
       }, timeoutWarningDelay);
     }
diff --git a/packages/utils/src/severity.ts b/packages/utils/src/severity.ts
@@ -12,9 +12,9 @@ function isSupportedSeverity(level: string): level is Severity {
  * @returns Severity
  */
 export function severityFromString(level: SeverityLevel | string): Severity {
-  if (level === 'warn') return Severity.Warning;
+  if (level === 'warn') return 'warning' as Severity;
   if (isSupportedSeverity(level)) {
     return level;
   }
-  return Severity.Log;
+  return 'log' as Severity;
 }

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ export class BrowserBackend extends BaseBackend<BrowserOptions> {`
`39`	`39`	`/**`
`40`	`40`	`* @inheritDoc`
`41`	`41`	`*/`
`42`		`- public eventFromMessage(message: string, level: Severity = Severity.Info, hint?: EventHint): PromiseLike<Event> {`
	`42`	`+ public eventFromMessage(message: string, level: Severity = 'info' as Severity, hint?: EventHint): PromiseLike<Event> {`
`43`	`43`	`return eventFromMessage(message, level, hint, this._options.attachStacktrace);`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ function _fetchBreadcrumb(handlerData: { [key: string]: any }): void {`
`230`	`230`	`{`
`231`	`231`	`category: 'fetch',`
`232`	`232`	`data: handlerData.fetchData,`
`233`		`- level: Severity.Error,`
	`233`	`+ level: 'error' as Severity,`
`234`	`234`	`type: 'http',`
`235`	`235`	`},`
`236`	`236`	`{`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ export class TestBackend extends BaseBackend<TestOptions> {`
`38`	`38`	`});`
`39`	`39`	`}`
`40`	`40`
`41`		`- public eventFromMessage(message: string, level: Severity = Severity.Info): PromiseLike<Event> {`
	`41`	`+ public eventFromMessage(message: string, level: Severity = 'info' as Severity): PromiseLike<Event> {`
`42`	`42`	`return resolvedSyncPromise({ message, level });`
`43`	`43`	`}`
`44`	`44`