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

[misc] bump metrics module to 3.4.1

services/filestore/app.js

@@ -1,4 +1,4 @@
-const Metrics = require('metrics-sharelatex')
+const Metrics = require('@overleaf/metrics')
 Metrics.initialize(process.env.METRICS_APP_NAME || 'filestore')
 
 const logger = require('logger-sharelatex')

services/filestore/app/js/FileController.js

@@ -1,6 +1,6 @@
 const PersistorManager = require('./PersistorManager')
 const FileHandler = require('./FileHandler')
-const metrics = require('metrics-sharelatex')
+const metrics = require('@overleaf/metrics')
 const parseRange = require('range-parser')
 const Errors = require('./Errors')
 const { pipeline } = require('stream')

services/filestore/app/js/FileConverter.js

@@ -1,4 +1,4 @@
-const metrics = require('metrics-sharelatex')
+const metrics = require('@overleaf/metrics')
 const Settings = require('settings-sharelatex')
 const { callbackify } = require('util')
 

services/filestore/app/js/ImageOptimiser.js

@@ -1,5 +1,5 @@
 const logger = require('logger-sharelatex')
-const metrics = require('metrics-sharelatex')
+const metrics = require('@overleaf/metrics')
 const { callbackify } = require('util')
 const safeExec = require('./SafeExec').promises
 

services/filestore/app/js/LocalFileWriter.js

@@ -3,7 +3,7 @@ const uuid = require('node-uuid')
 const path = require('path')
 const Stream = require('stream')
 const { callbackify, promisify } = require('util')
-const metrics = require('metrics-sharelatex')
+const metrics = require('@overleaf/metrics')
 const Settings = require('settings-sharelatex')
 const { WriteError } = require('./Errors')
 

services/filestore/app/js/PersistorManager.js

@@ -1,7 +1,7 @@
 const settings = require('settings-sharelatex')
 
 const persistorSettings = settings.filestore
-persistorSettings.Metrics = require('metrics-sharelatex')
+persistorSettings.Metrics = require('@overleaf/metrics')
 persistorSettings.paths = settings.path
 
 const ObjectPersistor = require('@overleaf/object-persistor')

services/filestore/app/js/RequestLogger.js

@@ -1,5 +1,5 @@
 const logger = require('logger-sharelatex')
-const metrics = require('metrics-sharelatex')
+const metrics = require('@overleaf/metrics')
 
 class RequestLogger {
   constructor() {

services/filestore/package.json

@@ -20,6 +20,7 @@
     "test:unit:_run": "mocha --recursive --reporter spec $@ test/unit/js"
   },
   "dependencies": {
+    "@overleaf/metrics": "^3.4.1",
     "@overleaf/o-error": "^3.0.0",
     "@overleaf/object-persistor": "git+https://github.com/overleaf/object-persistor.git",
     "body-parser": "^1.19.0",
@@ -28,7 +29,6 @@
     "glob": "^7.1.6",
     "lodash.once": "^4.1.1",
     "logger-sharelatex": "^2.2.0",
-    "metrics-sharelatex": "^2.7.0",
     "node-uuid": "~1.4.8",
     "range-parser": "^1.2.1",
     "request": "^2.88.2",

services/filestore/test/unit/js/FileControllerTests.js

@@ -59,7 +59,7 @@ describe('FileController', function () {
         './Errors': Errors,
         stream: stream,
         'settings-sharelatex': settings,
-        'metrics-sharelatex': {
+        '@overleaf/metrics': {
           inc() {}
         }
       },

services/filestore/test/unit/js/FileConverterTests.js

@@ -28,7 +28,7 @@ describe('FileConverter', function () {
     FileConverter = SandboxedModule.require(modulePath, {
       requires: {
         './SafeExec': SafeExec,
-        'metrics-sharelatex': {
+        '@overleaf/metrics': {
           inc: sinon.stub(),
           Timer: sinon.stub().returns({ done: sinon.stub() })
         },

services/filestore/test/unit/js/ImageOptimiserTests.js

@@ -20,7 +20,7 @@ describe('ImageOptimiser', function () {
       requires: {
         './SafeExec': SafeExec,
         'logger-sharelatex': logger,
-        'metrics-sharelatex': {
+        '@overleaf/metrics': {
           Timer: sinon.stub().returns({ done: sinon.stub() })
         }
       }

services/filestore/test/unit/js/LocalFileWriterTests.js

@@ -30,7 +30,7 @@ describe('LocalFileWriter', function () {
         fs,
         stream,
         'settings-sharelatex': settings,
-        'metrics-sharelatex': {
+        '@overleaf/metrics': {
           inc: sinon.stub(),
           Timer: sinon.stub().returns({ done: sinon.stub() })
         },