Skip to content

Commit 1b0382e

Browse files
authored
feat(core): Deprecate validSeverityLevels (#14407)
1 parent fc79e97 commit 1b0382e

File tree

6 files changed

+11
-15
lines changed

6 files changed

+11
-15
lines changed

docs/migration/draft-v9-migration-guide.md

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
- Deprecated `AddRequestDataToEventOptions.transaction`. This option effectively doesn't do anything anymore, and will
88
be removed in v9.
99
- Deprecated `TransactionNamingScheme` type.
10+
- Deprecated `validSeverityLevels`. Will not be replaced.
1011
- Deprecated `urlEncode`. No replacements.
1112
- Deprecated `arrayify`. No replacements.
1213

packages/core/src/utils-hoist/index.ts

+1
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ export type {
8585
TransactionNamingScheme,
8686
} from './requestdata';
8787

88+
// eslint-disable-next-line deprecation/deprecation
8889
export { severityLevelFromString, validSeverityLevels } from './severity';
8990
export {
9091
UNKNOWN_FUNCTION,
+6-11
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
11
import type { SeverityLevel } from '@sentry/types';
22

3-
// Note: Ideally the `SeverityLevel` type would be derived from `validSeverityLevels`, but that would mean either
4-
//
5-
// a) moving `validSeverityLevels` to `@sentry/types`,
6-
// b) moving the`SeverityLevel` type here, or
7-
// c) importing `validSeverityLevels` from here into `@sentry/types`.
8-
//
9-
// Option A would make `@sentry/types` a runtime dependency of `@sentry/core` (not good), and options B and C would
10-
// create a circular dependency between `@sentry/types` and `@sentry/core` (also not good). So a TODO accompanying the
11-
// type, reminding anyone who changes it to change this list also, will have to do.
12-
3+
/**
4+
* @deprecated This variable has been deprecated and will be removed in the next major version.
5+
*/
136
export const validSeverityLevels = ['fatal', 'error', 'warning', 'log', 'info', 'debug'];
147

158
/**
@@ -19,5 +12,7 @@ export const validSeverityLevels = ['fatal', 'error', 'warning', 'log', 'info',
1912
* @returns The `SeverityLevel` corresponding to the given string, or 'log' if the string isn't a valid level.
2013
*/
2114
export function severityLevelFromString(level: SeverityLevel | string): SeverityLevel {
22-
return (level === 'warn' ? 'warning' : validSeverityLevels.includes(level) ? level : 'log') as SeverityLevel;
15+
return (
16+
level === 'warn' ? 'warning' : ['fatal', 'error', 'warning', 'log', 'info', 'debug'].includes(level) ? level : 'log'
17+
) as SeverityLevel;
2318
}

packages/core/test/utils-hoist/severity.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { severityLevelFromString, validSeverityLevels } from '../../src/utils-hoist/severity';
1+
import { severityLevelFromString } from '../../src/utils-hoist/severity';
22

33
describe('severityLevelFromString()', () => {
44
test("converts 'warn' to 'warning'", () => {
@@ -10,7 +10,7 @@ describe('severityLevelFromString()', () => {
1010
});
1111

1212
test('acts as a pass-through for valid level strings', () => {
13-
for (const level of validSeverityLevels) {
13+
for (const level of ['fatal', 'error', 'warning', 'log', 'info', 'debug']) {
1414
expect(severityLevelFromString(level)).toBe(level);
1515
}
1616
});

packages/types/src/severity.ts

-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
// Note: If this is ever changed, the `validSeverityLevels` array in `@sentry/core` needs to be changed, also. (See
2-
// note there for why we can't derive one from the other.)
31
export type SeverityLevel = 'fatal' | 'error' | 'warning' | 'log' | 'info' | 'debug';

packages/utils/src/index.ts

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ export {
5858
winterCGHeadersToDict,
5959
winterCGRequestToRequestData,
6060
severityLevelFromString,
61+
// eslint-disable-next-line deprecation/deprecation
6162
validSeverityLevels,
6263
UNKNOWN_FUNCTION,
6364
createStackParser,

0 commit comments

Comments
 (0)