Move fill to utils

Author: LewisJEllis

lib/instrumentation/console.js

@@ -1,22 +1,15 @@
 'use strict';
 
 var util = require('util');
-
-function fill(obj, name, replacement, track) {
-  var orig = obj[name];
-  obj[name] = replacement(orig);
-  if (track) {
-    track.push([obj, name, orig]);
-  }
-}
+var utils = require('../utils');
 
 module.exports = function (Raven, console, originals) {
   var wrapConsoleMethod = function (level) {
     if (!(level in console)) {
       return;
     }
 
-    fill(console, level, function (originalConsoleLevel) {
+    utils.fill(console, level, function (originalConsoleLevel) {
       var sentryLevel = level === 'warn'
           ? 'warning'
           : level;

lib/instrumentation/http.js

@@ -1,13 +1,6 @@
 'use strict';
 var util = require('util');
-
-function fill(obj, name, replacement, track) {
-  var orig = obj[name];
-  obj[name] = replacement(orig);
-  if (track) {
-    track.push([obj, name, orig]);
-  }
-}
+var utils = require('../utils');
 
 module.exports = function (Raven, http, originals) {
   var OrigClientRequest = http.ClientRequest;
@@ -33,7 +26,7 @@ module.exports = function (Raven, http, originals) {
   };
   util.inherits(ClientRequest, OrigClientRequest);
 
-  fill(ClientRequest.prototype, 'emit', function (origEmit) {
+  utils.fill(ClientRequest.prototype, 'emit', function (origEmit) {
     return function (evt, maybeResp) {
       if (evt === 'response' && this.__ravenBreadcrumbUrl) {
         if (!Raven.dsn || this.__ravenBreadcrumbUrl.indexOf(Raven.dsn.host) === -1) {
@@ -52,20 +45,20 @@ module.exports = function (Raven, http, originals) {
     };
   });
 
-  fill(http, 'ClientRequest', function () {
+  utils.fill(http, 'ClientRequest', function () {
     return ClientRequest;
   }, originals);
 
   // http.request orig refs module-internal ClientRequest, not exported one, so
   // it still points at orig ClientRequest after our monkeypatch; these reimpls
   // just get that reference updated to use our new ClientRequest
-  fill(http, 'request', function () {
+  utils.fill(http, 'request', function () {
     return function (options, cb) {
       return new http.ClientRequest(options, cb);
     };
   }, originals);
 
-  fill(http, 'get', function () {
+  utils.fill(http, 'get', function () {
     return function (options, cb) {
       var req = http.request(options, cb);
       req.end();

lib/instrumentation/instrumentor.js

@@ -12,14 +12,6 @@ var defaultConfig = {
   pg: false
 };
 
-function fill(obj, name, replacement, track) {
-  var orig = obj[name];
-  obj[name] = replacement(orig);
-  if (track) {
-    track.push([obj, name, orig]);
-  }
-}
-
 function instrument(Raven, config) {
   if (config === false) {
     return;
@@ -33,7 +25,7 @@ function instrument(Raven, config) {
   Raven.instrumentedModules = [];
 
   var Module = require('module');
-  fill(Module, '_load', function (origLoad) {
+  utils.fill(Module, '_load', function (origLoad) {
     return function (moduleId, parent, isMain) {
       var origModule = origLoad.apply(this, arguments);
       if (config[moduleId] && Raven.instrumentedModules.indexOf(moduleId) === -1) {

lib/utils.js

@@ -101,6 +101,13 @@ module.exports.getModules = function getModules() {
   return moduleCache;
 };
 
+module.exports.fill = function (obj, name, replacement, track) {
+  var orig = obj[name];
+  obj[name] = replacement(orig);
+  if (track) {
+    track.push([obj, name, orig]);
+  }
+};
 
 var LINES_OF_CONTEXT = 7;