Merge pull request #101 from overleaf/jpa-bump-metrics-module

[misc] bump metrics module to 3.4.1

services/track-changes/app.js

@@ -5,7 +5,7 @@
  * DS207: Consider shorter variations of null checks
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
-const Metrics = require('metrics-sharelatex')
+const Metrics = require('@overleaf/metrics')
 Metrics.initialize('track-changes')
 const Settings = require('settings-sharelatex')
 const logger = require('logger-sharelatex')

services/track-changes/app/js/MongoAWS.js

@@ -22,7 +22,7 @@ const { db, ObjectId } = require('./mongodb')
 const JSONStream = require('JSONStream')
 const ReadlineStream = require('byline')
 const zlib = require('zlib')
-const Metrics = require('metrics-sharelatex')
+const Metrics = require('@overleaf/metrics')
 
 const DAYS = 24 * 3600 * 1000 // one day in milliseconds
 

services/track-changes/app/js/MongoManager.js

@@ -16,7 +16,7 @@ const { db, ObjectId } = require('./mongodb')
 const PackManager = require('./PackManager')
 const async = require('async')
 const _ = require('underscore')
-const metrics = require('metrics-sharelatex')
+const metrics = require('@overleaf/metrics')
 const logger = require('logger-sharelatex')
 
 module.exports = MongoManager = {

services/track-changes/app/js/PackManager.js

@@ -22,7 +22,7 @@ const { db, ObjectId } = require('./mongodb')
 const logger = require('logger-sharelatex')
 const LockManager = require('./LockManager')
 const MongoAWS = require('./MongoAWS')
-const Metrics = require('metrics-sharelatex')
+const Metrics = require('@overleaf/metrics')
 const ProjectIterator = require('./ProjectIterator')
 const Settings = require('settings-sharelatex')
 const keys = Settings.redis.lock.key_schema

services/track-changes/app/js/PackWorker.js

@@ -21,7 +21,7 @@ const async = require('async')
 const _ = require('underscore')
 const { db, ObjectId, waitForDb, closeDb } = require('./mongodb')
 const fs = require('fs')
-const Metrics = require('metrics-sharelatex')
+const Metrics = require('@overleaf/metrics')
 Metrics.initialize('track-changes')
 const logger = require('logger-sharelatex')
 logger.initialize('track-changes-packworker')

services/track-changes/package.json

@@ -18,6 +18,7 @@
     "format:fix": "node_modules/.bin/prettier-eslint $PWD'/**/*.js' --write"
   },
   "dependencies": {
+    "@overleaf/metrics": "^3.4.1",
     "@overleaf/o-error": "^3.1.0",
     "@overleaf/redis-wrapper": "^2.0.0",
     "JSONStream": "^1.3.5",
@@ -30,7 +31,6 @@
     "heap": "^0.2.6",
     "line-reader": "^0.4.0",
     "logger-sharelatex": "^2.2.0",
-    "metrics-sharelatex": "^2.6.2",
     "mongo-uri": "^0.1.2",
     "mongodb": "^3.6.0",
     "redis": "~0.10.1",

services/track-changes/test/unit/js/DocArchive/MongoAWS.js

@@ -47,7 +47,7 @@ describe('MongoAWS', function () {
         './mongodb': { db: (this.db = {}), ObjectId },
         JSONStream: (this.JSONStream = {}),
         'readline-stream': (this.readline = sinon.stub()),
-        'metrics-sharelatex': { inc() {} }
+        '@overleaf/metrics': { inc() {} }
       }
     })
 

services/track-changes/test/unit/js/MongoManager/MongoManagerTests.js

@@ -26,7 +26,7 @@ describe('MongoManager', function () {
       requires: {
         './mongodb': { db: (this.db = {}), ObjectId },
         './PackManager': (this.PackManager = {}),
-        'metrics-sharelatex': { timeAsyncMethod() {} },
+        '@overleaf/metrics': { timeAsyncMethod() {} },
         'logger-sharelatex': { log() {} }
       }
     })

services/track-changes/test/unit/js/PackManager/PackManagerTests.js

@@ -32,7 +32,7 @@ describe('PackManager', function () {
         './LockManager': {},
         './MongoAWS': {},
         'logger-sharelatex': { log: sinon.stub(), error: sinon.stub() },
-        'metrics-sharelatex': { inc() {} },
+        '@overleaf/metrics': { inc() {} },
         './ProjectIterator': require('../../../../app/js/ProjectIterator.js'), // Cache for speed
         'settings-sharelatex': {
           redis: { lock: { key_schema: {} } }