Merge pull request #5648 from overleaf/em-revert-gcp-logging-web

Revert "Improve GCP logging for web"

GitOrigin-RevId: 92d446baf62108da1df92146eec12a2fe69d30ee

services/web/app.js

@@ -12,7 +12,7 @@
 const metrics = require('@overleaf/metrics')
 metrics.initialize(process.env.METRICS_APP_NAME || 'web')
 const Settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const PlansLocator = require('./app/src/Features/Subscription/PlansLocator')
 logger.initialize(process.env.METRICS_APP_NAME || 'web')
 logger.logger.serializers.user = require('./app/src/infrastructure/LoggerSerializers').user

services/web/app/src/Features/Analytics/AnalyticsManager.js

@@ -6,7 +6,7 @@ const Queues = require('../../infrastructure/Queues')
 const uuid = require('uuid')
 const _ = require('lodash')
 const { expressify } = require('../../util/promises')
-const { logger } = require('@overleaf/logger')
+const { logger } = require('logger-sharelatex')
 
 const analyticsEventsQueue = Queues.getQueue('analytics-events')
 const analyticsEditingSessionsQueue = Queues.getQueue(

services/web/app/src/Features/Analytics/AnalyticsRegistrationSourceMiddleware.js

@@ -1,4 +1,4 @@
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const OError = require('@overleaf/o-error')
 const AnalyticsRegistrationSourceHelper = require('./AnalyticsRegistrationSourceHelper')
 const SessionManager = require('../../Features/Authentication/SessionManager')

services/web/app/src/Features/Authentication/AuthenticationController.js

@@ -4,7 +4,7 @@ const OError = require('@overleaf/o-error')
 const LoginRateLimiter = require('../Security/LoginRateLimiter')
 const UserUpdater = require('../User/UserUpdater')
 const Metrics = require('@overleaf/metrics')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const querystring = require('querystring')
 const Settings = require('@overleaf/settings')
 const basicAuth = require('basic-auth-connect')

services/web/app/src/Features/Authorization/AuthorizationMiddleware.js

@@ -1,5 +1,5 @@
 const AuthorizationManager = require('./AuthorizationManager')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const { ObjectId } = require('mongodb')
 const Errors = require('../Errors/Errors')
 const HttpErrorHandler = require('../Errors/HttpErrorHandler')

services/web/app/src/Features/BetaProgram/BetaProgramController.js

@@ -2,7 +2,7 @@ const BetaProgramHandler = require('./BetaProgramHandler')
 const OError = require('@overleaf/o-error')
 const UserGetter = require('../User/UserGetter')
 const Settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const SessionManager = require('../Authentication/SessionManager')
 
 const BetaProgramController = {

services/web/app/src/Features/BrandVariations/BrandVariationsHandler.js

@@ -1,7 +1,7 @@
 const OError = require('@overleaf/o-error')
 const { URL } = require('url')
 const settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const V1Api = require('../V1/V1Api')
 const sanitizeHtml = require('sanitize-html')
 

services/web/app/src/Features/Captcha/CaptchaMiddleware.js

@@ -12,7 +12,7 @@
  */
 let CaptchaMiddleware
 const request = require('request')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const Settings = require('@overleaf/settings')
 
 module.exports = CaptchaMiddleware = {

services/web/app/src/Features/Collaborators/CollaboratorsController.js

@@ -8,7 +8,7 @@ const SessionManager = require('../Authentication/SessionManager')
 const EditorRealTimeController = require('../Editor/EditorRealTimeController')
 const TagsHandler = require('../Tags/TagsHandler')
 const Errors = require('../Errors/Errors')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const { expressify } = require('../../util/promises')
 
 module.exports = {

services/web/app/src/Features/Collaborators/CollaboratorsHandler.js

@@ -3,7 +3,7 @@ const OError = require('@overleaf/o-error')
 const { Project } = require('../../models/Project')
 const ProjectGetter = require('../Project/ProjectGetter')
 const ProjectHelper = require('../Project/ProjectHelper')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const ContactManager = require('../Contacts/ContactManager')
 const PrivilegeLevels = require('../Authorization/PrivilegeLevels')
 const TpdsProjectFlusher = require('../ThirdPartyDataStore/TpdsProjectFlusher')

services/web/app/src/Features/Collaborators/CollaboratorsInviteController.js

@@ -19,7 +19,7 @@ const LimitationsManager = require('../Subscription/LimitationsManager')
 const UserGetter = require('../User/UserGetter')
 const CollaboratorsGetter = require('./CollaboratorsGetter')
 const CollaboratorsInviteHandler = require('./CollaboratorsInviteHandler')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const Settings = require('@overleaf/settings')
 const EmailHelper = require('../Helpers/EmailHelper')
 const EditorRealTimeController = require('../Editor/EditorRealTimeController')

services/web/app/src/Features/Collaborators/CollaboratorsInviteHandler.js

@@ -13,7 +13,7 @@
  */
 const { ProjectInvite } = require('../../models/ProjectInvite')
 const OError = require('@overleaf/o-error')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const CollaboratorsEmailHandler = require('./CollaboratorsEmailHandler')
 const CollaboratorsHandler = require('./CollaboratorsHandler')
 const UserGetter = require('../User/UserGetter')

services/web/app/src/Features/Collaborators/OwnershipTransferHandler.js

@@ -1,4 +1,4 @@
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const { Project } = require('../../models/Project')
 const ProjectGetter = require('../Project/ProjectGetter')
 const UserGetter = require('../User/UserGetter')

services/web/app/src/Features/Compile/ClsiCookieManager.js

@@ -21,7 +21,7 @@ if (Settings.redis.clsi_cookie_secondary != null) {
   rclient_secondary = RedisWrapper.client('clsi_cookie_secondary')
 }
 const Cookie = require('cookie')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const Metrics = require('@overleaf/metrics')
 
 const clsiCookiesEnabled =

services/web/app/src/Features/Compile/ClsiManager.js

@@ -3,7 +3,7 @@ const Settings = require('@overleaf/settings')
 const request = require('request')
 const ProjectGetter = require('../Project/ProjectGetter')
 const ProjectEntityHandler = require('../Project/ProjectEntityHandler')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const { URL } = require('url')
 const OError = require('@overleaf/o-error')
 

services/web/app/src/Features/Compile/ClsiStateManager.js

@@ -15,7 +15,7 @@
  */
 let ClsiStateManager
 const Settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const crypto = require('crypto')
 const ProjectEntityHandler = require('../Project/ProjectEntityHandler')
 

services/web/app/src/Features/Compile/CompileController.js

@@ -18,7 +18,7 @@ const Metrics = require('@overleaf/metrics')
 const ProjectGetter = require('../Project/ProjectGetter')
 const CompileManager = require('./CompileManager')
 const ClsiManager = require('./ClsiManager')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const request = require('request')
 const Settings = require('@overleaf/settings')
 const SessionManager = require('../Authentication/SessionManager')

services/web/app/src/Features/Contacts/ContactController.js

@@ -16,7 +16,7 @@ let ContactsController
 const SessionManager = require('../Authentication/SessionManager')
 const ContactManager = require('./ContactManager')
 const UserGetter = require('../User/UserGetter')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const Modules = require('../../infrastructure/Modules')
 
 module.exports = ContactsController = {

services/web/app/src/Features/Cooldown/CooldownManager.js

@@ -13,7 +13,7 @@
 let CooldownManager
 const RedisWrapper = require('../../infrastructure/RedisWrapper')
 const rclient = RedisWrapper.client('cooldown')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 
 const COOLDOWN_IN_SECONDS = 60 * 10
 

services/web/app/src/Features/Cooldown/CooldownMiddleware.js

@@ -12,7 +12,7 @@
  */
 let CooldownMiddleware
 const CooldownManager = require('./CooldownManager')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 
 module.exports = CooldownMiddleware = {
   freezeProject(req, res, next) {

services/web/app/src/Features/Docstore/DocstoreManager.js

@@ -2,7 +2,7 @@ const { promisify } = require('util')
 const { promisifyMultiResult } = require('../../util/promises')
 const request = require('request').defaults({ jar: false })
 const OError = require('@overleaf/o-error')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const settings = require('@overleaf/settings')
 const Errors = require('../Errors/Errors')
 

services/web/app/src/Features/DocumentUpdater/DocumentUpdaterHandler.js

@@ -3,7 +3,7 @@ const OError = require('@overleaf/o-error')
 const settings = require('@overleaf/settings')
 const _ = require('underscore')
 const async = require('async')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const metrics = require('@overleaf/metrics')
 const { promisify } = require('util')
 

services/web/app/src/Features/Documents/DocumentController.js

@@ -3,7 +3,7 @@ const OError = require('@overleaf/o-error')
 const ProjectLocator = require('../Project/ProjectLocator')
 const ProjectEntityHandler = require('../Project/ProjectEntityHandler')
 const ProjectEntityUpdateHandler = require('../Project/ProjectEntityUpdateHandler')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const _ = require('lodash')
 
 function getDocument(req, res, next) {

services/web/app/src/Features/Downloads/ProjectDownloadsController.js

@@ -12,7 +12,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 let ProjectDownloadsController
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const Metrics = require('@overleaf/metrics')
 const ProjectGetter = require('../Project/ProjectGetter')
 const ProjectZipStreamManager = require('./ProjectZipStreamManager')

services/web/app/src/Features/Downloads/ProjectZipStreamManager.js

@@ -1,7 +1,7 @@
 let ProjectZipStreamManager
 const archiver = require('archiver')
 const async = require('async')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const ProjectEntityHandler = require('../Project/ProjectEntityHandler')
 const ProjectGetter = require('../Project/ProjectGetter')
 const FileStoreHandler = require('../FileStore/FileStoreHandler')

services/web/app/src/Features/Editor/EditorController.js

@@ -13,7 +13,7 @@
  * DS207: Consider shorter variations of null checks
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const OError = require('@overleaf/o-error')
 const Metrics = require('@overleaf/metrics')
 const ProjectEntityUpdateHandler = require('../Project/ProjectEntityUpdateHandler')

services/web/app/src/Features/Editor/EditorHttpController.js

@@ -14,7 +14,7 @@ const Errors = require('../Errors/Errors')
 const HttpErrorHandler = require('../Errors/HttpErrorHandler')
 const ProjectEntityUpdateHandler = require('../Project/ProjectEntityUpdateHandler')
 const DocstoreManager = require('../Docstore/DocstoreManager')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const { expressify } = require('../../util/promises')
 
 module.exports = {

services/web/app/src/Features/Email/EmailSender.js

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

services/web/app/src/Features/Errors/ErrorController.js

@@ -1,6 +1,6 @@
 let ErrorController
 const Errors = require('./Errors')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const SessionManager = require('../Authentication/SessionManager')
 const SamlLogHandler = require('../SamlLog/SamlLogHandler')
 const HttpErrorHandler = require('./HttpErrorHandler')

services/web/app/src/Features/Errors/HttpErrorHandler.js

@@ -1,4 +1,4 @@
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const Settings = require('@overleaf/settings')
 
 function renderJSONError(res, message, info = {}) {

services/web/app/src/Features/Exports/ExportsController.js

@@ -12,7 +12,7 @@
  */
 const ExportsHandler = require('./ExportsHandler')
 const SessionManager = require('../Authentication/SessionManager')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 
 module.exports = {
   exportProject(req, res, next) {

services/web/app/src/Features/Exports/ExportsHandler.js

@@ -20,7 +20,7 @@ const ProjectHistoryHandler = require('../Project/ProjectHistoryHandler')
 const ProjectLocator = require('../Project/ProjectLocator')
 const ProjectRootDocManager = require('../Project/ProjectRootDocManager')
 const UserGetter = require('../User/UserGetter')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 let settings = require('@overleaf/settings')
 const async = require('async')
 let request = require('request')

services/web/app/src/Features/FileStore/FileHashManager.js

@@ -13,7 +13,7 @@
  */
 let FileHashManager
 const crypto = require('crypto')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const fs = require('fs')
 const _ = require('underscore')
 

services/web/app/src/Features/FileStore/FileStoreController.js

@@ -1,4 +1,4 @@
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 
 const FileStoreHandler = require('./FileStoreHandler')
 const ProjectLocator = require('../Project/ProjectLocator')

services/web/app/src/Features/FileStore/FileStoreHandler.js

@@ -1,5 +1,5 @@
 const _ = require('underscore')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const fs = require('fs')
 const request = require('request')
 const settings = require('@overleaf/settings')

services/web/app/src/Features/HealthCheck/HealthCheckController.js

@@ -1,7 +1,7 @@
 const RedisWrapper = require('../../infrastructure/RedisWrapper')
 const rclient = RedisWrapper.client('health_check')
 const settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const UserGetter = require('../User/UserGetter')
 const {
   SmokeTestFailure,

services/web/app/src/Features/History/HistoryController.js

@@ -1,7 +1,7 @@
 let HistoryController
 const OError = require('@overleaf/o-error')
 const async = require('async')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const request = require('request')
 const settings = require('@overleaf/settings')
 const SessionManager = require('../Authentication/SessionManager')

services/web/app/src/Features/InactiveData/InactiveProjectManager.js

@@ -14,7 +14,7 @@ let InactiveProjectManager
 const OError = require('@overleaf/o-error')
 const async = require('async')
 const _ = require('underscore')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const DocstoreManager = require('../Docstore/DocstoreManager')
 const ProjectGetter = require('../Project/ProjectGetter')
 const ProjectUpdateHandler = require('../Project/ProjectUpdateHandler')

services/web/app/src/Features/Institutions/InstitutionsAPI.js

@@ -1,5 +1,5 @@
 const OError = require('@overleaf/o-error')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const metrics = require('@overleaf/metrics')
 const settings = require('@overleaf/settings')
 const request = require('requestretry')

services/web/app/src/Features/LinkedFiles/LinkedFilesController.js

@@ -17,7 +17,7 @@ const SessionManager = require('../Authentication/SessionManager')
 const EditorController = require('../Editor/EditorController')
 const ProjectLocator = require('../Project/ProjectLocator')
 const Settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const _ = require('underscore')
 const LinkedFilesHandler = require('./LinkedFilesHandler')
 const {

services/web/app/src/Features/Metadata/MetaController.js

@@ -15,7 +15,7 @@ let MetaController
 const OError = require('@overleaf/o-error')
 const EditorRealTimeController = require('../Editor/EditorRealTimeController')
 const MetaHandler = require('./MetaHandler')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 
 module.exports = MetaController = {
   getMetadata(req, res, next) {

services/web/app/src/Features/Newsletter/NewsletterManager.js

@@ -1,5 +1,5 @@
 const { callbackify } = require('util')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const Settings = require('@overleaf/settings')
 const crypto = require('crypto')
 const Mailchimp = require('mailchimp-api-v3')

services/web/app/src/Features/Notifications/NotificationsHandler.js

@@ -1,6 +1,6 @@
 const settings = require('@overleaf/settings')
 const request = require('request')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const _ = require('lodash')
 
 const notificationsApi = _.get(settings, ['apis', 'notifications', 'url'])

services/web/app/src/Features/Project/ProjectApiController.js

@@ -12,7 +12,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 const ProjectDetailsHandler = require('./ProjectDetailsHandler')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 
 module.exports = {
   getProjectDetails(req, res, next) {

services/web/app/src/Features/Project/ProjectController.js

@@ -4,7 +4,7 @@ const OError = require('@overleaf/o-error')
 const fs = require('fs')
 const crypto = require('crypto')
 const async = require('async')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const { ObjectId } = require('mongodb')
 const ProjectDeleter = require('./ProjectDeleter')
 const ProjectDuplicator = require('./ProjectDuplicator')

services/web/app/src/Features/Project/ProjectCreationHandler.js

@@ -1,4 +1,4 @@
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const OError = require('@overleaf/o-error')
 const metrics = require('@overleaf/metrics')
 const Settings = require('@overleaf/settings')

services/web/app/src/Features/Project/ProjectDeleter.js

@@ -5,7 +5,7 @@ const { callbackify } = require('util')
 const { Project } = require('../../models/Project')
 const { DeletedProject } = require('../../models/DeletedProject')
 const Errors = require('../Errors/Errors')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const DocumentUpdaterHandler = require('../DocumentUpdater/DocumentUpdaterHandler')
 const TagsHandler = require('../Tags/TagsHandler')
 const ProjectHelper = require('./ProjectHelper')

services/web/app/src/Features/Project/ProjectDetailsHandler.js

@@ -2,7 +2,7 @@ const _ = require('underscore')
 const ProjectGetter = require('./ProjectGetter')
 const UserGetter = require('../User/UserGetter')
 const { Project } = require('../../models/Project')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const TpdsUpdateSender = require('../ThirdPartyDataStore/TpdsUpdateSender')
 const PublicAccessLevels = require('../Authorization/PublicAccessLevels')
 const Errors = require('../Errors/Errors')

services/web/app/src/Features/Project/ProjectEntityMongoUpdateHandler.js

@@ -1,7 +1,7 @@
 const { callbackify } = require('util')
 const { callbackifyMultiResult } = require('../../util/promises')
 const _ = require('underscore')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const path = require('path')
 const { ObjectId } = require('mongodb')
 const Settings = require('@overleaf/settings')

services/web/app/src/Features/Project/ProjectEntityUpdateHandler.js

@@ -1,7 +1,7 @@
 const _ = require('lodash')
 const OError = require('@overleaf/o-error')
 const async = require('async')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const Settings = require('@overleaf/settings')
 const Path = require('path')
 const fs = require('fs')

services/web/app/src/Features/Project/ProjectGetter.js

@@ -4,7 +4,7 @@ const OError = require('@overleaf/o-error')
 const metrics = require('@overleaf/metrics')
 const { promisifyAll } = require('../../util/promises')
 const { Project } = require('../../models/Project')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const LockManager = require('../../infrastructure/LockManager')
 const { DeletedProject } = require('../../models/DeletedProject')
 

services/web/app/src/Features/Project/ProjectHistoryHandler.js

@@ -15,7 +15,7 @@
  */
 const { Project } = require('../../models/Project')
 const ProjectDetailsHandler = require('./ProjectDetailsHandler')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const settings = require('@overleaf/settings')
 const HistoryManager = require('../History/HistoryManager')
 const ProjectEntityUpdateHandler = require('./ProjectEntityUpdateHandler')

services/web/app/src/Features/Project/ProjectLocator.js

@@ -1,5 +1,5 @@
 const _ = require('underscore')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const async = require('async')
 const ProjectGetter = require('./ProjectGetter')
 const Errors = require('../Errors/Errors')

services/web/app/src/Features/Project/ProjectUpdateHandler.js

@@ -12,7 +12,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 const { Project } = require('../../models/Project')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 
 module.exports = {
   markAsUpdated(projectId, lastUpdatedAt, lastUpdatedBy, callback) {

services/web/app/src/Features/Publishers/PublishersGetter.js

@@ -15,7 +15,7 @@
 let PublishersGetter
 const UserMembershipsHandler = require('../UserMembership/UserMembershipsHandler')
 const UserMembershipEntityConfigs = require('../UserMembership/UserMembershipEntityConfigs')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const _ = require('underscore')
 
 module.exports = PublishersGetter = {

services/web/app/src/Features/References/ReferencesController.js

@@ -11,7 +11,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 let ReferencesController
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const ReferencesHandler = require('./ReferencesHandler')
 const settings = require('@overleaf/settings')
 const EditorRealTimeController = require('../Editor/EditorRealTimeController')

services/web/app/src/Features/References/ReferencesHandler.js

@@ -14,7 +14,7 @@
  */
 let ReferencesHandler
 const OError = require('@overleaf/o-error')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const request = require('request')
 const settings = require('@overleaf/settings')
 const Features = require('../../infrastructure/Features')

services/web/app/src/Features/SamlLog/SamlLogHandler.js

@@ -1,5 +1,5 @@
 const { SamlLog } = require('../../models/SamlLog')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 
 function log(providerId, sessionId, data) {
   try {

services/web/app/src/Features/Security/RateLimiterMiddleware.js

@@ -1,5 +1,5 @@
 const RateLimiter = require('../../infrastructure/RateLimiter')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const SessionManager = require('../Authentication/SessionManager')
 const LoginRateLimiter = require('./LoginRateLimiter')
 const settings = require('@overleaf/settings')

services/web/app/src/Features/ServerAdmin/AdminController.js

@@ -16,7 +16,7 @@
  */
 
 const metrics = require('@overleaf/metrics')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const _ = require('underscore')
 const DocumentUpdaterHandler = require('../DocumentUpdater/DocumentUpdaterHandler')
 const Settings = require('@overleaf/settings')

services/web/app/src/Features/Spelling/SpellingController.js

@@ -1,6 +1,6 @@
 const request = require('request')
 const Settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const SessionManager = require('../Authentication/SessionManager')
 
 const TEN_SECONDS = 1000 * 10

services/web/app/src/Features/StaticPages/UniversityController.js

@@ -11,7 +11,7 @@
  */
 let UniversityController
 const settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const Settings = require('@overleaf/settings')
 
 module.exports = UniversityController = {

services/web/app/src/Features/Subscription/FeaturesUpdater.js

@@ -6,7 +6,7 @@ const SubscriptionLocator = require('./SubscriptionLocator')
 const UserFeaturesUpdater = require('./UserFeaturesUpdater')
 const FeaturesHelper = require('./FeaturesHelper')
 const Settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const ReferalFeatures = require('../Referal/ReferalFeatures')
 const V1SubscriptionManager = require('./V1SubscriptionManager')
 const InstitutionsFeatures = require('../Institutions/InstitutionsFeatures')

services/web/app/src/Features/Subscription/LimitationsManager.js

@@ -1,5 +1,5 @@
 const OError = require('@overleaf/o-error')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const ProjectGetter = require('../Project/ProjectGetter')
 const UserGetter = require('../User/UserGetter')
 const SubscriptionLocator = require('./SubscriptionLocator')

services/web/app/src/Features/Subscription/PlansLocator.js

@@ -1,5 +1,5 @@
 const Settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 
 function ensurePlansAreSetupCorrectly() {
   Settings.plans.forEach(plan => {

services/web/app/src/Features/Subscription/RecurlyClient.js

@@ -1,6 +1,6 @@
 const recurly = require('recurly')
 const Settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const { callbackify } = require('util')
 const UserGetter = require('../User/UserGetter')
 

services/web/app/src/Features/Subscription/RecurlyWrapper.js

@@ -21,7 +21,7 @@ const crypto = require('crypto')
 const request = require('request')
 const Settings = require('@overleaf/settings')
 const xml2js = require('xml2js')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const Async = require('async')
 const Errors = require('../Errors/Errors')
 const SubscriptionErrors = require('./Errors')

services/web/app/src/Features/Subscription/SubscriptionController.js

@@ -5,7 +5,7 @@ const SubscriptionViewModelBuilder = require('./SubscriptionViewModelBuilder')
 const LimitationsManager = require('./LimitationsManager')
 const RecurlyWrapper = require('./RecurlyWrapper')
 const Settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const GeoIpLookup = require('../../infrastructure/GeoIpLookup')
 const FeaturesUpdater = require('./FeaturesUpdater')
 const planFeatures = require('./planFeatures')

services/web/app/src/Features/Subscription/SubscriptionGroupController.js

@@ -13,7 +13,7 @@
  */
 const SubscriptionGroupHandler = require('./SubscriptionGroupHandler')
 const OError = require('@overleaf/o-error')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const SubscriptionLocator = require('./SubscriptionLocator')
 const SessionManager = require('../Authentication/SessionManager')
 const _ = require('underscore')

services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js

@@ -21,7 +21,7 @@ const SubscriptionLocator = require('./SubscriptionLocator')
 const UserGetter = require('../User/UserGetter')
 const { Subscription } = require('../../models/Subscription')
 const LimitationsManager = require('./LimitationsManager')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const OneTimeTokenHandler = require('../Security/OneTimeTokenHandler')
 const EmailHandler = require('../Email/EmailHandler')
 const settings = require('@overleaf/settings')

services/web/app/src/Features/Subscription/SubscriptionHandler.js

@@ -3,7 +3,7 @@ const { promisify } = require('util')
 const RecurlyWrapper = require('./RecurlyWrapper')
 const RecurlyClient = require('./RecurlyClient')
 const { User } = require('../../models/User')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const SubscriptionUpdater = require('./SubscriptionUpdater')
 const LimitationsManager = require('./LimitationsManager')
 const EmailHandler = require('../Email/EmailHandler')

services/web/app/src/Features/Subscription/SubscriptionLocator.js

@@ -15,7 +15,7 @@
 const { promisify } = require('util')
 const { Subscription } = require('../../models/Subscription')
 const { DeletedSubscription } = require('../../models/DeletedSubscription')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 require('./GroupPlansData') // make sure dynamic group plans are loaded
 
 const SubscriptionLocator = {

services/web/app/src/Features/Subscription/SubscriptionUpdater.js

@@ -7,7 +7,7 @@ const FeaturesUpdater = require('./FeaturesUpdater')
 const FeaturesHelper = require('./FeaturesHelper')
 const AnalyticsManager = require('../Analytics/AnalyticsManager')
 const { DeletedSubscription } = require('../../models/DeletedSubscription')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 
 /**
  * Change the admin of the given subscription.

services/web/app/src/Features/Subscription/TeamInvitesController.js

@@ -11,7 +11,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 const settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const TeamInvitesHandler = require('./TeamInvitesHandler')
 const SessionManager = require('../Authentication/SessionManager')
 const SubscriptionLocator = require('./SubscriptionLocator')

services/web/app/src/Features/Subscription/TeamInvitesHandler.js

@@ -1,5 +1,5 @@
 let TeamInvitesHandler
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const crypto = require('crypto')
 const async = require('async')
 

services/web/app/src/Features/Templates/TemplatesController.js

@@ -16,7 +16,7 @@ const path = require('path')
 const SessionManager = require('../Authentication/SessionManager')
 const TemplatesManager = require('./TemplatesManager')
 const ProjectHelper = require('../Project/ProjectHelper')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 
 module.exports = TemplatesController = {
   getV1Template(req, res) {

services/web/app/src/Features/Templates/TemplatesManager.js

@@ -20,7 +20,7 @@ const FileWriter = require('../../infrastructure/FileWriter')
 const async = require('async')
 const fs = require('fs')
 const util = require('util')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const request = require('request')
 const requestPromise = require('request-promise-native')
 const settings = require('@overleaf/settings')

services/web/app/src/Features/Templates/TemplatesMiddleware.js

@@ -9,7 +9,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 const settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 
 module.exports = {
   saveTemplateDataInSession(req, res, next) {

services/web/app/src/Features/ThirdPartyDataStore/TpdsController.js

@@ -3,7 +3,7 @@ let parseParams
 const TpdsUpdateHandler = require('./TpdsUpdateHandler')
 const UpdateMerger = require('./UpdateMerger')
 const Errors = require('../Errors/Errors')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const Path = require('path')
 const metrics = require('@overleaf/metrics')
 const NotificationsBuilder = require('../Notifications/NotificationsBuilder')

services/web/app/src/Features/ThirdPartyDataStore/TpdsProjectFlusher.js

@@ -1,5 +1,5 @@
 const { callbackify } = require('util')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const DocumentUpdaterHandler = require('../DocumentUpdater/DocumentUpdaterHandler')
 const ProjectGetter = require('../Project/ProjectGetter')
 const ProjectEntityHandler = require('../Project/ProjectEntityHandler')

services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateHandler.js

@@ -1,5 +1,5 @@
 const UpdateMerger = require('./UpdateMerger')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const NotificationsBuilder = require('../Notifications/NotificationsBuilder')
 const ProjectCreationHandler = require('../Project/ProjectCreationHandler')
 const ProjectDeleter = require('../Project/ProjectDeleter')

services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateSender.js

@@ -1,7 +1,7 @@
 const { ObjectId } = require('mongodb')
 const _ = require('lodash')
 const { callbackify } = require('util')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const metrics = require('@overleaf/metrics')
 const path = require('path')
 const request = require('request-promise-native')

services/web/app/src/Features/ThirdPartyDataStore/UpdateMerger.js

@@ -16,7 +16,7 @@ const OError = require('@overleaf/o-error')
 const _ = require('underscore')
 const async = require('async')
 const fs = require('fs')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const EditorController = require('../Editor/EditorController')
 const FileTypeManager = require('../Uploads/FileTypeManager')
 const FileWriter = require('../../infrastructure/FileWriter')

services/web/app/src/Features/TokenAccess/TokenAccessController.js

@@ -2,7 +2,7 @@ const AuthenticationController = require('../Authentication/AuthenticationContro
 const SessionManager = require('../Authentication/SessionManager')
 const TokenAccessHandler = require('./TokenAccessHandler')
 const Errors = require('../Errors/Errors')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const settings = require('@overleaf/settings')
 const OError = require('@overleaf/o-error')
 const { expressify } = require('../../util/promises')

services/web/app/src/Features/TokenAccess/TokenAccessHandler.js

@@ -3,7 +3,7 @@ const PublicAccessLevels = require('../Authorization/PublicAccessLevels')
 const PrivilegeLevels = require('../Authorization/PrivilegeLevels')
 const { ObjectId } = require('mongodb')
 const Settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const V1Api = require('../V1/V1Api')
 const crypto = require('crypto')
 const { promisifyAll } = require('../../util/promises')

services/web/app/src/Features/Uploads/ArchiveManager.js

@@ -12,7 +12,7 @@
  * DS207: Consider shorter variations of null checks
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const OError = require('@overleaf/o-error')
 const metrics = require('@overleaf/metrics')
 const fs = require('fs')

services/web/app/src/Features/Uploads/FileSystemImportManager.js

@@ -5,7 +5,7 @@ const EditorController = require('../Editor/EditorController')
 const Errors = require('../Errors/Errors')
 const FileTypeManager = require('./FileTypeManager')
 const SafePath = require('../Project/SafePath')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 
 module.exports = {
   addEntity: callbackify(addEntity),

services/web/app/src/Features/Uploads/ProjectUploadController.js

@@ -12,7 +12,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 let ProjectUploadController
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const metrics = require('@overleaf/metrics')
 const fs = require('fs')
 const Path = require('path')

services/web/app/src/Features/Uploads/ProjectUploadManager.js

@@ -14,7 +14,7 @@ const ProjectRootDocManager = require('../Project/ProjectRootDocManager')
 const ProjectDetailsHandler = require('../Project/ProjectDetailsHandler')
 const ProjectDeleter = require('../Project/ProjectDeleter')
 const TpdsProjectFlusher = require('../ThirdPartyDataStore/TpdsProjectFlusher')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 
 module.exports = {
   createProjectFromZipArchive: callbackify(createProjectFromZipArchive),

services/web/app/src/Features/User/SAMLIdentityManager.js

@@ -8,7 +8,7 @@ const SubscriptionLocator = require('../Subscription/SubscriptionLocator')
 const UserAuditLogHandler = require('../User/UserAuditLogHandler')
 const UserGetter = require('../User/UserGetter')
 const UserUpdater = require('../User/UserUpdater')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const { User } = require('../../models/User')
 
 async function _addAuditLogEntry(

services/web/app/src/Features/User/ThirdPartyIdentityManager.js

@@ -4,7 +4,7 @@ const EmailHandler = require(`${APP_ROOT}/Features/Email/EmailHandler`)
 const EmailOptionsHelper = require(`${APP_ROOT}/Features/Email/EmailOptionsHelper`)
 const Errors = require('../Errors/Errors')
 const _ = require('lodash')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const OError = require('@overleaf/o-error')
 const settings = require('@overleaf/settings')
 const { User } = require(`${APP_ROOT}/models/User`)

services/web/app/src/Features/User/UserController.js

@@ -4,7 +4,7 @@ const UserGetter = require('./UserGetter')
 const { User } = require('../../models/User')
 const NewsletterManager = require('../Newsletter/NewsletterManager')
 const UserRegistrationHandler = require('./UserRegistrationHandler')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const metrics = require('@overleaf/metrics')
 const AuthenticationManager = require('../Authentication/AuthenticationManager')
 const SessionManager = require('../Authentication/SessionManager')

services/web/app/src/Features/User/UserCreator.js

@@ -1,4 +1,4 @@
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const util = require('util')
 const { AffiliationError } = require('../Errors/Errors')
 const Features = require('../../infrastructure/Features')

services/web/app/src/Features/User/UserDeleter.js

@@ -1,5 +1,5 @@
 const { callbackify } = require('util')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const moment = require('moment')
 const { User } = require('../../models/User')
 const { DeletedUser } = require('../../models/DeletedUser')

services/web/app/src/Features/User/UserEmailsController.js

@@ -1,4 +1,4 @@
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const SessionManager = require('../Authentication/SessionManager')
 const UserGetter = require('./UserGetter')
 const UserUpdater = require('./UserUpdater')

services/web/app/src/Features/User/UserGetter.js

@@ -1,7 +1,7 @@
 const { callbackify } = require('util')
 const { db } = require('../../infrastructure/mongodb')
 const metrics = require('@overleaf/metrics')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const moment = require('moment')
 const settings = require('@overleaf/settings')
 const { promisifyAll } = require('../../util/promises')

services/web/app/src/Features/User/UserPagesController.js

@@ -1,7 +1,7 @@
 const UserGetter = require('./UserGetter')
 const OError = require('@overleaf/o-error')
 const UserSessionsManager = require('./UserSessionsManager')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const Settings = require('@overleaf/settings')
 const AuthenticationController = require('../Authentication/AuthenticationController')
 const SessionManager = require('../Authentication/SessionManager')

services/web/app/src/Features/User/UserRegistrationHandler.js

@@ -4,7 +4,7 @@ const UserGetter = require('./UserGetter')
 const AuthenticationManager = require('../Authentication/AuthenticationManager')
 const NewsletterManager = require('../Newsletter/NewsletterManager')
 const async = require('async')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const crypto = require('crypto')
 const EmailHandler = require('../Email/EmailHandler')
 const OneTimeTokenHandler = require('../Security/OneTimeTokenHandler')

services/web/app/src/Features/User/UserSessionsManager.js

@@ -1,6 +1,6 @@
 const OError = require('@overleaf/o-error')
 const Settings = require('@overleaf/settings')
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const Async = require('async')
 const _ = require('underscore')
 const { promisify } = require('util')

services/web/app/src/Features/User/UserUpdater.js

@@ -1,4 +1,4 @@
-const logger = require('@overleaf/logger')
+const logger = require('logger-sharelatex')
 const OError = require('@overleaf/o-error')
 const { db } = require('../../infrastructure/mongodb')
 const { normalizeQuery } = require('../Helpers/Mongo')