fix(utils): use apply in console instrumentation (#4568)

AbhiPrasad · lobsterkatie · web-flow · commit b46674c6382b · 2022-02-14T12:03:51.000-08:00
Co-authored-by: Katie Byers &lt;lobsterkatie@gmail.com&gt;
diff --git a/packages/integration-tests/suites/public-api/init/console/test.ts b/packages/integration-tests/suites/public-api/init/console/test.ts
@@ -0,0 +1,22 @@
+/* eslint-disable no-console */
+import { ConsoleMessage, expect } from '@playwright/test';
+
+import { sentryTest } from '../../../../utils/fixtures';
+
+// Regression test against https://github.com/getsentry/sentry-javascript/issues/4558
+sentryTest('should not change console output', async ({ getLocalTestPath, page }) => {
+  const url = await getLocalTestPath({ testDir: __dirname });
+
+  // https://playwright.dev/docs/api/class-page#page-event-console
+  page.on('console', (msg: ConsoleMessage) => {
+    expect(msg.text()).toEqual(`hello world ${msg.type()}`);
+  });
+
+  await page.goto(url);
+
+  await page.evaluate(() => console.log('hello', 'world', 'log'));
+
+  await page.evaluate(() => console.warn('hello', 'world', 'warning'));
+
+  await page.evaluate(() => console.debug('hello', 'world', 'debug'));
+});
diff --git a/packages/integration-tests/suites/public-api/init/init.js b/packages/integration-tests/suites/public-api/init/init.js
@@ -0,0 +1,7 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+});
diff --git a/packages/integration-tests/suites/public-api/init/template.hbs b/packages/integration-tests/suites/public-api/init/template.hbs
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <title></title>
+  <script src="{{htmlWebpackPlugin.options.initialization}}"></script>
+  </head>
+  <body>
+    <script src="{{htmlWebpackPlugin.options.subject}}"></script>
+  </body>
+</html>
diff --git a/packages/integrations/src/captureconsole.ts b/packages/integrations/src/captureconsole.ts
@@ -72,7 +72,7 @@ export class CaptureConsole implements Integration {
 
         // this fails for some browsers. :(
         if (originalConsoleMethod) {
-          originalConsoleMethod.call(global.console, args);
+          originalConsoleMethod.apply(global.console, args);
         }
       });
     });
diff --git a/packages/utils/src/instrument.ts b/packages/utils/src/instrument.ts
@@ -122,7 +122,7 @@ function instrumentConsole(): void {
 
         // this fails for some browsers. :(
         if (originalConsoleMethod) {
-          originalConsoleMethod.call(global.console, args);
+          originalConsoleMethod.apply(global.console, args);
         }
       };
     });

-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +import * as Sentry from '@sentry/browser';
++
 +window.Sentry = Sentry;
++
 +Sentry.init({
 +  dsn: 'https://[email protected]/1337',
 +});
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ export class CaptureConsole implements Integration {`
`72`	`72`
`73`	`73`	`// this fails for some browsers. :(`
`74`	`74`	`if (originalConsoleMethod) {`
`75`		`- originalConsoleMethod.call(global.console, args);`
	`75`	`+ originalConsoleMethod.apply(global.console, args);`
`76`	`76`	`}`
`77`	`77`	`});`
`78`	`78`	`});`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ function instrumentConsole(): void {`
`122`	`122`
`123`	`123`	`// this fails for some browsers. :(`
`124`	`124`	`if (originalConsoleMethod) {`
`125`		`- originalConsoleMethod.call(global.console, args);`
	`125`	`+ originalConsoleMethod.apply(global.console, args);`
`126`	`126`	`}`
`127`	`127`	`};`
`128`	`128`	`});`