feat: Rework console integration

kamilogorek · kamilogorek · commit a0e1f148217d · 2019-11-01T11:28:28.000+01:00
diff --git a/packages/node/src/integrations/console.ts b/packages/node/src/integrations/console.ts
@@ -18,82 +18,53 @@ export class Console implements Integration {
    * @inheritDoc
    */
   public setupOnce(): void {
-    const nativeModule = require('module');
-    fill(nativeModule, '_load', loadWrapper(nativeModule));
-    // special case: since console is built-in and app-level code won't require() it, do that here
-    require('console');
+    const consoleModule = require('console');
+    for (const level of ['debug', 'info', 'warn', 'error', 'log']) {
+      fill(consoleModule, level, createConsoleWrapper(level));
+    }
   }
 }
 
-/**
- * Wrapper function for internal _load calls within `require`
- */
-function loadWrapper(nativeModule: any): any {
-  // We need to use some functional-style currying to pass values around
-  // as we cannot rely on `bind`, because this has to preserve correct
-  // context for native calls
-  return function(originalLoad: () => any): any {
-    return function(moduleId: string): any {
-      const originalModule = originalLoad.apply(nativeModule, arguments);
-
-      if (moduleId !== 'console' || originalModule.__sentry__) {
-        return originalModule;
-      }
-
-      ['debug', 'info', 'warn', 'error', 'log'].forEach(consoleWrapper(originalModule));
-
-      originalModule.__sentry__ = true;
-      return originalModule;
-    };
-  };
-}
-
 /**
  * Wrapper function that'll be used for every console level
  */
-function consoleWrapper(originalModule: any): any {
-  return function(level: string): any {
-    if (!(level in originalModule)) {
-      return;
-    }
+function createConsoleWrapper(level: string): (originalConsoleMethod: () => void) => void {
+  return function consoleWrapper(originalConsoleMethod: () => void): () => void {
+    let sentryLevel: Severity;
 
-    fill(originalModule, level, function(originalConsoleLevel: () => any): any {
-      let sentryLevel: Severity;
+    switch (level) {
+      case 'debug':
+        sentryLevel = Severity.Debug;
+        break;
+      case 'error':
+        sentryLevel = Severity.Error;
+        break;
+      case 'info':
+        sentryLevel = Severity.Info;
+        break;
+      case 'warn':
+        sentryLevel = Severity.Warning;
+        break;
+      default:
+        sentryLevel = Severity.Log;
+    }
 
-      switch (level) {
-        case 'debug':
-          sentryLevel = Severity.Debug;
-          break;
-        case 'error':
-          sentryLevel = Severity.Error;
-          break;
-        case 'info':
-          sentryLevel = Severity.Info;
-          break;
-        case 'warn':
-          sentryLevel = Severity.Warning;
-          break;
-        default:
-          sentryLevel = Severity.Log;
+    return function(this: typeof console): void {
+      if (getCurrentHub().getIntegration(Console)) {
+        getCurrentHub().addBreadcrumb(
+          {
+            category: 'console',
+            level: sentryLevel,
+            message: util.format.apply(undefined, arguments),
+          },
+          {
+            input: [...arguments],
+            level,
+          },
+        );
       }
 
-      return function(): any {
-        if (getCurrentHub().getIntegration(Console)) {
-          getCurrentHub().addBreadcrumb(
-            {
-              category: 'console',
-              level: sentryLevel,
-              message: util.format.apply(undefined, arguments),
-            },
-            {
-              input: [...arguments],
-              level,
-            },
-          );
-        }
-
-        originalConsoleLevel.apply(originalModule, arguments);
-      };
-    });
+      originalConsoleMethod.apply(this, arguments);
+    };
   };
 }
