fix(console instrumentation): revert to former log parsing behavior (#…

…745)
grafana · Nov 20, 2024 · 6333f8a · 6333f8a
1 parent 711960a
commit 6333f8a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/packages/web-sdk/src/instrumentations/console/instrumentation.test.ts b/packages/web-sdk/src/instrumentations/console/instrumentation.test.ts
@@ -52,7 +52,7 @@ describe('ConsoleInstrumentation', () => {
     );
     expect((mockTransport.items[1] as TransportItem<ExceptionEvent>)?.payload.type).toBe('Error');
     expect((mockTransport.items[1] as TransportItem<ExceptionEvent>)?.payload.value).toBe(
-      'console.error: with object {"foo":"bar","baz":"bam"}'
+      'console.error: with object [object Object]'
     );
   });
 
@@ -77,7 +77,7 @@ describe('ConsoleInstrumentation', () => {
     console.error('with circular refs object', objWithCircularRef);
 
     expect((mockTransport.items[0] as TransportItem<ExceptionEvent>)?.payload.value).toBe(
-      'console.error: with circular refs object {"foo":"bar","baz":"bam","circular":null}'
+      'console.error: with circular refs object [object Object]'
     );
   });
 
@@ -106,7 +106,7 @@ describe('ConsoleInstrumentation', () => {
 
     expect((mockTransport.items[0] as TransportItem<LogEvent>)?.payload.message).toBe('console.error log no 1');
     expect((mockTransport.items[1] as TransportItem<LogEvent>)?.payload.message).toBe(
-      'console.error log with object {"foo":"bar","baz":"bam"}'
+      'console.error log with object [object Object]'
     );
   });
 

diff --git a/packages/web-sdk/src/instrumentations/console/instrumentation.ts b/packages/web-sdk/src/instrumentations/console/instrumentation.ts
@@ -1,6 +1,4 @@
-import { allLogLevels, BaseInstrumentation, isArray, isObject, LogLevel, VERSION } from '@grafana/faro-core';
-
-import { stringifyExternalJson } from '../../utils';
+import { allLogLevels, BaseInstrumentation, defaultLogArgsSerializer, LogLevel, VERSION } from '@grafana/faro-core';
 
 import type { ConsoleInstrumentationOptions } from './types';
 
@@ -27,9 +25,9 @@ export class ConsoleInstrumentation extends BaseInstrumentation {
         console[level] = (...args) => {
           try {
             if (level === LogLevel.ERROR && !this.options?.consoleErrorAsLog) {
-              this.api.pushError(new Error('console.error: ' + formatConsoleArgs(args)));
+              this.api.pushError(new Error('console.error: ' + defaultLogArgsSerializer(args)));
             } else {
-              this.api.pushLog([formatConsoleArgs(args)], { level });
+              this.api.pushLog(args, { level });
             }
           } catch (err) {
             this.logError(err);
@@ -40,7 +38,3 @@ export class ConsoleInstrumentation extends BaseInstrumentation {
       });
   }
 }
-
-function formatConsoleArgs(args: [any?, ...any[]]) {
-  return args.map((arg) => (isObject(arg) || isArray(arg) ? stringifyExternalJson(arg) : arg)).join(' ');
-}