Merge pull request #388 from ryanwarsaw/remove-new-relic

Redundant dependency: newrelic
mozilla · Feb 24, 2017 · c6d2632 · c6d2632
2 parents b4cf6f4 + d0777dc
commit c6d2632
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -23,9 +23,3 @@ If you want to check your code passes before sending in a pull request (and ensu
 
 * ensure that grunt is installed globally on your system - `npm install -g grunt`
 * run `grunt --travis test`
-
-## New Relic
-
-To enable New Relic, set the `NEW_RELIC_ENABLED` environment variable and add a config file, or set the relevant environment variables.
-
-For more information on configuring New Relic, see: https://github.com/newrelic/node-newrelic/#configuring-the-agent
diff --git a/app/db/index.js b/app/db/index.js
@@ -1,6 +1,6 @@
 var Sequelize = require('sequelize');
 
-module.exports = function (env, newrelic) {
+module.exports = function (env) {
   var sequelize;
   var health = {
     connected: false,
@@ -18,7 +18,7 @@ module.exports = function (env, newrelic) {
   }
 
   // Controllers
-  var modelControllers = require('./models')(sequelize, env, newrelic);
+  var modelControllers = require('./models')(sequelize, env);
 
   // Sync
   sequelize.sync().complete(function (err) {

diff --git a/app/db/models/index.js b/app/db/models/index.js
@@ -7,7 +7,7 @@ var hatchet = require("hatchet");
 var bcrypt = require("bcrypt");
 var url = require("url");
 
-module.exports = function (sequelize, env, newrelic) {
+module.exports = function (sequelize, env) {
   var TOKEN_EXPIRY_TIME = 1000 * 60 * 30;
 
   var RESET_CODE_BIT_LENGTH = 256;
@@ -453,8 +453,8 @@ module.exports = function (sequelize, env, newrelic) {
     changePassword: function (newPass, user, callback) {
       var pass = user.password || password.build();
 
-      bcrypt.genSalt(BCRYPT_ROUNDS, newrelic.createTracer("bcrypt:genSalt", function (err, salt) {
-        bcrypt.hash(newPass, salt, newrelic.createTracer("bcrypt:hash", function (err, hash) {
+      bcrypt.genSalt(BCRYPT_ROUNDS, function (err, salt) {
+        bcrypt.hash(newPass, salt, function (err, hash) {
           pass.saltedHash = hash;
           user
             .updateAttributes({
@@ -476,8 +476,8 @@ module.exports = function (sequelize, env, newrelic) {
                 error: "Login Database Error"
               });
             });
-        }));
-      }));
+        });
+      });
     },
 
     removePassword: function (user, callback) {
@@ -499,9 +499,9 @@ module.exports = function (sequelize, env, newrelic) {
     },
 
     compare: function (pass, user, callback) {
-      bcrypt.compare(pass, user.password.saltedHash, newrelic.createTracer("bcrypt:compare", function (err, res) {
+      bcrypt.compare(pass, user.password.saltedHash, function (err, res) {
         callback(err, res);
-      }));
+      });
     },
 
     createOauthLogin: function (userId, clientId, callback) {

diff --git a/app/http/server.js b/app/http/server.js
@@ -4,20 +4,6 @@
 
 /* jshint node: true */
 
-var newrelic;
-if (process.env.NEW_RELIC_ENABLED) {
-  newrelic = require("newrelic");
-} else {
-  newrelic = {
-    getBrowserTimingHeader: function () {
-      return "<!-- New Relic RUM disabled -->";
-    },
-    createTracer: function (name, handler) {
-      return handler;
-    }
-  };
-}
-
 module.exports = function (env) {
   var express = require("express"),
     helmet = require("helmet"),
@@ -27,7 +13,7 @@ module.exports = function (env) {
     nunjucks = require("nunjucks"),
     path = require("path"),
     route = require("./routes"),
-    Models = require("../db")(env, newrelic).Models;
+    Models = require("../db")(env).Models;
 
   var http = express(),
     nunjucksEnv = new nunjucks.Environment([
@@ -88,7 +74,6 @@ module.exports = function (env) {
       // audience and webmakerorg are duplicated because of i18n
       AUDIENCE: env.get("WEBMAKERORG"),
       WEBMAKERORG: env.get("WEBMAKERORG"),
-      newrelic: newrelic,
       profile: env.get("PROFILE"),
       bower_path: "bower_components",
       personaHostname: env.get("PERSONA_HOSTNAME", "https://login.persona.org"),

diff --git a/app/http/views/site/account.html b/app/http/views/site/account.html
@@ -2,7 +2,6 @@
 <html lang="{{ localeInfo.lang }}" dir="{{ localeInfo.direction }}">
 <head>
   <meta charset="utf-8">
-  {{ newrelic.getBrowserTimingHeader() | safe }}
   <meta name="csrf-token" content="{{ csrf }}">
   <title>Webmaker</title>
   <link rel="stylesheet" href="/bower/font-awesome/css/font-awesome.min.css">

diff --git a/app/http/views/site/index.html b/app/http/views/site/index.html
@@ -2,7 +2,6 @@
 <html>
 <head>
   <meta charset="utf-8">
-  {{ newrelic.getBrowserTimingHeader() | safe }}
   <title>Webmaker SSO server</title>
   <style>
     p {

diff --git a/package.json b/package.json
@@ -29,7 +29,6 @@
     "less-middleware": "0.1.15",
     "moment": "2.8.2",
     "mysql": "2.0.1",
-    "newrelic": "^1.21.1",
     "node-statsd": "0.0.7",
     "nunjucks": "0.1.10",
     "pass-test": "1.0.2",