diff --git a/package-lock.json b/package-lock.json index 96c1473540d..5f790b60bec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8798,48 +8798,6 @@ "node": ">=14.15.1" } }, - "node_modules/@mongosh/history": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-2.4.2.tgz", - "integrity": "sha512-63qaRYr5ZU/+FjC++xX4n1+Kl3PaGFoMMrgRtsJr082uBKfWsFv81Pre/aaGRdt9IqDGFtmkiAKHdMMwnOyMFQ==", - "license": "Apache-2.0", - "dependencies": { - "mongodb-connection-string-url": "^3.0.1", - "mongodb-redact": "^1.1.5" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "node_modules/@mongosh/logging": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-3.2.0.tgz", - "integrity": "sha512-aX7+aR8et+tiS0e69vQwSTbvdHrdoI8IW+LoAAvxiwPp33pFKqoyDU1osnmJ6TgygB+Hxt3aOqygCWi/hqNypg==", - "license": "Apache-2.0", - "dependencies": { - "@mongodb-js/devtools-connect": "^3.4.1", - "@mongosh/errors": "2.4.0", - "@mongosh/history": "2.4.2", - "@mongosh/types": "3.2.0", - "mongodb-log-writer": "^2.1.0", - "mongodb-redact": "^1.1.5" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "node_modules/@mongosh/types": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-3.2.0.tgz", - "integrity": "sha512-tExVfsxH6NDFq8Tldc2k04t1xN5IWKqR8QffeKmNNdOmERGRi7IHMrGWV993AE1eqK0in8dbZoHbgzD6+Ql8hQ==", - "license": "Apache-2.0", - "dependencies": { - "@mongodb-js/devtools-connect": "^3.4.1" - }, - "engines": { - "node": ">=14.15.1" - } - }, "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": { "version": "5.1.1-v1", "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz", @@ -31753,9 +31711,9 @@ } }, "node_modules/mongodb-log-writer": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.1.0.tgz", - "integrity": "sha512-ZlNts/L9fs6gQNRuqLcB0+yjjfeyapbxjdkDpeb2bEYOUUThG0iOEhzIFejv0g3TX1SSAsdrT2aGYnFqoQILgQ==", + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.3.4.tgz", + "integrity": "sha512-Z2rXUotJX3DVBlRN8y2Dzv26/SnEYlD7gh3uzvxL2myFKfyB2zQjY8DeQWb11WEam9v9LF9VwhndapLOTkJ+yA==", "license": "Apache-2.0", "dependencies": { "heap-js": "^2.3.0" @@ -43549,7 +43507,7 @@ "mongodb-connection-string-url": "^3.0.1", "mongodb-data-service": "^22.25.2", "mongodb-instance-model": "^12.26.2", - "mongodb-log-writer": "^2.1.0", + "mongodb-log-writer": "^2.3.4", "mongodb-ns": "^2.4.2", "react": "^17.0.2", "react-dom": "^17.0.2", @@ -44362,7 +44320,7 @@ "mongodb": "^6.12.0", "mongodb-build-info": "^1.7.2", "mongodb-connection-string-url": "^3.0.1", - "mongodb-log-writer": "^2.1.0", + "mongodb-log-writer": "^2.3.4", "mongodb-runner": "^5.6.3", "node-fetch": "^2.7.0", "nyc": "^15.1.0", @@ -45843,7 +45801,7 @@ "hadron-app-registry": "^9.4.2", "hadron-ipc": "^3.4.2", "is-electron-renderer": "^2.0.1", - "mongodb-log-writer": "^2.1.0", + "mongodb-log-writer": "^2.3.4", "react": "^17.0.2" }, "devDependencies": { @@ -46498,7 +46456,7 @@ "@mongodb-js/compass-utils": "^0.8.2", "@mongodb-js/compass-workspaces": "^0.31.2", "@mongosh/browser-repl": "^3.5.0", - "@mongosh/logging": "^3.2.0", + "@mongosh/logging": "^3.5.0", "@mongosh/node-runtime-worker-thread": "^3.3.0", "bson": "^6.10.1", "compass-preferences-model": "^2.33.2", @@ -46640,6 +46598,23 @@ "node": ">=14.15.1" } }, + "packages/compass-shell/node_modules/@mongosh/logging": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-3.5.0.tgz", + "integrity": "sha512-K3eipDAltOgJ8kV/Gbu4OVDEvL+ZTJ94IYZdj7VcWZyomYIyp2buSTR/ZCWK222mEjHUry5esyalrlH5vmR7fw==", + "license": "Apache-2.0", + "dependencies": { + "@mongodb-js/devtools-connect": "^3.4.1", + "@mongosh/errors": "2.4.0", + "@mongosh/history": "2.4.5", + "@mongosh/types": "3.5.0", + "mongodb-log-writer": "^2.3.1", + "mongodb-redact": "^1.1.5" + }, + "engines": { + "node": ">=14.15.1" + } + }, "packages/compass-shell/node_modules/@mongosh/node-runtime-worker-thread": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/@mongosh/node-runtime-worker-thread/-/node-runtime-worker-thread-3.3.0.tgz", @@ -46705,6 +46680,18 @@ "node": ">=14.15.1" } }, + "packages/compass-shell/node_modules/@mongosh/types": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-3.5.0.tgz", + "integrity": "sha512-IXhxy/1/LSEyCrG31MwUuF2OWwLDHmYk8SGtcT5FoJoPHcCoZYI6QLbXkVGlFRdsWNct2/BSX5Np4bx1gNSMlQ==", + "license": "Apache-2.0", + "dependencies": { + "@mongodb-js/devtools-connect": "^3.4.1" + }, + "engines": { + "node": ">=14.15.1" + } + }, "packages/compass-shell/node_modules/bson": { "version": "6.10.3", "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.3.tgz", @@ -48198,7 +48185,7 @@ "eslint": "^7.25.0", "kerberos": "^2.2.0", "mocha": "^10.2.0", - "mongodb-log-writer": "^2.1.0", + "mongodb-log-writer": "^2.3.4", "nyc": "^15.1.0", "prettier": "^2.7.1", "sinon": "^9.2.3", @@ -57746,7 +57733,7 @@ "hadron-ipc": "^3.4.2", "is-electron-renderer": "^2.0.1", "mocha": "^10.2.0", - "mongodb-log-writer": "^2.1.0", + "mongodb-log-writer": "^2.3.4", "nyc": "^15.1.0", "prettier": "^2.7.1", "react": "^17.0.2", @@ -58411,7 +58398,7 @@ "@mongodb-js/testing-library-compass": "^1.2.2", "@mongodb-js/tsconfig-compass": "^1.2.2", "@mongosh/browser-repl": "^3.5.0", - "@mongosh/logging": "^3.2.0", + "@mongosh/logging": "^3.5.0", "@mongosh/node-runtime-worker-thread": "^3.3.0", "@types/enzyme": "^3.10.14", "bson": "^6.10.1", @@ -58508,6 +58495,19 @@ "@mongosh/errors": "2.4.0" } }, + "@mongosh/logging": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-3.5.0.tgz", + "integrity": "sha512-K3eipDAltOgJ8kV/Gbu4OVDEvL+ZTJ94IYZdj7VcWZyomYIyp2buSTR/ZCWK222mEjHUry5esyalrlH5vmR7fw==", + "requires": { + "@mongodb-js/devtools-connect": "^3.4.1", + "@mongosh/errors": "2.4.0", + "@mongosh/history": "2.4.5", + "@mongosh/types": "3.5.0", + "mongodb-log-writer": "^2.3.1", + "mongodb-redact": "^1.1.5" + } + }, "@mongosh/node-runtime-worker-thread": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/@mongosh/node-runtime-worker-thread/-/node-runtime-worker-thread-3.3.0.tgz", @@ -58555,6 +58555,14 @@ "@mongosh/shell-api": "3.5.0" } }, + "@mongosh/types": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-3.5.0.tgz", + "integrity": "sha512-IXhxy/1/LSEyCrG31MwUuF2OWwLDHmYk8SGtcT5FoJoPHcCoZYI6QLbXkVGlFRdsWNct2/BSX5Np4bx1gNSMlQ==", + "requires": { + "@mongodb-js/devtools-connect": "^3.4.1" + } + }, "bson": { "version": "6.10.3", "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.3.tgz", @@ -61023,36 +61031,6 @@ "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-2.4.0.tgz", "integrity": "sha512-2YwY4TYlrAy3VC9Y5Xa1OWlbdb57O0ZTDfntROFcfotrMXkZc9CU+jafrKRNcPJz8UAhoUcSTDJuaLpC3AutHg==" }, - "@mongosh/history": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-2.4.2.tgz", - "integrity": "sha512-63qaRYr5ZU/+FjC++xX4n1+Kl3PaGFoMMrgRtsJr082uBKfWsFv81Pre/aaGRdt9IqDGFtmkiAKHdMMwnOyMFQ==", - "requires": { - "mongodb-connection-string-url": "^3.0.1", - "mongodb-redact": "^1.1.5" - } - }, - "@mongosh/logging": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-3.2.0.tgz", - "integrity": "sha512-aX7+aR8et+tiS0e69vQwSTbvdHrdoI8IW+LoAAvxiwPp33pFKqoyDU1osnmJ6TgygB+Hxt3aOqygCWi/hqNypg==", - "requires": { - "@mongodb-js/devtools-connect": "^3.4.1", - "@mongosh/errors": "2.4.0", - "@mongosh/history": "2.4.2", - "@mongosh/types": "3.2.0", - "mongodb-log-writer": "^2.1.0", - "mongodb-redact": "^1.1.5" - } - }, - "@mongosh/types": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-3.2.0.tgz", - "integrity": "sha512-tExVfsxH6NDFq8Tldc2k04t1xN5IWKqR8QffeKmNNdOmERGRi7IHMrGWV993AE1eqK0in8dbZoHbgzD6+Ql8hQ==", - "requires": { - "@mongodb-js/devtools-connect": "^3.4.1" - } - }, "@nicolo-ribaudo/eslint-scope-5-internals": { "version": "5.1.1-v1", "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz", @@ -68079,7 +68057,7 @@ "mongodb": "^6.12.0", "mongodb-build-info": "^1.7.2", "mongodb-connection-string-url": "^3.0.1", - "mongodb-log-writer": "^2.1.0", + "mongodb-log-writer": "^2.3.4", "mongodb-runner": "^5.6.3", "node-fetch": "^2.7.0", "nyc": "^15.1.0", @@ -79989,7 +79967,7 @@ "mongodb-connection-string-url": "^3.0.1", "mongodb-data-service": "^22.25.2", "mongodb-instance-model": "^12.26.2", - "mongodb-log-writer": "^2.1.0", + "mongodb-log-writer": "^2.3.4", "mongodb-ns": "^2.4.2", "os-dns-native": "^1.2.1", "react": "^17.0.2", @@ -80169,7 +80147,7 @@ "mongodb-build-info": "^1.7.2", "mongodb-client-encryption": "^6.1.0", "mongodb-connection-string-url": "^3.0.1", - "mongodb-log-writer": "^2.1.0", + "mongodb-log-writer": "^2.3.4", "mongodb-ns": "^2.4.2", "nyc": "^15.1.0", "prettier": "^2.7.1", @@ -80590,9 +80568,9 @@ } }, "mongodb-log-writer": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.1.0.tgz", - "integrity": "sha512-ZlNts/L9fs6gQNRuqLcB0+yjjfeyapbxjdkDpeb2bEYOUUThG0iOEhzIFejv0g3TX1SSAsdrT2aGYnFqoQILgQ==", + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.3.4.tgz", + "integrity": "sha512-Z2rXUotJX3DVBlRN8y2Dzv26/SnEYlD7gh3uzvxL2myFKfyB2zQjY8DeQWb11WEam9v9LF9VwhndapLOTkJ+yA==", "requires": { "heap-js": "^2.3.0" } diff --git a/packages/compass-e2e-tests/package.json b/packages/compass-e2e-tests/package.json index 85bccacd809..e497df9714d 100644 --- a/packages/compass-e2e-tests/package.json +++ b/packages/compass-e2e-tests/package.json @@ -61,7 +61,7 @@ "mongodb": "^6.12.0", "mongodb-build-info": "^1.7.2", "mongodb-connection-string-url": "^3.0.1", - "mongodb-log-writer": "^2.1.0", + "mongodb-log-writer": "^2.3.4", "mongodb-runner": "^5.6.3", "node-fetch": "^2.7.0", "nyc": "^15.1.0", diff --git a/packages/compass-logging/package.json b/packages/compass-logging/package.json index 9cc1173e680..3c180197209 100644 --- a/packages/compass-logging/package.json +++ b/packages/compass-logging/package.json @@ -55,7 +55,7 @@ "hadron-app-registry": "^9.4.2", "hadron-ipc": "^3.4.2", "is-electron-renderer": "^2.0.1", - "mongodb-log-writer": "^2.1.0", + "mongodb-log-writer": "^2.3.4", "react": "^17.0.2" }, "devDependencies": { diff --git a/packages/compass-shell/package.json b/packages/compass-shell/package.json index 06e1dbd1e88..31c49c776d0 100644 --- a/packages/compass-shell/package.json +++ b/packages/compass-shell/package.json @@ -58,7 +58,7 @@ "@mongodb-js/compass-utils": "^0.8.2", "@mongodb-js/compass-workspaces": "^0.31.2", "@mongosh/browser-repl": "^3.5.0", - "@mongosh/logging": "^3.2.0", + "@mongosh/logging": "^3.5.0", "@mongosh/node-runtime-worker-thread": "^3.3.0", "bson": "^6.10.1", "compass-preferences-model": "^2.33.2", diff --git a/packages/compass-shell/src/modules/worker-runtime.ts b/packages/compass-shell/src/modules/worker-runtime.ts index 33dcdb535b1..d0e8d6f8ba0 100644 --- a/packages/compass-shell/src/modules/worker-runtime.ts +++ b/packages/compass-shell/src/modules/worker-runtime.ts @@ -4,7 +4,7 @@ import type { } from '@mongodb-js/compass-connections/provider'; import type { MongoLogWriter } from '@mongodb-js/compass-logging/provider'; import type { TrackFunction } from '@mongodb-js/compass-telemetry/provider'; -import { setupLoggerAndTelemetry } from '@mongosh/logging'; +import { setupLoggingAndTelemetry } from '@mongosh/logging'; import { EventEmitter } from 'events'; declare const __webpack_require__: typeof require; @@ -52,10 +52,9 @@ export function createWorkerRuntime( ): typeof WorkerRuntime['prototype'] { const emitter = new EventEmitter(); - setupLoggerAndTelemetry( - emitter, - log, - { + const loggingAndTelemetry = setupLoggingAndTelemetry({ + bus: emitter, + analytics: { identify: () => { /* not needed */ }, @@ -63,19 +62,26 @@ export function createWorkerRuntime( // We always enable telemetry here, since the track call will // already check whether Compass telemetry is enabled or not. track: ({ event, properties }) => { - return track(`Shell ${event}`, properties, connectionInfo.current); + return track( + `Shell ${event as string}`, + // eslint-disable-next-line @typescript-eslint/no-unsafe-argument + properties, + connectionInfo.current + ); }, flush: () => { return Promise.resolve(); // not needed }, }, - { + userTraits: { platform: process.platform, arch: process.arch, }, // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-var-requires - require('../../package.json').version - ); + mongoshVersion: require('../../package.json').version, + }); + + loggingAndTelemetry.attachLogger(log); // We also don't need to pass a proper user id, since that is // handled by the Compass tracking code. diff --git a/packages/compass/package.json b/packages/compass/package.json index c1fa22e1446..1da800c08f5 100644 --- a/packages/compass/package.json +++ b/packages/compass/package.json @@ -268,7 +268,7 @@ "mongodb-connection-string-url": "^3.0.1", "mongodb-data-service": "^22.25.2", "mongodb-instance-model": "^12.26.2", - "mongodb-log-writer": "^2.1.0", + "mongodb-log-writer": "^2.3.4", "mongodb-ns": "^2.4.2", "react": "^17.0.2", "react-dom": "^17.0.2", diff --git a/packages/data-service/package.json b/packages/data-service/package.json index 79ea2d1abac..cbda0ce0492 100644 --- a/packages/data-service/package.json +++ b/packages/data-service/package.json @@ -78,7 +78,7 @@ "eslint": "^7.25.0", "kerberos": "^2.2.0", "mocha": "^10.2.0", - "mongodb-log-writer": "^2.1.0", + "mongodb-log-writer": "^2.3.4", "nyc": "^15.1.0", "prettier": "^2.7.1", "sinon": "^9.2.3",