refine based on implementation

Author: AbhiPrasad

packages/core/src/integrations/consola.ts

@@ -189,8 +189,14 @@ 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 message =
-        consolaMessage || (args && args.length > 0 ? formatConsoleArgs(args, normalizeDepth, normalizeMaxBreadth) : '');
+      const messageParts = [];
+      if (consolaMessage) {
+        messageParts.push(consolaMessage);
+      }
+      if (args && args.length > 0) {
+        messageParts.push(formatConsoleArgs(args, normalizeDepth, normalizeMaxBreadth));
+      }
+      const message = messageParts.join(' ');
 
       // Build attributes
       const attributes: Record<string, unknown> = {
@@ -210,7 +216,6 @@ export function createConsolaReporter(options: ConsolaReporterOptions = {}): Con
         attributes['consola.level'] = level;
       }
 
-      // Capture the log
       _INTERNAL_captureLog({
         level: logSeverityLevel,
         message,
@@ -244,7 +249,7 @@ const CONSOLA_TYPE_TO_LOG_SEVERITY_LEVEL_MAP: Record<string, LogSeverityLevel> =
 
 // Mapping from consola log levels (numbers) to Sentry log severity levels
 const CONSOLA_LEVEL_TO_LOG_SEVERITY_LEVEL_MAP: Record<number, LogSeverityLevel> = {
-  0: 'error', // Fatal and Error
+  0: 'fatal', // Fatal and Error
   1: 'warn', // Warnings
   2: 'info', // Normal logs
   3: 'info', // Informational logs, success, fail, ready, start, ...

packages/core/src/logs/utils.ts

@@ -30,7 +30,7 @@ export function formatConsoleArgs(values: unknown[], normalizeDepth: number, nor
  * @param normalizeMaxBreadth - The max breadth to normalize the values.
  * @returns The joined string.
  */
-function safeJoinConsoleArgs(values: unknown[], normalizeDepth: number, normalizeMaxBreadth: number): string {
+export function safeJoinConsoleArgs(values: unknown[], normalizeDepth: number, normalizeMaxBreadth: number): string {
   return values
     .map(value =>
       isPrimitive(value) ? String(value) : JSON.stringify(normalize(value, normalizeDepth, normalizeMaxBreadth)),

packages/core/test/lib/integrations/consola.test.ts

@@ -10,8 +10,8 @@ vi.mock('../../../src/logs/exports', () => ({
   _INTERNAL_captureLog: vi.fn(),
 }));
 
-vi.mock('../../../src/logs/utils', () => ({
-  formatConsoleArgs: vi.fn(),
+vi.mock('../../../src/logs/utils', async actual => ({
+  formatConsoleArgs: vi.fn(((await actual()) as any).formatConsoleArgs),
 }));
 
 vi.mock('../../../src/currentScopes', () => ({
@@ -33,7 +33,6 @@ describe('createConsolaReporter', () => {
     });
 
     vi.mocked(getClient).mockReturnValue(mockClient);
-    vi.mocked(formatConsoleArgs).mockImplementation(args => args.join(' '));
   });
 
   afterEach(() => {
@@ -48,37 +47,6 @@ describe('createConsolaReporter', () => {
         log: expect.any(Function),
       });
     });
-
-    it('should use provided client for normalization options', () => {
-      const customClient = new TestClient({
-        ...getDefaultTestClientOptions({ dsn: 'https://custom@domain/123' }),
-        enableLogs: true,
-        normalizeDepth: 5,
-        normalizeMaxBreadth: 2000,
-      });
-
-      const reporter = createConsolaReporter({ client: customClient });
-      
-      reporter.log({
-        type: 'info',
-        args: ['test', { complex: 'object' }],
-      });
-
-      expect(formatConsoleArgs).toHaveBeenCalledWith(['test', { complex: 'object' }], 5, 2000);
-    });
-
-    it('should not capture logs when no client is available', () => {
-      vi.mocked(getClient).mockReturnValue(undefined);
-      
-      const reporter = createConsolaReporter();
-      
-      reporter.log({
-        type: 'error',
-        message: 'Should not be captured',
-      });
-
-      expect(_INTERNAL_captureLog).not.toHaveBeenCalled();
-    });
   });
 
   describe('log capturing', () => {
@@ -107,7 +75,6 @@ describe('createConsolaReporter', () => {
           'consola.tag': 'test',
           'consola.type': 'error',
           'consola.level': 0,
-          'consola.timestamp': '2023-01-01T00:00:00.000Z',
         },
       });
     });
@@ -232,10 +199,9 @@ describe('createConsolaReporter', () => {
 
       sentryReporter.log(logObj);
 
-      expect(formatConsoleArgs).toHaveBeenCalledWith(['Message', circular], 3, 1000);
       expect(_INTERNAL_captureLog).toHaveBeenCalledWith({
         level: 'info',
-        message: 'Message [object Object]',
+        message: 'Message {"self":"[Circular ~]"}',
         attributes: {
           'sentry.origin': 'auto.logging.consola',
           'consola.type': 'info',
@@ -290,20 +256,6 @@ describe('createConsolaReporter', () => {
         });
       });
     });
-
-    it('should handle errors in reporter gracefully', () => {
-      vi.mocked(_INTERNAL_captureLog).mockImplementation(() => {
-        throw new Error('Capture error');
-      });
-
-      // Should not throw
-      expect(() => {
-        sentryReporter.log({
-          type: 'error',
-          message: 'Test message',
-        });
-      }).not.toThrow();
-    });
   });
 
   describe('level filtering', () => {