Merge pull request #6079 from overleaf/em-upgrade-logger

Upgrade logger and metrics in all services

GitOrigin-RevId: 2baf63eeeab77fb3559cf763ddacfbf4b745cd0b

services/filestore/app.js

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

services/filestore/app/js/ImageOptimiser.js

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

services/filestore/app/js/RequestLogger.js

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

services/filestore/package.json

@@ -21,7 +21,8 @@
     "lint:fix": "eslint --fix ."
   },
   "dependencies": {
-    "@overleaf/metrics": "^3.5.1",
+    "@overleaf/logger": "^3.1.0",
+    "@overleaf/metrics": "^4.0.0",
     "@overleaf/o-error": "^3.0.0",
     "@overleaf/object-persistor": "^1.0.1",
     "@overleaf/settings": "^2.1.1",
@@ -31,7 +32,6 @@
     "fast-crc32c": "^2.0.0",
     "glob": "^7.1.6",
     "lodash.once": "^4.1.1",
-    "logger-sharelatex": "^2.2.0",
     "node-uuid": "~1.4.8",
     "range-parser": "^1.2.1",
     "request": "^2.88.2",

services/filestore/test/acceptance/js/FilestoreApp.js

@@ -1,4 +1,4 @@
-const logger = require('logger-sharelatex')
+const logger = require('@overleaf/logger')
 const Settings = require('@overleaf/settings')
 const fs = require('fs')
 const Path = require('path')

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

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