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(consola): Enhance Consola integration to extract first-param object as searchable attributes#19534
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
Uh oh!
There was an error while loading. Please reload this page.
feat(consola): Enhance Consola integration to extract first-param object as searchable attributes #19534
Changes from all commits
27eb3ed7e136db73e9c4a5e20cdd94cd896282b96310f229d72a2554File filter
Filter by extension
Conversations
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| import * as Sentry from '@sentry/node'; | ||
| import { loggingTransport } from '@sentry-internal/node-integration-tests'; | ||
| import { consola } from 'consola'; | ||
| Sentry.init({ | ||
| dsn: 'https://public@dsn.ingest.sentry.io/1337', | ||
| release: '1.0.0', | ||
| environment: 'test', | ||
| enableLogs: true, | ||
| transport: loggingTransport, | ||
| }); | ||
| async function run(): Promise<void> { | ||
| consola.level = 5; | ||
| const sentryReporter = Sentry.createConsolaReporter(); | ||
| consola.addReporter(sentryReporter); | ||
| // Object-first: args = [object, string] — first object becomes attributes, second arg is part of formatted message | ||
| consola.info({ userId: 100, action: 'login' }, 'User logged in'); | ||
| // Object-first: args = [object] only — object keys become attributes, message is stringified object | ||
| consola.info({ event: 'click', count: 2 }); | ||
| await Sentry.flush(); | ||
| } | ||
| // eslint-disable-next-line @typescript-eslint/no-floating-promises | ||
| void run(); |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,36 @@ | ||
| import type { Client } from '../client'; | ||
| import { getClient } from '../currentScopes'; | ||
| import { _INTERNAL_captureLog } from '../logs/internal'; | ||
| import { formatConsoleArgs } from '../logs/utils'; | ||
| import { createConsoleTemplateAttributes, formatConsoleArgs, hasConsoleSubstitutions } from '../logs/utils'; | ||
| import type { LogSeverityLevel } from '../types-hoist/log'; | ||
| import { isPlainObject } from '../utils/is'; | ||
| import { normalize } from '../utils/normalize'; | ||
| /** | ||
| * Result of extracting structured attributes from console arguments. | ||
| */ | ||
| interface ExtractAttributesResult { | ||
| /** | ||
| * The log message to use for the log entry, typically constructed from the console arguments. | ||
| */ | ||
| message?: string; | ||
| /** | ||
| * The parameterized template string which is added as `sentry.message.template` attribute if applicable. | ||
| */ | ||
| messageTemplate?: string; | ||
| /** | ||
| * Remaining arguments to process as attributes with keys like `sentry.message.parameter.0`, `sentry.message.parameter.1`, etc. | ||
| */ | ||
| messageParameters?: unknown[]; | ||
| /** | ||
| * Additional attributes to add to the log. | ||
| */ | ||
| attributes?: Record<string, unknown>; | ||
| } | ||
| /** | ||
| * Options for the Sentry Consola reporter. | ||
| */ | ||
| @@ -125,7 +151,7 @@ export interface ConsolaLogObject { | ||
| /** | ||
| * The raw arguments passed to the log method. | ||
| * | ||
| * These args are typically formatted into the final `message`. In Consola reporters, `message` is not provided. | ||
| * These args are typically formatted into the final `message`. In Consola reporters, `message` is not provided. See: https://github.com/unjs/consola/issues/406#issuecomment-3684792551 | ||
| * | ||
| * @example | ||
| * ```ts | ||
| @@ -220,16 +246,6 @@ export function createConsolaReporter(options: ConsolaReporterOptions = {}): Con | ||
| const { normalizeDepth = 3, normalizeMaxBreadth = 1_000 } = client.getOptions(); | ||
| // Format the log message using the same approach as consola's basic reporter | ||
| const messageParts = []; | ||
| if (consolaMessage) { | ||
| messageParts.push(consolaMessage); | ||
| } | ||
| if (args && args.length > 0) { | ||
| messageParts.push(formatConsoleArgs(args, normalizeDepth, normalizeMaxBreadth)); | ||
| } | ||
| const message = messageParts.join(' '); | ||
| const attributes: Record<string, unknown> = {}; | ||
| // Build attributes | ||
| @@ -252,9 +268,23 @@ export function createConsolaReporter(options: ConsolaReporterOptions = {}): Con | ||
| attributes['consola.level'] = level; | ||
| } | ||
| const extractionResult = processExtractedAttributes( | ||
| defaultExtractAttributes(args, normalizeDepth, normalizeMaxBreadth), | ||
| normalizeDepth, | ||
| normalizeMaxBreadth, | ||
| ); | ||
| if (extractionResult?.attributes) { | ||
| Object.assign(attributes, extractionResult.attributes); | ||
| } | ||
| _INTERNAL_captureLog({ | ||
| level: logSeverityLevel, | ||
| message, | ||
| message: | ||
| extractionResult?.message || | ||
| consolaMessage || | ||
| (args && formatConsoleArgs(args, normalizeDepth, normalizeMaxBreadth)) || | ||
| '', | ||
| attributes, | ||
| }); | ||
| }, | ||
| @@ -330,3 +360,81 @@ function getLogSeverityLevel(type?: string, level?: number | null): LogSeverityL | ||
| // Default fallback | ||
| return 'info'; | ||
| } | ||
| /** | ||
| * Extracts structured attributes from console arguments. If the first argument is a plain object, its properties are extracted as attributes. | ||
| */ | ||
| function defaultExtractAttributes( | ||
| args: unknown[] | undefined, | ||
| normalizeDepth: number, | ||
| normalizeMaxBreadth: number, | ||
| ): ExtractAttributesResult { | ||
| if (!args?.length) { | ||
| return { message: '' }; | ||
| } | ||
| // Message looks like how consola logs the message to the console (all args stringified and joined) | ||
| const message = formatConsoleArgs(args, normalizeDepth, normalizeMaxBreadth); | ||
| const firstArg = args[0]; | ||
| if (isPlainObject(firstArg)) { | ||
| // Remaining args start from index 2 i f we used second arg as message, otherwise from index 1 | ||
| const remainingArgsStartIndex = typeof args[1] === 'string' ? 2 : 1; | ||
| const remainingArgs = args.slice(remainingArgsStartIndex); | ||
| return { | ||
| message, | ||
| // Object content from first arg is added as attributes | ||
| attributes: firstArg, | ||
| // Add remaining args as message parameters | ||
| messageParameters: remainingArgs, | ||
| }; | ||
| } else { | ||
| const followingArgs = args.slice(1); | ||
| const shouldAddTemplateAttr = | ||
| followingArgs.length > 0 && typeof firstArg === 'string' && !hasConsoleSubstitutions(firstArg); | ||
s1gr1d marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| return { | ||
| message, | ||
| messageTemplate: shouldAddTemplateAttr ? firstArg : undefined, | ||
| messageParameters: shouldAddTemplateAttr ? followingArgs : undefined, | ||
| }; | ||
| } | ||
| } | ||
| /** | ||
| * Processes extracted attributes by normalizing them and preparing message parameter attributes if a template is present. | ||
| */ | ||
| function processExtractedAttributes( | ||
| extractionResult: ExtractAttributesResult, | ||
| normalizeDepth: number, | ||
| normalizeMaxBreadth: number, | ||
| ): { message: string | undefined; attributes: Record<string, unknown> } { | ||
| const { message, attributes, messageTemplate, messageParameters } = extractionResult; | ||
| const messageParamAttributes: Record<string, unknown> = {}; | ||
| if (messageTemplate && messageParameters) { | ||
| const templateAttrs = createConsoleTemplateAttributes(messageTemplate, messageParameters); | ||
| for (const [key, value] of Object.entries(templateAttrs)) { | ||
| messageParamAttributes[key] = key.startsWith('sentry.message.parameter.') | ||
| ? normalize(value, normalizeDepth, normalizeMaxBreadth) | ||
| : value; | ||
| } | ||
| } else if (messageParameters && messageParameters.length > 0) { | ||
| messageParameters.forEach((arg, index) => { | ||
| messageParamAttributes[`sentry.message.parameter.${index}`] = normalize(arg, normalizeDepth, normalizeMaxBreadth); | ||
| }); | ||
| } | ||
| return { | ||
| message: message, | ||
| attributes: { | ||
| ...normalize(attributes, normalizeDepth, normalizeMaxBreadth), | ||
cursor[bot] marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| ...messageParamAttributes, | ||
| }, | ||
| }; | ||
| } | ||
Uh oh!
There was an error while loading. Please reload this page.
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.
This is a function that could be theoretically added by users (as a future feature). That's why this function is extra from the
processExtractedAttributes. In theory, it could just be one function.