github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Upgrade logger and metrics in all services

GitOrigin-RevId: 2baf63eeeab77fb3559cf763ddacfbf4b745cd0b
This commit is contained in:
Eric Mc Sween 2021-12-14 08:00:35 -05:00 committed by Copybot
parent 3e70992924
commit f7275a6c4b
92 changed files with 4480 additions and 7705 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/chat/app.js
View file

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

2
services/chat/app/js/Features/Messages/MessageHttpController.js
View file

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

2
services/chat/app/js/Features/Messages/MessageManager.js
View file

@ -14,7 +14,7 @@
let MessageManager
const { db, ObjectId } = require('../../mongodb')
const metrics = require('@overleaf/metrics')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
module.exports = MessageManager = {
createMessage(room_id, user_id, content, timestamp, callback) {

2
services/chat/app/js/Features/Threads/ThreadManager.js
View file

@ -12,7 +12,7 @@
*/
let ThreadManager
const { db, ObjectId } = require('../../mongodb')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const metrics = require('@overleaf/metrics')
module.exports = ThreadManager = {

2
services/chat/app/js/server.js
View file

@ -10,7 +10,7 @@
*/
const metrics = require('@overleaf/metrics')
metrics.initialize('chat')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
logger.initialize('chat')
const Path = require('path')
const express = require('express')

651
services/chat/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

4
services/chat/package.json
View file

@ -19,12 +19,12 @@
"lint:fix": "eslint --fix ."
},
"dependencies": {
"@overleaf/metrics": "^3.5.2",
"@overleaf/logger": "^3.1.0",
"@overleaf/metrics": "^4.0.0",
"@overleaf/settings": "^2.1.1",
"async": "^3.2.0",
"body-parser": "^1.19.0",
"express": "4.17.1",
"logger-sharelatex": "^2.2.1",
"mongodb": "^3.6.0"
},
"devDependencies": {

2
services/contacts/app.js
View file

@ -8,7 +8,7 @@ const Metrics = require('@overleaf/metrics')
Metrics.initialize('contacts')
const Settings = require('@overleaf/settings')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const express = require('express')
const bodyParser = require('body-parser')
const mongodb = require('./app/js/mongodb')

2
services/contacts/app/js/ContactManager.js
View file

@ -11,7 +11,7 @@
*/
let ContactManager
const { db, ObjectId } = require('./mongodb')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const metrics = require('@overleaf/metrics')
module.exports = ContactManager = {

2
services/contacts/app/js/HttpController.js
View file

@ -11,7 +11,7 @@
*/
let HttpController
const ContactManager = require('./ContactManager')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
module.exports = HttpController = {
addContact(req, res, next) {

2134
services/contacts/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

4
services/contacts/package.json
View file

@ -20,13 +20,13 @@
"lint:fix": "eslint --fix ."
},
"dependencies": {
"@overleaf/metrics": "^3.5.1",
"@overleaf/logger": "^3.1.0",
"@overleaf/metrics": "^4.0.0",
"@overleaf/settings": "^2.1.1",
"async": "^2.6.3",
"body-parser": "^1.19.0",
"bunyan": "^1.8.15",
"express": "^4.17.1",
"logger-sharelatex": "^2.2.0",
"mongodb": "^3.6.0",
"request": "~2.88.2",
"underscore": "~1.13.1"

2
services/contacts/test/acceptance/js/ContactsApp.js
View file

@ -10,7 +10,7 @@
*/
const app = require('../../../app')
const { waitForDb } = require('../../../app/js/mongodb')
require('logger-sharelatex').logger.level('error')
require('@overleaf/logger').logger.level('error')
module.exports = {
running: false,

2
services/contacts/test/setup.js
View file

@ -2,7 +2,7 @@ const SandboxedModule = require('sandboxed-module')
SandboxedModule.configure({
requires: {
'logger-sharelatex': { log() {} },
'@overleaf/logger': { log() {} },
'@overleaf/metrics': { timeAsyncMethod() {} },
},
globals: { Buffer, console, process },

2
services/docstore/app.js
View file

@ -7,7 +7,7 @@
const Metrics = require('@overleaf/metrics')
Metrics.initialize('docstore')
const Settings = require('@overleaf/settings')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const express = require('express')
const bodyParser = require('body-parser')
const {

2
services/docstore/app/js/DocArchiveManager.js
View file

@ -1,7 +1,7 @@
const { callbackify } = require('util')
const MongoManager = require('./MongoManager').promises
const Errors = require('./Errors')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const settings = require('@overleaf/settings')
const crypto = require('crypto')
const Streamifier = require('streamifier')

2
services/docstore/app/js/DocManager.js
View file

@ -14,7 +14,7 @@
let DocManager
const MongoManager = require('./MongoManager')
const Errors = require('./Errors')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const _ = require('underscore')
const DocArchive = require('./DocArchiveManager')
const RangeManager = require('./RangeManager')

2
services/docstore/app/js/HealthChecker.js
View file

@ -16,7 +16,7 @@ const _ = require('underscore')
const crypto = require('crypto')
const settings = require('@overleaf/settings')
const { port } = settings.internal.docstore
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
module.exports = {
check(callback) {

2
services/docstore/app/js/HttpController.js
View file

@ -13,7 +13,7 @@
*/
let HttpController
const DocManager = require('./DocManager')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const DocArchive = require('./DocArchiveManager')
const HealthChecker = require('./HealthChecker')
const Settings = require('@overleaf/settings')

2
services/docstore/app/js/MongoManager.js
View file

@ -11,7 +11,7 @@
*/
let MongoManager
const { db, ObjectId } = require('./mongodb')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const metrics = require('@overleaf/metrics')
const Settings = require('@overleaf/settings')
const Errors = require('./Errors')

1073
services/docstore/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

4
services/docstore/package.json
View file

@ -20,7 +20,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",
@ -29,7 +30,6 @@
"bunyan": "^1.8.15",
"celebrate": "^13.0.4",
"express": "^4.17.1",
"logger-sharelatex": "^2.2.0",
"mongodb": "^3.6.0",
"p-map": "^4.0.0",
"request": "^2.88.2",

2
services/docstore/test/acceptance/js/helpers/DocstoreApp.js
View file

@ -1,6 +1,6 @@
const app = require('../../../../app')
const { waitForDb } = require('../../../../app/js/mongodb')
require('logger-sharelatex').logger.level('error')
require('@overleaf/logger').logger.level('error')
const settings = require('@overleaf/settings')
module.exports = {

2
services/docstore/test/setup.js
View file

@ -26,7 +26,7 @@ const stubs = {
// SandboxedModule configuration
SandboxedModule.configure({
requires: {
'logger-sharelatex': stubs.logger,
'@overleaf/logger': stubs.logger,
},
globals: { Buffer, JSON, console, process },
})

495
services/document-updater/package-lock.json generated
View file

@ -91,9 +91,9 @@
}
},
"@google-cloud/common": {
"version": "3.7.2",
"resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-3.7.2.tgz",
"integrity": "sha512-5Q9f74IbZaY6xAwJSNFy5SrGwbm1j7mpv+6A/r+K2dymjsXBH5UauB0tziaMwWoVVaMq1IQnZF9lgtfqqvxcUg==",
"version": "3.8.1",
"resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-3.8.1.tgz",
"integrity": "sha512-FOs3NFU6bDt5mXE7IFpwIeqzLwRZNu9lJYl+bHVNkwmxX/w4VyDZAiGjQHhpV1Ek+muNKlX8HPchxaIxNTuOhw==",
"requires": {
"@google-cloud/projectify": "^2.0.0",
"@google-cloud/promisify": "^2.0.0",
@ -101,7 +101,7 @@
"duplexify": "^4.1.1",
"ent": "^2.2.0",
"extend": "^3.0.2",
"google-auth-library": "^7.0.2",
"google-auth-library": "^7.9.2",
"retry-request": "^4.2.2",
"teeny-request": "^7.0.0"
}
@ -124,50 +124,10 @@
"split": "^1.0.0"
}
},
"@google-cloud/logging": {
"version": "9.6.1",
"resolved": "https://registry.npmjs.org/@google-cloud/logging/-/logging-9.6.1.tgz",
"integrity": "sha512-Ch7wOAysUX9j/blUWShsN4Kia15qeTjCOqP9aqFf18uGNIZiNFfVJ4qhiYHZgSROqpYB8Ep8TzOSDkbc5OaipA==",
"requires": {
"@google-cloud/common": "^3.4.1",
"@google-cloud/paginator": "^3.0.0",
"@google-cloud/projectify": "^2.0.0",
"@google-cloud/promisify": "^2.0.0",
"arrify": "^2.0.1",
"dot-prop": "^6.0.0",
"eventid": "^2.0.0",
"extend": "^3.0.2",
"gcp-metadata": "^4.0.0",
"google-auth-library": "^7.0.0",
"google-gax": "^2.24.1",
"on-finished": "^2.3.0",
"pumpify": "^2.0.1",
"stream-events": "^1.0.5",
"uuid": "^8.0.0"
}
},
"@google-cloud/logging-bunyan": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/@google-cloud/logging-bunyan/-/logging-bunyan-3.1.1.tgz",
"integrity": "sha512-BIO17OWmdZVIYjbDHC0mt8DtY2edCHZ7B53DXjl8wZbC5gFrB3Vvvuhc4KIZ525f3vqFNLfBRvxkw/k+fhp5IA==",
"requires": {
"@google-cloud/logging": "^9.0.0",
"google-auth-library": "^7.0.0"
}
},
"@google-cloud/paginator": {
"version": "3.0.6",
"resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-3.0.6.tgz",
"integrity": "sha512-XCTm/GfQIlc1ZxpNtTSs/mnZxC2cePNhxU3X8EzHXKIJ2JFncmJj2Fcd2IP+gbmZaSZnY0juFxbUCkIeuu/2eQ==",
"requires": {
"arrify": "^2.0.0",
"extend": "^3.0.2"
}
},
"@google-cloud/profiler": {
"version": "4.1.4",
"resolved": "https://registry.npmjs.org/@google-cloud/profiler/-/profiler-4.1.4.tgz",
"integrity": "sha512-4VWHdHA5nLXX+EHc+7DET0r3aqkA2IPXw+3JfSAaxr6H6hEYPQo5D2yUfWfoKLdQszxm2nKO9By91zy9KvFV/A==",
"version": "4.1.5",
"resolved": "https://registry.npmjs.org/@google-cloud/profiler/-/profiler-4.1.5.tgz",
"integrity": "sha512-n+HAOicoPRo0JXwxWpDYdLN+M0gIqdQdMp77oe1B+bJY+5d4W2ye5e1SpxsDjcSC5864jO+xEd0tn/d7rMvS7g==",
"requires": {
"@google-cloud/common": "^3.0.0",
"@types/console-log-level": "^1.4.0",
@ -195,9 +155,9 @@
"integrity": "sha512-j8yRSSqswWi1QqUGKVEKOG03Q7qOoZP6/h2zN2YO+F5h2+DHU0bSrHCK9Y7lo2DI9fBd8qGAw795sf+3Jva4yA=="
},
"@google-cloud/trace-agent": {
"version": "5.1.5",
"resolved": "https://registry.npmjs.org/@google-cloud/trace-agent/-/trace-agent-5.1.5.tgz",
"integrity": "sha512-8Mrspg9nebd1VA4xC+XQTBBY3PV3SoUR70CHc3waN9lZskrCQO0Ha50VamhtUx8gUMgUK8ANed5EsF8rv+jY4Q==",
"version": "5.1.6",
"resolved": "https://registry.npmjs.org/@google-cloud/trace-agent/-/trace-agent-5.1.6.tgz",
"integrity": "sha512-TLZwbR9WYx/wNhJv6PcbKEuHZpArUG1WtaPLwjxRJeTVNDV2gOsDVDihbezCyyOcHxU3kXCewB5y2BA1pP0mIg==",
"requires": {
"@google-cloud/common": "^3.0.0",
"@opencensus/propagation-stackdriver": "0.1.0",
@ -217,26 +177,6 @@
"uuid": "^8.0.0"
}
},
"@grpc/grpc-js": {
"version": "1.3.7",
"resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.7.tgz",
"integrity": "sha512-CKQVuwuSPh40tgOkR7c0ZisxYRiN05PcKPW72mQL5y++qd7CwBRoaJZvU5xfXnCJDFBmS3qZGQ71Frx6Ofo2XA==",
"requires": {
"@types/node": ">=12.12.47"
}
},
"@grpc/proto-loader": {
"version": "0.6.5",
"resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.5.tgz",
"integrity": "sha512-GZdzyVQI1Bln/kCzIYgTKu+rQJ5dno0gVrfmLe4jqQu7T2e7svSwJzpCBqVU5hhBSJP3peuPjOMWsj5GR61YmQ==",
"requires": {
"@types/long": "^4.0.1",
"lodash.camelcase": "^4.3.0",
"long": "^4.0.0",
"protobufjs": "^6.10.0",
"yargs": "^16.1.1"
}
},
"@humanwhocodes/config-array": {
"version": "0.5.0",
"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
@ -255,19 +195,19 @@
"dev": true
},
"@mapbox/node-pre-gyp": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.5.tgz",
"integrity": "sha512-4srsKPXWlIxp5Vbqz5uLfBN+du2fJChBoYn/f2h991WLdk7jUvcSk/McVLSv/X+xQIPI8eGD5GjrnygdyHnhPA==",
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.7.tgz",
"integrity": "sha512-PplSvl4pJ5N3BkVjAdDzpPhVUPdC73JgttkR+LnBx2OORC1GCQsBjUeEuipf9uOaAM1SbxcdZFfR3KDTKm2S0A==",
"requires": {
"detect-libc": "^1.0.3",
"https-proxy-agent": "^5.0.0",
"make-dir": "^3.1.0",
"node-fetch": "^2.6.1",
"node-fetch": "^2.6.5",
"nopt": "^5.0.0",
"npmlog": "^4.1.2",
"npmlog": "^6.0.0",
"rimraf": "^3.0.2",
"semver": "^7.3.4",
"tar": "^6.1.0"
"semver": "^7.3.5",
"tar": "^6.1.11"
},
"dependencies": {
"glob": {
@ -316,11 +256,10 @@
}
},
"@overleaf/logger": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/@overleaf/logger/-/logger-2.3.0.tgz",
"integrity": "sha512-uFxxA9WXgy8pwVqKUhHrdEZP7JhMHjBdhuo9J4qcBvIzu9PDIY6U5R8qwb6rdgxINKuesjJOAGXna768X/Gcew==",
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/@overleaf/logger/-/logger-3.1.0.tgz",
"integrity": "sha512-B/JgmC6CLGOnl1M69/YK7skKmv+ky9dbAdXhq2GXvFRtcTSEBJTCgl6tdUsdlzoRP9HqQbrWX3qVYgtd93iT1Q==",
"requires": {
"@google-cloud/logging-bunyan": "^3.1.0",
"@overleaf/o-error": "^3.0.0",
"@sentry/node": "^6.13.2",
"bunyan": "^1.8.14",
@ -329,9 +268,9 @@
}
},
"@overleaf/metrics": {
"version": "3.5.2",
"resolved": "https://registry.npmjs.org/@overleaf/metrics/-/metrics-3.5.2.tgz",
"integrity": "sha512-rzYUb9JqyHcjU5tQfPF8AyDsJ7SbTFn71iHj98oRXsNCk8A6QwLjCI+0LUMpaUdSKZINKbujtuHynqzUawNklQ==",
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/@overleaf/metrics/-/metrics-4.0.0.tgz",
"integrity": "sha512-qvQ3WSyVEqfuJ5intfh4aWIekFIDkNCsocG9acg9445L/QIK3MV7j3DkQ/IsXgD8TdOOLHWLKETCrxWKMNtw7Q==",
"requires": {
"@google-cloud/debug-agent": "^5.1.2",
"@google-cloud/profiler": "^4.1.3",
@ -424,47 +363,47 @@
"integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA="
},
"@sentry/core": {
"version": "6.13.2",
"resolved": "https://registry.npmjs.org/@sentry/core/-/core-6.13.2.tgz",
"integrity": "sha512-snXNNFLwlS7yYxKTX4DBXebvJK+6ikBWN6noQ1CHowvM3ReFBlrdrs0Z0SsSFEzXm2S4q7f6HHbm66GSQZ/8FQ==",
"version": "6.16.0",
"resolved": "https://registry.npmjs.org/@sentry/core/-/core-6.16.0.tgz",
"integrity": "sha512-XqIlMjefuJmwQSAzv9J1PtV6+sXiz1dgBbtRr6e+QGIYZ+BDkuyDQv/HsGPfxxMHxgJBxBzi71FFLjEJsF6CBg==",
"requires": {
"@sentry/hub": "6.13.2",
"@sentry/minimal": "6.13.2",
"@sentry/types": "6.13.2",
"@sentry/utils": "6.13.2",
"@sentry/hub": "6.16.0",
"@sentry/minimal": "6.16.0",
"@sentry/types": "6.16.0",
"@sentry/utils": "6.16.0",
"tslib": "^1.9.3"
}
},
"@sentry/hub": {
"version": "6.13.2",
"resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.13.2.tgz",
"integrity": "sha512-sppSuJdNMiMC/vFm/dQowCBh11uTrmvks00fc190YWgxHshodJwXMdpc+pN61VSOmy2QA4MbQ5aMAgHzPzel3A==",
"version": "6.16.0",
"resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.16.0.tgz",
"integrity": "sha512-NBkcgGjnYsoXyIJwi2TGCxGnxbDJc/t++0ukFoBRy6RL/pw2YnryCu8PWNFsDkZdlb1zt5SIC6Kui+q1ViNS/A==",
"requires": {
"@sentry/types": "6.13.2",
"@sentry/utils": "6.13.2",
"@sentry/types": "6.16.0",
"@sentry/utils": "6.16.0",
"tslib": "^1.9.3"
}
},
"@sentry/minimal": {
"version": "6.13.2",
"resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.13.2.tgz",
"integrity": "sha512-6iJfEvHzzpGBHDfLxSHcGObh73XU1OSQKWjuhDOe7UQDyI4BQmTfcXAC+Fr8sm8C/tIsmpVi/XJhs8cubFdSMw==",
"version": "6.16.0",
"resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.16.0.tgz",
"integrity": "sha512-9/h0J9BDDY5W/dKILGEq3ewECspNoxcXuly/WOWQdt2SQpIcoh8l/dF8iTXle+icndin0EiMEyHOzaCPWG24oQ==",
"requires": {
"@sentry/hub": "6.13.2",
"@sentry/types": "6.13.2",
"@sentry/hub": "6.16.0",
"@sentry/types": "6.16.0",
"tslib": "^1.9.3"
}
},
"@sentry/node": {
"version": "6.13.2",
"resolved": "https://registry.npmjs.org/@sentry/node/-/node-6.13.2.tgz",
"integrity": "sha512-0Vw22amG143MTiNaSny66YGU3+uW7HxyGI9TLGE7aJY1nNmC0DE+OgqQYGBRCrrPu+VFXRDxrOg9b15A1gKqjA==",
"version": "6.16.0",
"resolved": "https://registry.npmjs.org/@sentry/node/-/node-6.16.0.tgz",
"integrity": "sha512-gvZ9aAo/AklkMeUMoL9HsQd+1de8VNmsQSJV2R5/AII69DlcoO+lnVs/XWZxEmTUsjeNQfsaKxwUjE7n/5cQOQ==",
"requires": {
"@sentry/core": "6.13.2",
"@sentry/hub": "6.13.2",
"@sentry/tracing": "6.13.2",
"@sentry/types": "6.13.2",
"@sentry/utils": "6.13.2",
"@sentry/core": "6.16.0",
"@sentry/hub": "6.16.0",
"@sentry/tracing": "6.16.0",
"@sentry/types": "6.16.0",
"@sentry/utils": "6.16.0",
"cookie": "^0.4.1",
"https-proxy-agent": "^5.0.0",
"lru_map": "^0.3.3",
@ -472,28 +411,28 @@
}
},
"@sentry/tracing": {
"version": "6.13.2",
"resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-6.13.2.tgz",
"integrity": "sha512-bHJz+C/nd6biWTNcYAu91JeRilsvVgaye4POkdzWSmD0XoLWHVMrpCQobGpXe7onkp2noU3YQjhqgtBqPHtnpw==",
"version": "6.16.0",
"resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-6.16.0.tgz",
"integrity": "sha512-vTTjGnLc9fa3jM0RKkEgOLW23CiPb1Kh6bkHbUw68d3DVz6o0Tj2SqzW+Y+LaIwlFjhrozf+YV/KS9vj4BhHTw==",
"requires": {
"@sentry/hub": "6.13.2",
"@sentry/minimal": "6.13.2",
"@sentry/types": "6.13.2",
"@sentry/utils": "6.13.2",
"@sentry/hub": "6.16.0",
"@sentry/minimal": "6.16.0",
"@sentry/types": "6.16.0",
"@sentry/utils": "6.16.0",
"tslib": "^1.9.3"
}
},
"@sentry/types": {
"version": "6.13.2",
"resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.13.2.tgz",
"integrity": "sha512-6WjGj/VjjN8LZDtqJH5ikeB1o39rO1gYS6anBxiS3d0sXNBb3Ux0pNNDFoBxQpOhmdDHXYS57MEptX9EV82gmg=="
"version": "6.16.0",
"resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.16.0.tgz",
"integrity": "sha512-ZgIyLYlQS4SPi+d68XD8n9FzoObrNQLWxBuMYMnG3uJSuFeYAJrVYkDRtW4OW0D3awuajYGiHJZC2O5qTRGflA=="
},
"@sentry/utils": {
"version": "6.13.2",
"resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.13.2.tgz",
"integrity": "sha512-foF4PbxqPMWNbuqdXkdoOmKm3quu3PP7Q7j/0pXkri4DtCuvF/lKY92mbY0V9rHS/phCoj+3/Se5JvM2ymh2/w==",
"version": "6.16.0",
"resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.16.0.tgz",
"integrity": "sha512-FJl1AyUVAIzxfEXufWsgX7KxIvOrQawxhAhLXO4vU5xrFrJOteicxAIFJO+GG0QDELgr9siP0Qgeb8LoINWcrw==",
"requires": {
"@sentry/types": "6.13.2",
"@sentry/types": "6.16.0",
"tslib": "^1.9.3"
}
},
@ -554,14 +493,14 @@
"integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w=="
},
"@types/node": {
"version": "16.10.3",
"resolved": "https://registry.npmjs.org/@types/node/-/node-16.10.3.tgz",
"integrity": "sha512-ho3Ruq+fFnBrZhUYI46n/bV2GjwzSkwuT4dTf0GkuNFmnb8nq4ny2z9JEVemFi6bdEJanHLlYfy9c6FN9B9McQ=="
"version": "16.11.12",
"resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.12.tgz",
"integrity": "sha512-+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw=="
},
"@types/semver": {
"version": "7.3.8",
"resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.8.tgz",
"integrity": "sha512-D/2EJvAlCEtYFEYmmlGwbGXuK886HzyCc3nZX/tkFTQdEU8jZDAgiv08P162yB17y4ZXZoq7yFAnW4GDBb9Now=="
"version": "7.3.9",
"resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.9.tgz",
"integrity": "sha512-L/TMpyURfBkf+o/526Zb6kd/tchUP3iBDEPjqjb+U2MAJhVRxxrmr2fwpe08E7QsV7YLcpq0tUaQ9O9x97ZIxQ=="
},
"@ungap/promise-all-settled": {
"version": "1.1.2",
@ -592,9 +531,9 @@
}
},
"acorn": {
"version": "8.5.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz",
"integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q=="
"version": "8.6.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz",
"integrity": "sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw=="
},
"acorn-jsx": {
"version": "5.3.2",
@ -636,6 +575,7 @@
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"requires": {
"color-convert": "^2.0.1"
}
@ -651,46 +591,17 @@
}
},
"aproba": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
"integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="
},
"are-we-there-yet": {
"version": "1.1.7",
"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
"integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==",
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
"integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
"requires": {
"delegates": "^1.0.0",
"readable-stream": "^2.0.6"
},
"dependencies": {
"readable-stream": {
"version": "2.3.7",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
"isarray": "~1.0.0",
"process-nextick-args": "~2.0.0",
"safe-buffer": "~5.1.1",
"string_decoder": "~1.1.1",
"util-deprecate": "~1.0.1"
}
},
"safe-buffer": {
"version": "5.1.2",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
},
"string_decoder": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"requires": {
"safe-buffer": "~5.1.0"
}
}
"readable-stream": "^3.6.0"
}
},
"argparse": {
@ -747,7 +658,7 @@
"assert-plus": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
"integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw=="
},
"assertion-error": {
"version": "1.1.0",
@ -813,7 +724,7 @@
"bcrypt-pbkdf": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
"integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
"integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
"requires": {
"tweetnacl": "^0.14.3"
}
@ -947,7 +858,7 @@
"browser-stdout": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
"integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
"integrity": "sha1-uqVZ7hTO1zRSIputcyZGfGH6vWA=",
"dev": true
},
"bson": {
@ -1094,6 +1005,7 @@
"version": "7.0.4",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
"integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
"dev": true,
"requires": {
"string-width": "^4.2.0",
"strip-ansi": "^6.0.0",
@ -1105,11 +1017,6 @@
"resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz",
"integrity": "sha512-2Nii8p3RwAPiFwsnZvukotvow2rIHM+yQ6ZcBXGHdniadkYGZYiGmkHJIbZPIV9nfv7m/U1IPMVVcAhoWFeklw=="
},
"code-point-at": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
},
"coffeescript": {
"version": "2.6.1",
"resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.6.1.tgz",
@ -1119,6 +1026,7 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"requires": {
"color-name": "~1.1.4"
}
@ -1126,7 +1034,13 @@
"color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true
},
"color-support": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
"integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="
},
"combined-stream": {
"version": "1.0.8",
@ -1253,11 +1167,6 @@
"which": "^2.0.1"
}
},
"d64": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/d64/-/d64-1.0.0.tgz",
"integrity": "sha1-QAKofoUMv8n52XBrYPymE6MzbpA="
},
"dashdash": {
"version": "1.14.1",
"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@ -1312,7 +1221,7 @@
"delayed-stream": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
"integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
},
"delegates": {
"version": "1.0.0",
@ -1358,14 +1267,6 @@
"esutils": "^2.0.2"
}
},
"dot-prop": {
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz",
"integrity": "sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==",
"requires": {
"is-obj": "^2.0.0"
}
},
"dtrace-provider": {
"version": "0.8.8",
"resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.8.tgz",
@ -1389,7 +1290,7 @@
"ecc-jsbn": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
"integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
"integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
"requires": {
"jsbn": "~0.1.0",
"safer-buffer": "^2.1.0"
@ -1406,7 +1307,7 @@
"ee-first": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
"integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
},
"emitter-listener": {
"version": "1.1.2",
@ -1499,7 +1400,8 @@
"escalade": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
"dev": true
},
"escape-html": {
"version": "1.0.3",
@ -1858,15 +1760,6 @@
"resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
"integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="
},
"eventid": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/eventid/-/eventid-2.0.0.tgz",
"integrity": "sha512-4CYGJ4e2ZkNSr89U/IGzUYOSqppRUCUz37HQX+xk3ArJwK3K1B7TI1PBeWb1umz3rDuMUwPzJCWR44JJS8yEnQ==",
"requires": {
"d64": "^1.0.0",
"uuid": "^8.0.0"
}
},
"express": {
"version": "4.17.1",
"resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
@ -2082,7 +1975,7 @@
"forever-agent": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
"integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw=="
},
"form-data": {
"version": "2.3.3",
@ -2136,51 +2029,19 @@
"dev": true
},
"gauge": {
"version": "2.7.4",
"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.0.tgz",
"integrity": "sha512-F8sU45yQpjQjxKkm1UOAhf0U/O0aFt//Fl7hsrNVto+patMHjs7dPI9mFOGUKbhrgKm0S3EjW3scMFuQmWSROw==",
"requires": {
"aproba": "^1.0.3",
"ansi-regex": "^5.0.1",
"aproba": "^1.0.3 || ^2.0.0",
"color-support": "^1.1.2",
"console-control-strings": "^1.0.0",
"has-unicode": "^2.0.0",
"object-assign": "^4.1.0",
"has-unicode": "^2.0.1",
"signal-exit": "^3.0.0",
"string-width": "^1.0.1",
"strip-ansi": "^3.0.1",
"wide-align": "^1.1.0"
},
"dependencies": {
"ansi-regex": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
},
"is-fullwidth-code-point": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"requires": {
"number-is-nan": "^1.0.0"
}
},
"string-width": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
"strip-ansi": "^3.0.0"
}
},
"strip-ansi": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"requires": {
"ansi-regex": "^2.0.0"
}
}
"string-width": "^4.2.3",
"strip-ansi": "^6.0.1",
"wide-align": "^1.1.2"
}
},
"gaxios": {
@ -2207,7 +2068,8 @@
"get-caller-file": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
"dev": true
},
"get-func-name": {
"version": "2.0.0",
@ -2276,9 +2138,9 @@
}
},
"google-auth-library": {
"version": "7.10.0",
"resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.10.0.tgz",
"integrity": "sha512-ICsqaU+lxMHVlDUzMrfVIEqnARw2AwBiZ/2KnNM6BcTf9Nott+Af87DTIzmlnW865p3REUP2MVL0xkPC3a61aQ==",
"version": "7.10.3",
"resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.10.3.tgz",
"integrity": "sha512-VBwUCrjR+/p/J4ifSZRXG0XEc3Cm+2xnFrJi3A9DC2GzbCUK5j+R6CfqS7jyu1Hureb1PV53ZXZS1QV9PYUCrw==",
"requires": {
"arrify": "^2.0.0",
"base64-js": "^1.3.0",
@ -2291,26 +2153,6 @@
"lru-cache": "^6.0.0"
}
},
"google-gax": {
"version": "2.27.0",
"resolved": "https://registry.npmjs.org/google-gax/-/google-gax-2.27.0.tgz",
"integrity": "sha512-xcLCeNKCqNm/w0At7/vdZHV/zol/iRS+PSAZTu7i6xNGBra/kWI3cfn4M6ZLQXeUEGbTVLJ4zGm53TVc4lvbDA==",
"requires": {
"@grpc/grpc-js": "~1.3.0",
"@grpc/proto-loader": "^0.6.1",
"@types/long": "^4.0.0",
"abort-controller": "^3.0.0",
"duplexify": "^4.0.0",
"fast-text-encoding": "^1.0.3",
"google-auth-library": "^7.6.1",
"is-stream-ended": "^0.1.4",
"node-fetch": "^2.6.1",
"object-hash": "^2.1.1",
"proto3-json-serializer": "^0.1.1",
"protobufjs": "6.11.2",
"retry-request": "^4.0.0"
}
},
"google-p12-pem": {
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.2.tgz",
@ -2372,7 +2214,7 @@
"has-flag": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
"dev": true
},
"has-symbols": {
@ -2444,7 +2286,7 @@
"http-signature": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
"integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
"requires": {
"assert-plus": "^1.0.0",
"jsprim": "^1.2.2",
@ -2641,11 +2483,6 @@
"has-tostringtag": "^1.0.0"
}
},
"is-obj": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
"integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="
},
"is-plain-obj": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
@ -2673,11 +2510,6 @@
"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="
},
"is-stream-ended": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.4.tgz",
"integrity": "sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw=="
},
"is-string": {
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
@ -2872,11 +2704,6 @@
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
},
"lodash.camelcase": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
"integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY="
},
"lodash.clonedeep": {
"version": "4.5.0",
"resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
@ -3005,7 +2832,7 @@
"minimatch": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
"integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
"requires": {
"brace-expansion": "^1.1.7"
}
@ -3016,9 +2843,9 @@
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
},
"minipass": {
"version": "3.1.5",
"resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz",
"integrity": "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==",
"version": "3.1.6",
"resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz",
"integrity": "sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==",
"requires": {
"yallist": "^4.0.0"
}
@ -3329,36 +3156,21 @@
"dev": true
},
"npmlog": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.0.tgz",
"integrity": "sha512-03ppFRGlsyUaQFbGC2C8QWJN/C/K7PsfyD9aQdhVKAQIH4sQBc8WASqFBP7O+Ut4d2oo5LoeoboB3cGdBZSp6Q==",
"requires": {
"are-we-there-yet": "~1.1.2",
"console-control-strings": "~1.1.0",
"gauge": "~2.7.3",
"set-blocking": "~2.0.0"
"are-we-there-yet": "^2.0.0",
"console-control-strings": "^1.1.0",
"gauge": "^4.0.0",
"set-blocking": "^2.0.0"
}
},
"number-is-nan": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
},
"oauth-sign": {
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
"integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
},
"object-assign": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
},
"object-hash": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz",
"integrity": "sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw=="
},
"object-inspect": {
"version": "1.11.0",
"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
@ -3397,7 +3209,7 @@
"on-finished": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
"integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
"integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
"requires": {
"ee-first": "1.1.1"
}
@ -3486,9 +3298,9 @@
}
},
"parse-duration": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/parse-duration/-/parse-duration-1.0.0.tgz",
"integrity": "sha512-X4kUkCTHU1N/kEbwK9FpUJ0UZQa90VzeczfS704frR30gljxDG0pSziws06XlK+CGRSo/1wtG1mFIdBFQTMQNw=="
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/parse-duration/-/parse-duration-1.0.2.tgz",
"integrity": "sha512-Dg27N6mfok+ow1a2rj/nRjtCfaKrHUZV2SJpEn/s8GaVUSlf4GGRCRP1c13Hj+wfPKVMrFDqLMLITkYKgKxyyg=="
},
"parse-json": {
"version": "4.0.0",
@ -3659,11 +3471,6 @@
"tdigest": "^0.1.1"
}
},
"proto3-json-serializer": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-0.1.4.tgz",
"integrity": "sha512-bFzdsKU/zaTobWrRxRniMZIzzcgKYlmBWL1gAcTXZ2M7TQTGPI0JoYYs6bN7tpWj59ZCfwg7Ii/A2e8BbQGYnQ=="
},
"protobufjs": {
"version": "6.11.2",
"resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.2.tgz",
@ -3698,25 +3505,6 @@
"resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
"integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
},
"pump": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
"requires": {
"end-of-stream": "^1.1.0",
"once": "^1.3.1"
}
},
"pumpify": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/pumpify/-/pumpify-2.0.1.tgz",
"integrity": "sha512-m7KOje7jZxrmutanlkS1daj1dS6z6BgslzOXmcSEpIlCxM3VJH7lG5QLeck/6hgF6F4crFf01UtQmNsJfweTAw==",
"requires": {
"duplexify": "^4.1.1",
"inherits": "^2.0.3",
"pump": "^3.0.0"
}
},
"punycode": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
@ -3886,7 +3674,8 @@
"require-directory": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
"integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
"integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
"dev": true
},
"require-from-string": {
"version": "2.0.2",
@ -4090,9 +3879,9 @@
}
},
"signal-exit": {
"version": "3.0.5",
"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz",
"integrity": "sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ=="
"version": "3.0.6",
"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz",
"integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ=="
},
"sinon": {
"version": "9.2.4",
@ -4148,9 +3937,9 @@
"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
},
"source-map-support": {
"version": "0.5.20",
"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz",
"integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==",
"version": "0.5.21",
"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
"integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
"requires": {
"buffer-from": "^1.0.0",
"source-map": "^0.6.0"
@ -4474,7 +4263,7 @@
"tunnel-agent": {
"version": "0.6.0",
"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
"integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
"requires": {
"safe-buffer": "^5.0.1"
}
@ -4686,6 +4475,7 @@
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
"dev": true,
"requires": {
"ansi-styles": "^4.0.0",
"string-width": "^4.1.0",
@ -4700,7 +4490,8 @@
"y18n": {
"version": "5.0.8",
"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
"dev": true
},
"yallist": {
"version": "4.0.0",
@ -4711,6 +4502,7 @@
"version": "16.2.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
"integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
"dev": true,
"requires": {
"cliui": "^7.0.2",
"escalade": "^3.1.1",
@ -4724,7 +4516,8 @@
"yargs-parser": {
"version": "20.2.9",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
"integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="
"integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
"dev": true
},
"yargs-unparser": {
"version": "2.0.0",

4
services/document-updater/package.json
View file

@ -19,8 +19,8 @@
"lint:fix": "eslint --fix ."
},
"dependencies": {
"@overleaf/logger": "^2.3.0",
"@overleaf/metrics": "^3.5.1",
"@overleaf/logger": "^3.1.0",
"@overleaf/metrics": "^4.0.0",
"@overleaf/o-error": "^3.3.1",
"@overleaf/redis-wrapper": "^2.0.1",
"@overleaf/settings": "^2.1.1",

2
services/filestore/app.js
View file

@ -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')

2
services/filestore/app/js/ImageOptimiser.js
View file

@ -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

2
services/filestore/app/js/RequestLogger.js
View file

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

1052
services/filestore/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

4
services/filestore/package.json
View file

@ -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",

2
services/filestore/test/acceptance/js/FilestoreApp.js
View file

@ -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')

2
services/filestore/test/unit/js/ImageOptimiserTests.js
View file

@ -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() }),
},

2
services/notifications/app.js
View file

@ -8,7 +8,7 @@
const metrics = require('@overleaf/metrics')
metrics.initialize('notifications')
const Settings = require('@overleaf/settings')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
logger.initialize('notifications-sharelatex')
const express = require('express')
const app = express()

2
services/notifications/app/js/HealthCheckController.js
View file

@ -16,7 +16,7 @@ const async = require('async')
const _ = require('underscore')
const settings = require('@overleaf/settings')
const { port } = settings.internal.notifications
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
module.exports = {
check(callback) {

2
services/notifications/app/js/Notifications.js
View file

@ -11,7 +11,7 @@
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
let Notifications
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const { db, ObjectId } = require('./mongodb')
const metrics = require('@overleaf/metrics')

2
services/notifications/app/js/NotificationsController.js
View file

@ -10,7 +10,7 @@
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
const Notifications = require('./Notifications')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const metrics = require('@overleaf/metrics')
module.exports = {

1969
services/notifications/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

4
services/notifications/package.json
View file

@ -18,13 +18,13 @@
"author": "",
"license": "ISC",
"dependencies": {
"@overleaf/metrics": "^3.5.1",
"@overleaf/logger": "^3.1.0",
"@overleaf/metrics": "^4.0.0",
"@overleaf/settings": "^2.1.1",
"async": "^2.6.3",
"body-parser": "^1.19.0",
"bunyan": "^1.8.15",
"express": "4.17.1",
"logger-sharelatex": "^2.2.0",
"method-override": "^3.0.0",
"mongodb": "^3.6.0",
"request": "^2.88.2",

2
services/notifications/test/setup.js
View file

@ -7,7 +7,7 @@ chai.should()
// SandboxedModule configuration
SandboxedModule.configure({
requires: {
'logger-sharelatex': {
'@overleaf/logger': {
debug() {},
log() {},
info() {},

2
services/real-time/app.js
View file

@ -3,7 +3,7 @@ const Settings = require('@overleaf/settings')
Metrics.initialize(process.env.METRICS_APP_NAME || 'real-time')
const async = require('async')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
logger.initialize('real-time')
Metrics.event_loop.monitor(logger)

2
services/real-time/app/js/ChannelManager.js
View file

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

2
services/real-time/app/js/ConnectedUsersManager.js
View file

@ -3,7 +3,7 @@
*/
const async = require('async')
const Settings = require('@overleaf/settings')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const redis = require('@overleaf/redis-wrapper')
const OError = require('@overleaf/o-error')
const rclient = redis.createClient(Settings.redis.realtime)

2
services/real-time/app/js/DeploymentManager.js
View file

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

2
services/real-time/app/js/DocumentUpdaterController.js
View file

@ -1,7 +1,7 @@
/* eslint-disable
camelcase,
*/
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const settings = require('@overleaf/settings')
const RedisClientManager = require('./RedisClientManager')
const SafeJsonParse = require('./SafeJsonParse')

2
services/real-time/app/js/DocumentUpdaterManager.js
View file

@ -4,7 +4,7 @@
const request = require('request')
const _ = require('underscore')
const OError = require('@overleaf/o-error')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const settings = require('@overleaf/settings')
const metrics = require('@overleaf/metrics')
const {

2
services/real-time/app/js/DrainManager.js
View file

@ -1,4 +1,4 @@
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
module.exports = {
startDrainTimeWindow(io, minsToDrain, callback) {

2
services/real-time/app/js/EventLogger.js
View file

@ -2,7 +2,7 @@
camelcase,
*/
let EventLogger
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const metrics = require('@overleaf/metrics')
const settings = require('@overleaf/settings')

2
services/real-time/app/js/HealthCheckManager.js
View file

@ -1,5 +1,5 @@
const metrics = require('@overleaf/metrics')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const os = require('os')
const HOST = os.hostname()

2
services/real-time/app/js/HttpApiController.js
View file

@ -3,7 +3,7 @@
*/
const WebsocketLoadBalancer = require('./WebsocketLoadBalancer')
const DrainManager = require('./DrainManager')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
module.exports = {
sendMessage(req, res) {

2
services/real-time/app/js/RedisClientManager.js
View file

@ -1,5 +1,5 @@
const redis = require('@overleaf/redis-wrapper')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
module.exports = {
createClientList(...configs) {

2
services/real-time/app/js/RoomManager.js
View file

@ -1,7 +1,7 @@
/* eslint-disable
camelcase,
*/
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const metrics = require('@overleaf/metrics')
const { EventEmitter } = require('events')
const OError = require('@overleaf/o-error')

2
services/real-time/app/js/Router.js
View file

@ -2,7 +2,7 @@
camelcase,
*/
const metrics = require('@overleaf/metrics')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const settings = require('@overleaf/settings')
const WebsocketController = require('./WebsocketController')
const HttpController = require('./HttpController')

2
services/real-time/app/js/WebApiManager.js
View file

@ -4,7 +4,7 @@
const request = require('request')
const OError = require('@overleaf/o-error')
const settings = require('@overleaf/settings')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const {
CodedError,
CorruptedJoinProjectResponseError,

2
services/real-time/app/js/WebsocketController.js
View file

@ -2,7 +2,7 @@
camelcase,
*/
const OError = require('@overleaf/o-error')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const metrics = require('@overleaf/metrics')
const WebApiManager = require('./WebApiManager')
const AuthorizationManager = require('./AuthorizationManager')

2
services/real-time/app/js/WebsocketLoadBalancer.js
View file

@ -2,7 +2,7 @@
camelcase,
*/
const Settings = require('@overleaf/settings')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const RedisClientManager = require('./RedisClientManager')
const SafeJsonParse = require('./SafeJsonParse')
const EventLogger = require('./EventLogger')

1716
services/real-time/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

4
services/real-time/package.json
View file

@ -23,7 +23,8 @@
},
"dependencies": {
"@hapi/joi": "^17.1.1",
"@overleaf/metrics": "^3.5.1",
"@overleaf/logger": "^3.1.0",
"@overleaf/metrics": "^4.0.0",
"@overleaf/o-error": "^3.1.0",
"@overleaf/redis-wrapper": "^2.0.0",
"@overleaf/settings": "^2.1.1",
@ -36,7 +37,6 @@
"cookie-parser": "^1.4.5",
"express": "^4.17.1",
"express-session": "^1.17.1",
"logger-sharelatex": "^2.2.0",
"proxy-addr": "^2.0.7",
"request": "^2.88.2",
"socket.io": "https://github.com/overleaf/socket.io/archive/0.9.19-overleaf-5.tar.gz",

2
services/real-time/test/acceptance/js/LeaveDocTests.js
View file

@ -18,7 +18,7 @@ const sinon = require('sinon')
const RealTimeClient = require('./helpers/RealTimeClient')
const MockDocUpdaterServer = require('./helpers/MockDocUpdaterServer')
const FixturesManager = require('./helpers/FixturesManager')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const async = require('async')

2
services/real-time/test/acceptance/js/helpers/RealtimeServer.js
View file

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

2
services/real-time/test/setup.js
View file

@ -21,7 +21,7 @@ const stubs = {
// SandboxedModule configuration
SandboxedModule.configure({
requires: {
'logger-sharelatex': stubs.logger,
'@overleaf/logger': stubs.logger,
},
globals: { Buffer, JSON, console, process },
})

2
services/spelling/app.js
View file

@ -9,7 +9,7 @@ const metrics = require('@overleaf/metrics')
metrics.initialize('spelling')
const Settings = require('@overleaf/settings')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
logger.initialize('spelling')
if ((Settings.sentry != null ? Settings.sentry.dsn : undefined) != null) {
logger.initializeErrorReporting(Settings.sentry.dsn)

2
services/spelling/app/js/ASpell.js
View file

@ -9,7 +9,7 @@
*/
const ASpellWorkerPool = require('./ASpellWorkerPool')
const LRU = require('lru-cache')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const fs = require('fs')
const settings = require('@overleaf/settings')
const Path = require('path')

2
services/spelling/app/js/ASpellWorker.js
View file

@ -8,7 +8,7 @@
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
const childProcess = require('child_process')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const metrics = require('@overleaf/metrics')
const _ = require('underscore')
const OError = require('@overleaf/o-error')

2
services/spelling/app/js/ASpellWorkerPool.js
View file

@ -9,7 +9,7 @@
*/
const ASpellWorker = require('./ASpellWorker')
const _ = require('underscore')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const metrics = require('@overleaf/metrics')
const OError = require('@overleaf/o-error')

2
services/spelling/app/js/HealthCheckController.js
View file

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

2
services/spelling/app/js/LearnedWordsManager.js
View file

@ -1,6 +1,6 @@
const { db } = require('./mongodb')
const mongoCache = require('./MongoCache')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const metrics = require('@overleaf/metrics')
const { promisify } = require('util')
const OError = require('@overleaf/o-error')

2
services/spelling/app/js/SpellingAPIController.js
View file

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

2088
services/spelling/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

4
services/spelling/package.json
View file

@ -25,14 +25,14 @@
},
"version": "0.1.4",
"dependencies": {
"@overleaf/metrics": "^3.5.1",
"@overleaf/logger": "^3.1.0",
"@overleaf/metrics": "^4.0.0",
"@overleaf/o-error": "^3.0.0",
"@overleaf/settings": "^2.1.1",
"async": "^2.6.3",
"body-parser": "^1.19.0",
"bunyan": "^1.8.15",
"express": "^4.17.1",
"logger-sharelatex": "^2.2.0",
"lru-cache": "^5.1.1",
"mongodb": "^3.6.0",
"request": "^2.88.2",

2
services/spelling/test/setup.js
View file

@ -7,7 +7,7 @@ chai.should()
// SandboxedModule configuration
SandboxedModule.configure({
requires: {
'logger-sharelatex': {
'@overleaf/logger': {
debug() {},
log() {},
info() {},

2
services/track-changes/app.js
View file

@ -8,7 +8,7 @@
const Metrics = require('@overleaf/metrics')
Metrics.initialize('track-changes')
const Settings = require('@overleaf/settings')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const TrackChangesLogger = logger.initialize('track-changes').logger
if ((Settings.sentry != null ? Settings.sentry.dsn : undefined) != null) {

2
services/track-changes/app/js/DiffGenerator.js
View file

@ -21,7 +21,7 @@ function ConsistencyError(message) {
}
ConsistencyError.prototype.__proto__ = Error.prototype
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
module.exports = DiffGenerator = {
ConsistencyError,

2
services/track-changes/app/js/DiffManager.js
View file

@ -14,7 +14,7 @@ let DiffManager
const UpdatesManager = require('./UpdatesManager')
const DocumentUpdaterManager = require('./DocumentUpdaterManager')
const DiffGenerator = require('./DiffGenerator')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
module.exports = DiffManager = {
getLatestDocAndUpdates(project_id, doc_id, fromVersion, callback) {

2
services/track-changes/app/js/DocstoreManager.js
View file

@ -1,5 +1,5 @@
const request = require('request')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const Settings = require('@overleaf/settings')
const Errors = require('./Errors')

2
services/track-changes/app/js/DocumentUpdaterManager.js
View file

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

2
services/track-changes/app/js/HealthChecker.js
View file

@ -14,7 +14,7 @@ const request = require('request')
const async = require('async')
const settings = require('@overleaf/settings')
const { port } = settings.internal.trackchanges
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const LockManager = require('./LockManager')
module.exports = {

2
services/track-changes/app/js/HttpController.js
View file

@ -17,7 +17,7 @@ const DiffManager = require('./DiffManager')
const PackManager = require('./PackManager')
const RestoreManager = require('./RestoreManager')
const ZipManager = require('./ZipManager')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const HealthChecker = require('./HealthChecker')
const _ = require('underscore')
const Path = require('path')

2
services/track-changes/app/js/LockManager.js
View file

@ -12,7 +12,7 @@ const redis = require('@overleaf/redis-wrapper')
const rclient = redis.createClient(Settings.redis.lock)
const os = require('os')
const crypto = require('crypto')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const HOST = os.hostname()
const PID = process.pid

2
services/track-changes/app/js/MongoAWS.js
View file

@ -14,7 +14,7 @@
*/
let MongoAWS
const settings = require('@overleaf/settings')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const AWS = require('aws-sdk')
const S3S = require('s3-streams')
const { db, ObjectId } = require('./mongodb')

2
services/track-changes/app/js/MongoManager.js
View file

@ -16,7 +16,7 @@ const PackManager = require('./PackManager')
const async = require('async')
const _ = require('underscore')
const metrics = require('@overleaf/metrics')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
module.exports = MongoManager = {
getLastCompressedUpdate(doc_id, callback) {

2
services/track-changes/app/js/PackManager.js
View file

@ -18,7 +18,7 @@ const _ = require('underscore')
const Bson = require('bson')
const BSON = new Bson()
const { db, ObjectId } = require('./mongodb')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const LockManager = require('./LockManager')
const MongoAWS = require('./MongoAWS')
const Metrics = require('@overleaf/metrics')

2
services/track-changes/app/js/PackWorker.js
View file

@ -23,7 +23,7 @@ const { db, ObjectId, waitForDb, closeDb } = require('./mongodb')
const fs = require('fs')
const Metrics = require('@overleaf/metrics')
Metrics.initialize('track-changes')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
logger.initialize('track-changes-packworker')
if ((Settings.sentry != null ? Settings.sentry.dsn : undefined) != null) {
logger.initializeErrorReporting(Settings.sentry.dsn)

2
services/track-changes/app/js/RestoreManager.js
View file

@ -13,7 +13,7 @@
let RestoreManager
const DocumentUpdaterManager = require('./DocumentUpdaterManager')
const DiffManager = require('./DiffManager')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
module.exports = RestoreManager = {
restoreToBeforeVersion(project_id, doc_id, version, user_id, callback) {

2
services/track-changes/app/js/UpdateTrimmer.js
View file

@ -14,7 +14,7 @@
let UpdateTrimmer
const MongoManager = require('./MongoManager')
const WebApiManager = require('./WebApiManager')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
module.exports = UpdateTrimmer = {
shouldTrimUpdates(project_id, callback) {

2
services/track-changes/app/js/UpdatesManager.js
View file

@ -21,7 +21,7 @@ const UpdateCompressor = require('./UpdateCompressor')
const LockManager = require('./LockManager')
const WebApiManager = require('./WebApiManager')
const UpdateTrimmer = require('./UpdateTrimmer')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const async = require('async')
const _ = require('underscore')
const Settings = require('@overleaf/settings')

2
services/track-changes/app/js/WebApiManager.js
View file

@ -11,7 +11,7 @@
*/
let WebApiManager
const request = require('requestretry') // allow retry on error https://github.com/FGRibreau/node-request-retry
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const Settings = require('@overleaf/settings')
// Don't let HTTP calls hang for a long time

2
services/track-changes/app/js/ZipManager.js
View file

@ -1,4 +1,4 @@
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const UpdatesManager = require('./UpdatesManager')
const DiffGenerator = require('./DiffGenerator')
const DocumentUpdaterManager = require('./DocumentUpdaterManager')

823
services/track-changes/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

4
services/track-changes/package.json
View file

@ -19,7 +19,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.1.0",
"@overleaf/redis-wrapper": "^2.0.0",
"@overleaf/settings": "^2.1.1",
@ -33,7 +34,6 @@
"express": "4.17.1",
"heap": "^0.2.6",
"line-reader": "^0.4.0",
"logger-sharelatex": "^2.2.0",
"mongo-uri": "^0.1.2",
"mongodb": "^3.6.0",
"redis": "~0.10.1",

2
services/track-changes/test/acceptance/js/helpers/TrackChangesApp.js
View file

@ -11,7 +11,7 @@
*/
const app = require('../../../../app')
const { waitForDb } = require('../../../../app/js/mongodb')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const Settings = require('@overleaf/settings')
module.exports = {

2
services/track-changes/test/setup.js
View file

@ -7,7 +7,7 @@ chai.should()
// SandboxedModule configuration
SandboxedModule.configure({
requires: {
'logger-sharelatex': {
'@overleaf/logger': {
debug() {},
log() {},
info() {},