fix: Dont wrap native modules more than once (#1629)

Author: kamilogorek

CHANGELOG.md

@@ -2,35 +2,33 @@
 
 ## Unreleased
 
-- [hub] fix: Scope level overwrites level on the event
-- [core] fix: correct sampleRate behaviour
-- [core] feat: RewriteFrames pluggable integration
-- [core] feat: Introduce stringify and debugger options in Debug integration
-- [core] feat: getRequestheaders should handle legacy DSNs
-- [core] ref: Check for node-env first and return more accurate global object
-- [core] ref: Remove Repo interface and repos attribute from Event
-- [core] ref: Check for node-env first and return more accurate global object
-- [core] ref: Remove Repo interface and repos attribute from Event
-- [core] ref: Rewrite RequestBuffer using Array instead of Set for IE10/11
-- [core] misc: Warn user when beforeSend doesnt return an event or null
+- [browser] feat: Better mechanism detection in TraceKit
 - [browser] fix: Change loader to use getAttribute instead of dataset
 - [browser] fix: Remove trailing commas from loader for IE10/11
-- [browser] feat: Better mechanism detection in TraceKit
 - [browser] ref: Include md5 lib and transcript it to TypeScript
+- [browser] ref: Remove all trailing commas from integration tests cuz IE10/11
 - [browser] ref: Remove default transaction from browser
-- [browser] ref: Include md5 lib and transcript it to TypeScript
 - [browser] ref: Remove redundant debug.ts file from browser integrations
-- [browser] ref: Remove all trailing commas from integration tests cuz IE10/11
-- [browser] test: Run integration tests on SauceLabs
 - [browser] test: Fix all integration tests in IE10/11 and Android browsers
+- [browser] test: Run integration tests on SauceLabs
+- [browser] test: Stop running raven-js saucelabs tests in favour of @sentry/browser
 - [browser] test: Store breadcrumbs in the global variable in integration tests
 - [browser] test: Update polyfills for integration tests
-- [browser] test: Stop running raven-js saucelabs tests in favour of @sentry/browser
-- [node] feat: Transactions handling for RequestHandler in Express/Hapi
+- [build] ref: Use Mocha v4 instead of v5, as it's not supporting IE10
+- [core] feat: Introduce stringify and debugger options in Debug integration
+- [core] feat: RewriteFrames pluggable integration
+- [core] feat: getRequestheaders should handle legacy DSNs
+- [core] fix: correct sampleRate behaviour
+- [core] misc: Warn user when beforeSend doesnt return an event or null
+- [core] ref: Check for node-env first and return more accurate global object
+- [core] ref: Remove Repo interface and repos attribute from Event
+- [core] ref: Rewrite RequestBuffer using Array instead of Set for IE10/11
+- [hub] fix: Scope level overwrites level on the event
 - [node] feat: Allow requestHandler to be configured
 - [node] feat: Make node transactions a pluggable integration with tests 
+- [node] feat: Transactions handling for RequestHandler in Express/Hapi
+- [node] fix: Dont wrap native modules more than once to prevent leaks
 - [utils] ref: implemented includes, assign and isNaN polyfills
-- [build] ref: Use Mocha v4 instead of v5, as it's not supporting IE10
 
 ## 4.0.6
 

packages/node/src/integrations/console.ts

@@ -14,12 +14,13 @@ function loadWrapper(nativeModule: any): any {
     return function(moduleId: string): any {
       const originalModule = originalLoad.apply(nativeModule, arguments);
 
-      if (moduleId !== 'console') {
+      if (moduleId !== 'console' || originalModule.__sentry__) {
         return originalModule;
       }
 
       ['debug', 'info', 'warn', 'error', 'log'].forEach(consoleWrapper(originalModule));
 
+      originalModule.__sentry__ = true;
       return originalModule;
     };
   };

packages/node/src/integrations/http.ts

@@ -47,7 +47,7 @@ function loadWrapper(nativeModule: any): any {
     return function(this: SentryRequest, moduleId: string): any {
       const originalModule = originalLoad.apply(nativeModule, arguments);
 
-      if (moduleId !== 'http') {
+      if (moduleId !== 'http' || originalModule.__sentry__) {
         return originalModule;
       }
 
@@ -93,6 +93,7 @@ function loadWrapper(nativeModule: any): any {
         };
       });
 
+      originalModule.__sentry__ = true;
       return originalModule;
     };
   };

packages/utils/src/object.ts

@@ -153,7 +153,7 @@ export function clone<T>(object: T): T {
  */
 
 export function fill(source: { [key: string]: any }, name: string, replacement: (...args: any[]) => any): void {
-  if (!(name in source)) {
+  if (!(name in source) || (source[name] as SentryWrappedFunction).__sentry__) {
     return;
   }
   const original = source[name] as () => any;