@mongosh/logging 3.2.0 → 3.5.0

package/AUTHORS

@@ -12,3 +12,5 @@ Basit <1305718+mabaasit@users.noreply.github.com>
 Alena Khineika <alena.khineika@mongodb.com>
 Gagik Amaryan <me@gagik.co>
 mongodb-devtools-bot[bot] <189715634+mongodb-devtools-bot[bot]@users.noreply.github.com>
+Ubuntu <ubuntu@ip-10-0-5-160.ec2.internal>
+Ubuntu <ubuntu@ip-10-0-4-95.ec2.internal>

package/lib/analytics-helpers.d.ts

@@ -5,7 +5,7 @@ export type MongoshAnalyticsIdentity = {
     userId?: never;
     anonymousId: string;
 };
-type AnalyticsIdentifyMessage = MongoshAnalyticsIdentity & {
+export type AnalyticsIdentifyMessage = MongoshAnalyticsIdentity & {
     traits: {
         platform: string;
         session_id: string;

package/lib/helpers.d.ts

@@ -0,0 +1,7 @@
+export declare class MultiSet<T extends Record<string, unknown>> {
+    _entries: Map<string, number>;
+    add(entry: T): void;
+    clear(): void;
+    [Symbol.iterator](): Iterator<[T, number]>;
+}
+export declare function toSnakeCase(str: string): string;

package/lib/helpers.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toSnakeCase = exports.MultiSet = void 0;
+class MultiSet {
+    constructor() {
+        this._entries = new Map();
+    }
+    add(entry) {
+        var _a;
+        const key = JSON.stringify(Object.entries(entry).sort());
+        this._entries.set(key, ((_a = this._entries.get(key)) !== null && _a !== void 0 ? _a : 0) + 1);
+    }
+    clear() {
+        this._entries.clear();
+    }
+    *[Symbol.iterator]() {
+        for (const [key, count] of this._entries) {
+            yield [Object.fromEntries(JSON.parse(key)), count];
+        }
+    }
+}
+exports.MultiSet = MultiSet;
+function toSnakeCase(str) {
+    const matches = str.match(/[A-Z]{2,}(?=[A-Z][a-z]+[0-9]*|\b)|[A-Z]?[a-z]+[0-9]*|[A-Z]|[0-9]+/g);
+    if (!matches) {
+        return str;
+    }
+    return matches.map((x) => x.toLowerCase()).join('_');
+}
+exports.toSnakeCase = toSnakeCase;
+//# sourceMappingURL=helpers.js.map

package/lib/helpers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":";;;AAGA,MAAa,QAAQ;IAArB;QACE,aAAQ,GAAwB,IAAI,GAAG,EAAE,CAAC;IAiB5C,CAAC;IAfC,GAAG,CAAC,KAAQ;;QACV,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QACzD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,MAAA,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,mCAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK;QACH,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;IAED,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;QAChB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAEzC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAM,EAAE,KAAK,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;CACF;AAlBD,4BAkBC;AAkBD,SAAgB,WAAW,CAAC,GAAW;IACrC,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CACvB,oEAAoE,CACrE,CAAC;IACF,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,GAAG,CAAC;IACb,CAAC;IAED,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACvD,CAAC;AATD,kCASC"}

package/lib/index.d.ts

@@ -1,2 +1,3 @@
-export { setupLoggerAndTelemetry } from './setup-logger-and-telemetry';
 export { MongoshAnalytics, ToggleableAnalytics, SampledAnalytics, NoopAnalytics, ThrottledAnalytics, } from './analytics-helpers';
+export { MongoshLoggingAndTelemetry } from './types';
+export { setupLoggingAndTelemetry } from './logging-and-telemetry';

package/lib/index.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ThrottledAnalytics = exports.NoopAnalytics = exports.SampledAnalytics = exports.ToggleableAnalytics = exports.setupLoggerAndTelemetry = void 0;
-var setup_logger_and_telemetry_1 = require("./setup-logger-and-telemetry");
-Object.defineProperty(exports, "setupLoggerAndTelemetry", { enumerable: true, get: function () { return setup_logger_and_telemetry_1.setupLoggerAndTelemetry; } });
+exports.setupLoggingAndTelemetry = exports.ThrottledAnalytics = exports.NoopAnalytics = exports.SampledAnalytics = exports.ToggleableAnalytics = void 0;
 var analytics_helpers_1 = require("./analytics-helpers");
 Object.defineProperty(exports, "ToggleableAnalytics", { enumerable: true, get: function () { return analytics_helpers_1.ToggleableAnalytics; } });
 Object.defineProperty(exports, "SampledAnalytics", { enumerable: true, get: function () { return analytics_helpers_1.SampledAnalytics; } });
 Object.defineProperty(exports, "NoopAnalytics", { enumerable: true, get: function () { return analytics_helpers_1.NoopAnalytics; } });
 Object.defineProperty(exports, "ThrottledAnalytics", { enumerable: true, get: function () { return analytics_helpers_1.ThrottledAnalytics; } });
+var logging_and_telemetry_1 = require("./logging-and-telemetry");
+Object.defineProperty(exports, "setupLoggingAndTelemetry", { enumerable: true, get: function () { return logging_and_telemetry_1.setupLoggingAndTelemetry; } });
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,2EAAuE;AAA9D,qIAAA,uBAAuB,OAAA;AAChC,yDAM6B;AAJ3B,wHAAA,mBAAmB,OAAA;AACnB,qHAAA,gBAAgB,OAAA;AAChB,kHAAA,aAAa,OAAA;AACb,uHAAA,kBAAkB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,yDAM6B;AAJ3B,wHAAA,mBAAmB,OAAA;AACnB,qHAAA,gBAAgB,OAAA;AAChB,kHAAA,aAAa,OAAA;AACb,uHAAA,kBAAkB,OAAA;AAGpB,iEAAmE;AAA1D,iIAAA,wBAAwB,OAAA"}

package/lib/logging-and-telemetry.d.ts

@@ -0,0 +1,2 @@
+import type { MongoshLoggingAndTelemetry, MongoshLoggingAndTelemetryArguments } from './types';
+export declare function setupLoggingAndTelemetry(props: MongoshLoggingAndTelemetryArguments): MongoshLoggingAndTelemetry;

package/lib/logging-and-telemetry.js

@@ -0,0 +1,429 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupLoggingAndTelemetry = void 0;
+const mongodb_redact_1 = __importDefault(require("mongodb-redact"));
+const history_1 = require("@mongosh/history");
+const util_1 = require("util");
+const mongodb_log_writer_1 = require("mongodb-log-writer");
+const mongodb_log_writer_2 = require("mongodb-log-writer");
+const devtools_connect_1 = require("@mongodb-js/devtools-connect");
+const helpers_1 = require("./helpers");
+const stream_1 = require("stream");
+function setupLoggingAndTelemetry(props) {
+    const loggingAndTelemetry = new LoggingAndTelemetry(props);
+    loggingAndTelemetry.setup();
+    return loggingAndTelemetry;
+}
+exports.setupLoggingAndTelemetry = setupLoggingAndTelemetry;
+class LoggingAndTelemetry {
+    constructor({ bus, analytics, userTraits, mongoshVersion, }) {
+        this.pendingLogEvents = [];
+        this.isSetup = false;
+        this.isBufferingEvents = false;
+        this.busEventState = {
+            hasStartedMongoshRepl: false,
+            apiCallTracking: {
+                isEnabled: false,
+                apiCalls: new helpers_1.MultiSet(),
+                deprecatedApiCalls: new helpers_1.MultiSet(),
+            },
+            usesShellOption: false,
+            telemetryAnonymousId: undefined,
+            userId: undefined,
+        };
+        this.bus = bus;
+        this.analytics = analytics;
+        this.log = LoggingAndTelemetry.dummyLogger;
+        this.userTraits = userTraits;
+        this.mongoshVersion = mongoshVersion;
+    }
+    setup() {
+        if (this.isSetup) {
+            throw new Error('Setup can only be called once.');
+        }
+        this.setupBusEventListeners();
+        this.isSetup = true;
+        this.isBufferingEvents = true;
+    }
+    attachLogger(logger) {
+        if (!this.isSetup) {
+            throw new Error('Run setup() before setting up the log writer.');
+        }
+        if (this.log !== LoggingAndTelemetry.dummyLogger) {
+            throw new Error('Previously set logger has not been detached. Run detachLogger() before setting.');
+        }
+        this.log = logger;
+        this.isBufferingEvents = false;
+        this.runAndClearPendingEvents();
+        this.bus.emit('mongosh:log-initialized');
+    }
+    detachLogger() {
+        this.log = LoggingAndTelemetry.dummyLogger;
+        this.runAndClearPendingEvents();
+    }
+    runAndClearPendingEvents() {
+        let pendingEvent;
+        while ((pendingEvent = this.pendingLogEvents.shift())) {
+            pendingEvent();
+        }
+    }
+    setupBusEventListeners() {
+        const onBus = (event, listener) => {
+            this.bus.on(event, ((...args) => {
+                if (this.isBufferingEvents) {
+                    this.pendingLogEvents.push(() => listener(...args));
+                    return;
+                }
+                listener(...args);
+            }));
+            return this.bus;
+        };
+        const getUserTraits = () => ({
+            ...this.userTraits,
+            session_id: this.log.logId,
+        });
+        const getTrackingProperties = () => ({
+            mongosh_version: this.mongoshVersion,
+            session_id: this.log.logId,
+        });
+        const getTelemetryUserIdentity = () => {
+            var _a;
+            return {
+                anonymousId: (_a = this.busEventState.telemetryAnonymousId) !== null && _a !== void 0 ? _a : this.busEventState.userId,
+            };
+        };
+        onBus('mongosh:start-mongosh-repl', (ev) => {
+            this.log.info('MONGOSH', (0, mongodb_log_writer_2.mongoLogId)(1000000002), 'repl', 'Started REPL', ev);
+            this.busEventState.hasStartedMongoshRepl = true;
+        });
+        onBus('mongosh:start-loading-cli-scripts', (event) => {
+            this.log.info('MONGOSH', (0, mongodb_log_writer_2.mongoLogId)(1000000003), 'repl', 'Start loading CLI scripts');
+            this.busEventState.usesShellOption = event.usesShellOption;
+        });
+        onBus('mongosh:connect', (args) => {
+            const { uri, resolved_hostname, ...argsWithoutUriAndHostname } = args;
+            const connectionUri = uri && (0, history_1.redactURICredentials)(uri);
+            const atlasHostname = {
+                atlas_hostname: args.is_atlas ? resolved_hostname : null,
+            };
+            const properties = {
+                ...getTrackingProperties(),
+                ...argsWithoutUriAndHostname,
+                ...atlasHostname,
+            };
+            this.log.info('MONGOSH', (0, mongodb_log_writer_2.mongoLogId)(1000000004), 'connect', 'Connecting to server', {
+                userId: this.busEventState.userId,
+                telemetryAnonymousId: this.busEventState.telemetryAnonymousId,
+                connectionUri,
+                ...properties,
+            });
+            this.analytics.track({
+                ...getTelemetryUserIdentity(),
+                event: 'New Connection',
+                properties,
+            });
+        });
+        onBus('mongosh:start-session', (args) => {
+            const normalizedTimingsArray = Object.entries(args.timings).map(([key, duration]) => {
+                const snakeCaseKey = (0, helpers_1.toSnakeCase)(key);
+                return [snakeCaseKey, duration];
+            });
+            const normalizedTimings = Object.fromEntries(normalizedTimingsArray);
+            this.analytics.track({
+                ...getTelemetryUserIdentity(),
+                event: 'Startup Time',
+                properties: {
+                    ...getTrackingProperties(),
+                    is_interactive: args.isInteractive,
+                    js_context: args.jsContext,
+                    ...normalizedTimings,
+                },
+            });
+        });
+        onBus('mongosh:new-user', (newTelemetryUserIdentity) => {
+            if (!newTelemetryUserIdentity.anonymousId) {
+                this.busEventState.userId = newTelemetryUserIdentity.userId;
+            }
+            this.busEventState.telemetryAnonymousId =
+                newTelemetryUserIdentity.anonymousId;
+            this.analytics.identify({
+                anonymousId: newTelemetryUserIdentity.anonymousId,
+                traits: getUserTraits(),
+            });
+        });
+        onBus('mongosh:update-user', (updatedTelemetryUserIdentity) => {
+            if (updatedTelemetryUserIdentity.anonymousId) {
+                this.busEventState.telemetryAnonymousId =
+                    updatedTelemetryUserIdentity.anonymousId;
+            }
+            else {
+                this.busEventState.userId = updatedTelemetryUserIdentity.userId;
+            }
+            this.analytics.identify({
+                ...getTelemetryUserIdentity(),
+                traits: getUserTraits(),
+            });
+            this.log.info('MONGOSH', (0, mongodb_log_writer_2.mongoLogId)(1000000005), 'config', 'User updated');
+        });
+        onBus('mongosh:error', (error, context) => {
+            const mongoshError = error;
+            this.log[context === 'fatal' ? 'fatal' : 'error']('MONGOSH', (0, mongodb_log_writer_2.mongoLogId)(1000000006), context, `${mongoshError.name}: ${mongoshError.message}`, error);
+            if (error.name.includes('Mongosh')) {
+                this.analytics.track({
+                    ...getTelemetryUserIdentity(),
+                    event: 'Error',
+                    properties: {
+                        ...getTrackingProperties(),
+                        name: mongoshError.name,
+                        code: mongoshError.code,
+                        scope: mongoshError.scope,
+                        metadata: mongoshError.metadata,
+                    },
+                });
+            }
+        });
+        onBus('mongosh:write-custom-log', (event) => {
+            this.log[event.method]('MONGOSH-SCRIPTS', (0, mongodb_log_writer_2.mongoLogId)(1000000054), 'custom-log', event.message, event.attr, event.level);
+        });
+        onBus('mongosh:globalconfig-load', (args) => {
+            this.log.info('MONGOSH', (0, mongodb_log_writer_2.mongoLogId)(1000000048), 'config', 'Loading global configuration file', args);
+        });
+        onBus('mongosh:evaluate-input', (args) => {
+            this.log.info('MONGOSH', (0, mongodb_log_writer_2.mongoLogId)(1000000007), 'repl', 'Evaluating input', args);
+        });
+        onBus('mongosh:use', (args) => {
+            this.log.info('MONGOSH', (0, mongodb_log_writer_2.mongoLogId)(1000000008), 'shell-api', 'Used "use" command', args);
+            this.analytics.track({
+                ...getTelemetryUserIdentity(),
+                event: 'Use',
+                properties: {
+                    ...getTrackingProperties(),
+                },
+            });
+        });
+        onBus('mongosh:show', (args) => {
+            this.log.info('MONGOSH', (0, mongodb_log_writer_2.mongoLogId)(1000000009), 'shell-api', 'Used "show" command', args);
+            this.analytics.track({
+                ...getTelemetryUserIdentity(),
+                event: 'Show',
+                properties: {
+                    ...getTrackingProperties(),
+                    method: args.method,
+                },
+            });
+        });
+        onBus('mongosh:setCtx', (args) => {
+            this.log.info('MONGOSH', (0, mongodb_log_writer_2.mongoLogId)(1000000010), 'shell-api', 'Initialized context', args);
+        });
+        onBus('mongosh:api-call-with-arguments', (args) => {
+            let arg;
+            try {
+                arg = JSON.parse(JSON.stringify(args));
+            }
+            catch (_a) {
+                arg = { _inspected: (0, util_1.inspect)(args) };
+            }
+            this.log.info('MONGOSH', (0, mongodb_log_writer_2.mongoLogId)(1000000011), 'shell-api', 'Performed API call', (0, mongodb_redact_1.default)(arg));
+        });
+        onBus('mongosh:api-load-file', (args) => {
+            this.log.info('MONGOSH', (0, mongodb_log_writer_2.mongoLogId)(1000000012), 'shell-api', 'Loading file via load()', args);
+            this.analytics.track({
+                ...getTelemetryUserIdentity(),
+                event: this.busEventState.hasStartedMongoshRepl
+                    ? 'Script Loaded'
+                    : 'Script Loaded CLI',
+                properties: {
+                    ...getTrackingProperties(),
+                    nested: args.nested,
+                    ...(this.busEventState.hasStartedMongoshRepl
+                        ? {}
+                        : { shell: this.busEventState.usesShellOption }),
+                },
+            });
+        });
+        onBus('mongosh:eval-cli-script', () => {
+            this.log.info('MONGOSH', (0, mongodb_log_writer_2.mongoLogId)(1000000013), 'repl', 'Evaluating script passed on the command line');
+            this.analytics.track({
+                ...getTelemetryUserIdentity(),
+                event: 'Script Evaluated',
+                properties: {
+                    ...getTrackingProperties(),
+                    shell: this.busEventState.usesShellOption,
+                },
+            });
+        });
+        onBus('mongosh:mongoshrc-load', () => {
+            this.log.info('MONGOSH', (0, mongodb_log_writer_2.mongoLogId)(1000000014), 'repl', 'Loading .mongoshrc.js');
+            this.analytics.track({
+                ...getTelemetryUserIdentity(),
+                event: 'Mongoshrc Loaded',
+                properties: {
+                    ...getTrackingProperties(),
+                },
+            });
+        });
+        onBus('mongosh:mongoshrc-mongorc-warn', () => {
+            this.log.info('MONGOSH', (0, mongodb_log_writer_2.mongoLogId)(1000000015), 'repl', 'Warning about .mongorc.js/.mongoshrc.js mismatch');
+            this.analytics.track({
+                ...getTelemetryUserIdentity(),
+                event: 'Mongorc Warning',
+                properties: {
+                    ...getTrackingProperties(),
+                },
+            });
+        });
+        onBus('mongosh:crypt-library-load-skip', (ev) => {
+            this.log.info('AUTO-ENCRYPTION', (0, mongodb_log_writer_2.mongoLogId)(1000000050), 'crypt-library', 'Skipping shared library candidate', ev);
+        });
+        onBus('mongosh:crypt-library-load-found', (ev) => {
+            this.log.warn('AUTO-ENCRYPTION', (0, mongodb_log_writer_2.mongoLogId)(1000000051), 'crypt-library', 'Accepted shared library candidate', {
+                cryptSharedLibPath: ev.cryptSharedLibPath,
+                expectedVersion: ev.expectedVersion.versionStr,
+            });
+        });
+        onBus('mongosh-snippets:loaded', (ev) => {
+            this.log.info('MONGOSH-SNIPPETS', (0, mongodb_log_writer_2.mongoLogId)(1000000019), 'snippets', 'Loaded snippets', ev);
+        });
+        onBus('mongosh-snippets:npm-lookup', (ev) => {
+            this.log.info('MONGOSH-SNIPPETS', (0, mongodb_log_writer_2.mongoLogId)(1000000020), 'snippets', 'Performing npm lookup', ev);
+        });
+        onBus('mongosh-snippets:npm-lookup-stopped', () => {
+            this.log.info('MONGOSH-SNIPPETS', (0, mongodb_log_writer_2.mongoLogId)(1000000021), 'snippets', 'npm lookup stopped');
+        });
+        onBus('mongosh-snippets:npm-download-failed', (ev) => {
+            this.log.info('MONGOSH-SNIPPETS', (0, mongodb_log_writer_2.mongoLogId)(1000000022), 'snippets', 'npm download failed', ev);
+        });
+        onBus('mongosh-snippets:npm-download-active', (ev) => {
+            this.log.info('MONGOSH-SNIPPETS', (0, mongodb_log_writer_2.mongoLogId)(1000000023), 'snippets', 'npm download active', ev);
+        });
+        onBus('mongosh-snippets:fetch-index', (ev) => {
+            this.log.info('MONGOSH-SNIPPETS', (0, mongodb_log_writer_2.mongoLogId)(1000000024), 'snippets', 'Fetching snippet index', ev);
+        });
+        onBus('mongosh-snippets:fetch-cache-invalid', () => {
+            this.log.info('MONGOSH-SNIPPETS', (0, mongodb_log_writer_2.mongoLogId)(1000000025), 'snippets', 'Snippet cache invalid');
+        });
+        onBus('mongosh-snippets:fetch-index-error', (ev) => {
+            this.log.info('MONGOSH-SNIPPETS', (0, mongodb_log_writer_2.mongoLogId)(1000000026), 'snippets', 'Fetching snippet index failed', ev);
+        });
+        onBus('mongosh-snippets:fetch-index-done', () => {
+            this.log.info('MONGOSH-SNIPPETS', (0, mongodb_log_writer_2.mongoLogId)(1000000027), 'snippets', 'Fetching snippet index done');
+        });
+        onBus('mongosh-snippets:package-json-edit-error', (ev) => {
+            this.log.info('MONGOSH-SNIPPETS', (0, mongodb_log_writer_2.mongoLogId)(1000000028), 'snippets', 'Modifying snippets package.json failed', ev);
+        });
+        onBus('mongosh-snippets:spawn-child', (ev) => {
+            this.log.info('MONGOSH-SNIPPETS', (0, mongodb_log_writer_2.mongoLogId)(1000000029), 'snippets', 'Spawning helper', ev);
+        });
+        onBus('mongosh-snippets:load-snippet', (ev) => {
+            this.log.info('MONGOSH-SNIPPETS', (0, mongodb_log_writer_2.mongoLogId)(1000000030), 'snippets', 'Loading snippet', ev);
+        });
+        onBus('mongosh-snippets:snippet-command', (ev) => {
+            this.log.info('MONGOSH-SNIPPETS', (0, mongodb_log_writer_2.mongoLogId)(1000000031), 'snippets', 'Running snippet command', ev);
+            if (ev.args[0] === 'install') {
+                this.analytics.track({
+                    ...getTelemetryUserIdentity(),
+                    event: 'Snippet Install',
+                    properties: {
+                        ...getTrackingProperties(),
+                    },
+                });
+            }
+        });
+        onBus('mongosh-snippets:transform-error', (ev) => {
+            this.log.info('MONGOSH-SNIPPETS', (0, mongodb_log_writer_2.mongoLogId)(1000000032), 'snippets', 'Rewrote error message', ev);
+        });
+        onBus('mongosh:api-call', (ev) => {
+            if (!this.busEventState.apiCallTracking.isEnabled)
+                return;
+            const { apiCalls, deprecatedApiCalls } = this.busEventState.apiCallTracking;
+            if (ev.deprecated) {
+                deprecatedApiCalls.add({ class: ev.class, method: ev.method });
+            }
+            if (ev.callDepth === 0 && ev.isAsync) {
+                apiCalls.add({ class: ev.class, method: ev.method });
+            }
+        });
+        onBus('mongosh:evaluate-started', () => {
+            const { apiCalls, deprecatedApiCalls } = this.busEventState.apiCallTracking;
+            this.busEventState.apiCallTracking.isEnabled = true;
+            deprecatedApiCalls.clear();
+            apiCalls.clear();
+        });
+        onBus('mongosh:evaluate-finished', () => {
+            const { apiCalls, deprecatedApiCalls } = this.busEventState.apiCallTracking;
+            for (const [entry] of deprecatedApiCalls) {
+                this.log.warn('MONGOSH', (0, mongodb_log_writer_2.mongoLogId)(1000000033), 'shell-api', 'Deprecated API call', entry);
+                this.analytics.track({
+                    ...getTelemetryUserIdentity(),
+                    event: 'Deprecated Method',
+                    properties: {
+                        ...getTrackingProperties(),
+                        ...entry,
+                    },
+                });
+            }
+            for (const [entry, count] of apiCalls) {
+                this.analytics.track({
+                    ...getTelemetryUserIdentity(),
+                    event: 'API Call',
+                    properties: {
+                        ...getTrackingProperties(),
+                        ...entry,
+                        count,
+                    },
+                });
+            }
+            deprecatedApiCalls.clear();
+            apiCalls.clear();
+            this.busEventState.apiCallTracking.isEnabled = false;
+        });
+        onBus('mongosh-sp:reset-connection-options', () => {
+            this.log.info('MONGOSH-SP', (0, mongodb_log_writer_2.mongoLogId)(1000000040), 'connect', 'Reconnect because of changed connection options');
+        });
+        onBus('mongosh-editor:run-edit-command', (ev) => {
+            this.log.error('MONGOSH-EDITOR', (0, mongodb_log_writer_2.mongoLogId)(1000000047), 'editor', 'Open external editor', (0, mongodb_redact_1.default)(ev));
+        });
+        onBus('mongosh-editor:read-vscode-extensions-done', (ev) => {
+            this.log.error('MONGOSH-EDITOR', (0, mongodb_log_writer_2.mongoLogId)(1000000043), 'editor', 'Reading vscode extensions from file system succeeded', ev);
+        });
+        onBus('mongosh-editor:read-vscode-extensions-failed', (ev) => {
+            this.log.error('MONGOSH-EDITOR', (0, mongodb_log_writer_2.mongoLogId)(1000000044), 'editor', 'Reading vscode extensions from file system failed', {
+                ...ev,
+                error: ev.error.message,
+            });
+        });
+        onBus('mongosh:fetching-update-metadata', (ev) => {
+            this.log.info('MONGOSH', (0, mongodb_log_writer_2.mongoLogId)(1000000052), 'startup', 'Fetching update metadata', {
+                ...ev,
+            });
+        });
+        onBus('mongosh:fetching-update-metadata-complete', (ev) => {
+            this.log.info('MONGOSH', (0, mongodb_log_writer_2.mongoLogId)(1000000053), 'startup', 'Fetching update metadata complete', {
+                ...ev,
+            });
+        });
+        (0, devtools_connect_1.hookLogger)(this.bus, {
+            info: (...args) => {
+                return this.log.info(...args);
+            },
+            warn: (...args) => {
+                return this.log.warn(...args);
+            },
+            error: (...args) => {
+                return this.log.error(...args);
+            },
+            mongoLogId: (...args) => {
+                return this.log.mongoLogId(...args);
+            },
+        }, 'mongosh', (uri) => (0, history_1.redactURICredentials)(uri));
+    }
+}
+LoggingAndTelemetry.dummyLogger = new mongodb_log_writer_1.MongoLogWriter('', null, new stream_1.Writable({
+    write(chunk, encoding, callback) {
+        callback();
+    },
+}));
+//# sourceMappingURL=logging-and-telemetry.js.map

package/lib/logging-and-telemetry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logging-and-telemetry.js","sourceRoot":"","sources":["../src/logging-and-telemetry.ts"],"names":[],"mappings":"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"}

package/lib/types.d.ts

@@ -0,0 +1,33 @@
+import type { ApiEvent, MongoshBus } from '@mongosh/types';
+import type { MongoLogWriter } from 'mongodb-log-writer';
+import type { MongoshAnalytics } from './analytics-helpers';
+import type { MultiSet } from './helpers';
+export interface MongoshLoggingAndTelemetry {
+    attachLogger(logger: MongoLogWriter): void;
+    detachLogger(): void;
+}
+export type MongoshLoggingAndTelemetryArguments = {
+    bus: MongoshBus;
+    analytics: MongoshAnalytics;
+    userTraits: {
+        platform: string;
+    } & {
+        [key: string]: unknown;
+    };
+    mongoshVersion: string;
+};
+export type MongoshTrackingProperties = {
+    mongosh_version: string;
+    session_id: string;
+};
+export type LoggingAndTelemetryBusEventState = {
+    hasStartedMongoshRepl: boolean;
+    apiCallTracking: {
+        isEnabled: boolean;
+        apiCalls: MultiSet<Pick<ApiEvent, 'class' | 'method'>>;
+        deprecatedApiCalls: MultiSet<Pick<ApiEvent, 'class' | 'method'>>;
+    };
+    usesShellOption: boolean;
+    telemetryAnonymousId: string | undefined;
+    userId: string | undefined;
+};

package/lib/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/lib/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mongosh/logging",
-  "version": "3.2.0",
+  "version": "3.5.0",
   "description": "MongoDB Shell Logging Utilities Package",
   "homepage": "https://github.com/mongodb-js/mongosh",
   "license": "Apache-2.0",
@@ -19,9 +19,9 @@
   "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",
+    "@mongosh/history": "2.4.5",
+    "@mongosh/types": "3.5.0",
+    "mongodb-log-writer": "^2.3.1",
     "mongodb-redact": "^1.1.5"
   },
   "devDependencies": {
@@ -49,5 +49,5 @@
   "mongosh": {
     "unitTestsOnly": true
   },
-  "gitHead": "032d3b89b55f9ddeac19afad76e7c9218a4a83f2"
+  "gitHead": "4a09f590a638f320b1809a9a483172b21e222417"
 }

package/src/analytics-helpers.ts

@@ -11,7 +11,7 @@ export type MongoshAnalyticsIdentity =
       anonymousId: string;
     };
 
-type AnalyticsIdentifyMessage = MongoshAnalyticsIdentity & {
+export type AnalyticsIdentifyMessage = MongoshAnalyticsIdentity & {
   traits: { platform: string; session_id: string };
   timestamp?: Date;
 };