Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 1.8k
feat(winston): Add customLevelMap for winston transport#18922
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Uh oh!
There was an error while loading. Please reload this page.
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
8ef1584
feat(winston): Add customLevelMap for winston transport
JPeer264 e388d33
fixup! feat(winston): Add customLevelMap for winston transport
JPeer264 f662b63
fix: Switch to ts-ignore. ts-expect-error was introduced in TS3.9
JPeer264 c2dece0
fixup! feat(winston): Add customLevelMap for winston transport
JPeer264 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
76 changes: 76 additions & 0 deletions
76 dev-packages/node-integration-tests/suites/winston/subject.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
223 changes: 223 additions & 0 deletions
223 dev-packages/node-integration-tests/suites/winston/test.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| /* eslint-disable @typescript-eslint/ban-ts-comment */ | ||
| import type { LogSeverityLevel } from '@sentry/core'; | ||
| import { debug } from '@sentry/core'; | ||
| import { DEBUG_BUILD } from '../debug-build'; | ||
| import { captureLog } from '../logs/capture'; | ||
| const DEFAULT_CAPTURED_LEVELS: Array<LogSeverityLevel> = ['trace', 'debug', 'info', 'warn', 'error', 'fatal']; | ||
| @@ -25,6 +27,21 @@ interface WinstonTransportOptions { | ||
| * ``` | ||
| */ | ||
| levels?: Array<LogSeverityLevel>; | ||
| /** | ||
| * Use this option to map custom levels to Sentry log severity levels. | ||
| * | ||
| * @example | ||
| * ```ts | ||
| * const SentryWinstonTransport = Sentry.createSentryWinstonTransport(Transport, { | ||
| * customLevelMap: { | ||
| * myCustomLevel: 'info', | ||
| * customError: 'error', | ||
| * }, | ||
| * }); | ||
| * ``` | ||
| */ | ||
| customLevelMap?: Record<string, LogSeverityLevel>; | ||
| } | ||
| /** | ||
| @@ -85,12 +102,20 @@ export function createSentryWinstonTransport<TransportStreamInstance extends obj | ||
| attributes[MESSAGE_SYMBOL] = undefined; | ||
| attributes[SPLAT_SYMBOL] = undefined; | ||
| const logSeverityLevel = WINSTON_LEVEL_TO_LOG_SEVERITY_LEVEL_MAP[levelFromSymbol as string] ?? 'info'; | ||
| const customLevel = sentryWinstonOptions?.customLevelMap?.[levelFromSymbol as string]; | ||
| const winstonLogLevel = WINSTON_LEVEL_TO_LOG_SEVERITY_LEVEL_MAP[levelFromSymbol as string]; | ||
| const logSeverityLevel = customLevel ?? winstonLogLevel ?? 'info'; | ||
| if (this._levels.has(logSeverityLevel)) { | ||
| captureLog(logSeverityLevel, message as string, { | ||
| ...attributes, | ||
| 'sentry.origin': 'auto.log.winston', | ||
| }); | ||
| } else if (!customLevel && !winstonLogLevel) { | ||
| DEBUG_BUILD && | ||
| debug.log( | ||
| `Winston log level ${levelFromSymbol} is not captured by Sentry. Please add ${levelFromSymbol} to the "customLevelMap" option of the Sentry Winston transport.`, | ||
| ); | ||
cursor[bot] marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| } | ||
| } catch { | ||
| // do nothing | ||
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
m: would it make sense to warn the user in case he provides a sentry level that does not exist?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That could actually make sense
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@nicohrubec I added a debug warning now. This is however only then when
levelsare overwritten. In all other cases they will default toinfoalready