Fix Dependencies

README.md

@@ -16,16 +16,7 @@ npm install --save @senecacdot/satellite
 
 ## Configure
 
-You need to set the following environment variables if you want Elastic APM
-monitoring for your service:
-
-- `ELASTIC_APM_SERVER_URL`: the URL to the APM server (e.g., <http://localhost:8200>)
-- `ELASTIC_APM_SERVICE_NAME`: the name of the service as it will appear in APM
-
-If you don't provide these values in your environment, APM monitoring will be
-disabled.
-
-In addition, the following JWT verification values are required:
+The following JWT verification values are required:
 
 - `SECRET`: the secret used for JWT token verification
 - `JWT_AUDIENCE`: the audience (aud) claim expected in JWT token verification

package.json

@@ -22,12 +22,10 @@
   },
   "homepage": "https://github.com/Seneca-CDOT/satellite#readme",
   "dependencies": {
-    "@elastic/ecs-pino-format": "^1.1.1",
     "@elastic/elasticsearch": "^7.12.0",
     "@elastic/elasticsearch-mock": "^0.3.0",
     "@godaddy/terminus": "^4.7.1",
     "cors": "2.8.5",
-    "elastic-apm-node": "^3.14.0",
     "express": "4.17.1",
     "express-jwt": "^6.0.0",
     "express-pino-logger": "^6.0.0",
@@ -49,7 +47,7 @@
     "eslint-plugin-jest": "^25.3.0",
     "get-port": "^5.1.1",
     "husky": "^5.1.3",
-    "jest": "^26.6.3",
+    "jest": "^27.4.7",
     "nock": "^13.0.11",
     "prettier": "2.2.1",
     "pretty-quick": "3.1.0"

src/app.js

@@ -5,7 +5,6 @@ const createError = require('http-errors');
 const expressPino = require('express-pino-logger');
 
 const logger = require('./logger');
-const apm = require('./apm');
 const { errorHandler } = require('./middleware');
 
 function createApp(router, options = {}) {
@@ -57,12 +56,6 @@ function createApp(router, options = {}) {
     next(createError(404, `${req.originalUrl} not found`));
   });
 
-  // If we're using APM, add APM error collection
-  // middleware before default error handler
-  if (apm) {
-    app.use(apm.middleware.connect());
-  }
-
   // Add our default error handler
   app.use(errorHandler);
 

src/index.js

@@ -1,5 +1,3 @@
-require('./apm');
-
 const { isAuthenticated, isAuthorized } = require('./middleware');
 const { createRouter } = require('./app');
 

src/logger.js

@@ -1,15 +1,9 @@
 const pino = require('pino');
 
-const usingElastic = process.env.ELASTIC_APM_SERVER_URL && process.env.ELASTIC_APM_SERVICE_NAME;
-
-// Pick our logger based on whether we're using APM monitoring with ELK
-let logger = usingElastic
-  ? // Structured JSON logging
-    pino(require('@elastic/ecs-pino-format')({ convertReqRes: true }))
-  : // Pretty debug logging
-    pino({
-      prettyPrint: {},
-      prettifier: require('pino-colada'),
-    });
+// Pretty debug logging
+let logger = pino({
+  prettyPrint: {},
+  prettifier: require('pino-colada'),
+});
 
 module.exports = logger;