Merge branch 'master' into production

DoSomethingArchive · Dec 5, 2018 · ee24ea8 · ee24ea8
2 parents 02edef9 + f61ecc8
commit ee24ea8
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 223 deletions.
diff --git a/.env.example b/.env.example
@@ -41,9 +41,6 @@ NEW_RELIC_ENABLED=false
 NEW_RELIC_LICENSE_KEY=totallysecret
 NEW_RELIC_LOGGING_LEVEL=info
 
-STATHAT_APP_NAME=gambit-local-default
-STATHAT_EZ_KEY=puppet.sloth@dosomething.org
-
 ##
 ## Optional settings
 ##

diff --git a/app.json b/app.json
diff --git a/lib/helpers.js b/lib/helpers.js
@@ -5,7 +5,6 @@
  */
 const logger = require('winston');
 const newrelic = require('newrelic');
-const stathat = require('./stathat');
 const helpers = require('./helpers/index');
 
 // register helpers
@@ -49,7 +48,6 @@ module.exports.sendResponse = function (res, code, messageText) {
   if (code > 200) {
     type = 'error';
     logger.error(messageText);
-    stathat.postStat(`${code}: ${messageText}`);
   }
 
   const response = {};

diff --git a/lib/middleware/authenticate.js b/lib/middleware/authenticate.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const logger = require('winston');
-const stathat = require('../../lib/stathat');
 
 module.exports = function authenticateRequest(config = {}) {
   return (req, res, next) => {
@@ -10,7 +9,6 @@ module.exports = function authenticateRequest(config = {}) {
     }
     const apiKey = req.get(config.apiKeyHeaderName) || req.query[config.apiKeyQueryName];
     if (apiKey !== config.apiKey) {
-      stathat.postStat(`error: invalid ${config.apiKeyHeaderName}`);
       logger.warn(`router invalid ${config.apiKeyHeaderName}:`, req.url);
 
       return res.sendStatus(403);

diff --git a/lib/stathat.js b/lib/stathat.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gambit-content",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "description": "Content API for the DoSomething.org chatbot.",
   "license": "MIT",
   "repository": {
@@ -62,7 +62,6 @@
     "s3-upload-stream": "^1.0.7",
     "serve-favicon": "^2.5.0",
     "simple-oauth2": "^1.5.2",
-    "stathat": "0.0.8",
     "superagent": "^3.8.3",
     "throng": "^4.0.0",
     "underscore": "^1.9.0",

diff --git a/test/lib/contentful.test.js b/test/lib/contentful.test.js
@@ -13,7 +13,6 @@ const underscore = require('underscore');
 
 // app modules
 const stubs = require('../../test/utils/stubs');
-const stathat = require('../../lib/stathat');
 const utilHelper = require('../../lib/helpers/util');
 const contentfulAPI = require('contentful');
 const broadcastContentfulFactory = require('../../test/utils/factories/contentful/broadcast');
@@ -46,7 +45,6 @@ const contentfulAPIStub = {
 // Setup!
 test.beforeEach(() => {
   stubs.stubLogger(sandbox, logger);
-  sandbox.stub(stathat, 'postStat');
   sandbox.stub(contentfulAPI, 'createClient')
     .returns(contentfulAPIStub);
 });

diff --git a/test/lib/helpers.test.js b/test/lib/helpers.test.js
@@ -14,7 +14,6 @@ const sinon = require('sinon');
 
 // App Modules
 const stubs = require('../../test/utils/stubs');
-const stathat = require('../../lib/stathat');
 
 // Module to test
 const helpers = require('../../lib/helpers');
@@ -29,7 +28,6 @@ const sandbox = sinon.sandbox.create();
 test.beforeEach((t) => {
   stubs.stubLogger(sandbox, logger);
   sandbox.stub(newrelic, 'addCustomParameters');
-  sandbox.stub(stathat, 'postStat');
 
   // setup spies
   sandbox.spy(helpers, 'sendErrorResponse');

diff --git a/test/lib/middleware/authenticate.test.js b/test/lib/middleware/authenticate.test.js
@@ -8,9 +8,7 @@ const sinon = require('sinon');
 const sinonChai = require('sinon-chai');
 const httpMocks = require('node-mocks-http');
 const logger = require('winston');
-const underscore = require('underscore');
 
-const stathat = require('../../../lib/stathat');
 const config = require('../../../config/lib/middleware/authenticate');
 const stubs = require('../../utils/stubs');
 
@@ -26,13 +24,10 @@ const sandbox = sinon.sandbox.create();
 
 // stubs
 const endpointStub = '/v1/topics';
-const stathatStub = underscore.noop;
 
 // Setup!
 test.beforeEach((t) => {
   stubs.stubLogger(sandbox, logger);
-  sandbox.stub(stathat, 'postStat').returns(stathatStub);
-
   // setup res mock
   t.context.res = httpMocks.createResponse();
 });