@mongosh/logging 1.2.3 → 1.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/AUTHORS +1 -0
  2. package/lib/analytics-helpers.d.ts +7 -4
  3. package/lib/analytics-helpers.js.map +1 -1
  4. package/lib/setup-logger-and-telemetry.js +95 -66
  5. package/lib/setup-logger-and-telemetry.js.map +1 -1
  6. package/package.json +6 -6
  7. package/src/analytics-helpers.ts +8 -4
  8. package/src/setup-logger-and-telemetry.spec.ts +30 -34
  9. package/src/setup-logger-and-telemetry.ts +60 -31
package/AUTHORS CHANGED
@@ -2,3 +2,4 @@ Anna Henningsen <anna@addaleax.net>
2
2
  Alena Khineika <alena.khineika@gmail.com>
3
3
  github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
4
4
  Sergey Petushkov <petushkov.sergey@gmail.com>
5
+ Leonardo Rossi <leonardo.rossi@gmail.com>
package/lib/analytics-helpers.d.ts CHANGED
@@ -1,12 +1,15 @@
1
+ export declare type MongoshAnalyticsIdentity = {
2
+ userId: string;
3
+ } | {
4
+ anonymousId: string;
5
+ };
1
6
  export interface MongoshAnalytics {
2
- identify(message: {
3
- userId: string;
7
+ identify(message: MongoshAnalyticsIdentity & {
4
8
  traits: {
5
9
  platform: string;
6
10
  };
7
11
  }): void;
8
- track(message: {
9
- userId: string;
12
+ track(message: MongoshAnalyticsIdentity & {
10
13
  event: string;
11
14
  properties: {
12
15
  mongosh_version: string;
package/lib/analytics-helpers.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"analytics-helpers.js","sourceRoot":"","sources":["../src/analytics-helpers.ts"],"names":[],"mappings":";;;AAyBA,MAAa,aAAa;IACxB,QAAQ,CAAC,KAAU,IAAS,CAAC;IAC7B,KAAK,CAAC,KAAU,IAAS,CAAC;CAC3B;AAHD,sCAGC;AAMD,MAAa,mBAAmB;IAK9B,YAAY,SAA2B,IAAI,aAAa,EAAE;QAJ1D,WAAM,GAAqH,EAAE,CAAC;QAC9H,WAAM,GAAsC,QAAQ,CAAC;QAInD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAED,QAAQ,CAAC,GAAG,IAA8C;QACxD,QAAQ,IAAI,CAAC,MAAM,EAAE;YACnB,KAAK,SAAS;gBACZ,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC;gBAC/B,MAAM;YACR,KAAK,QAAQ;gBACX,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC;gBACrC,MAAM;YACR;gBACE,MAAM;SACT;IACH,CAAC;IAED,KAAK,CAAC,GAAG,IAA2C;QAClD,QAAQ,IAAI,CAAC,MAAM,EAAE;YACnB,KAAK,SAAS;gBACZ,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;gBAC5B,MAAM;YACR,KAAK,QAAQ;gBACX,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;gBAClC,MAAM;YACR;gBACE,MAAM;SACT;IACH,CAAC;IAED,MAAM;QACJ,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACxB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,KAAK,MAAM,KAAK,IAAI,KAAK,EAAE;YACzB,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,UAAU;gBAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACxD,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,OAAO;gBAAE,IAAI,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;SACnD;IACH,CAAC;IAED,OAAO;QACL,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;IACnB,CAAC;IAED,KAAK;QACH,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC;IACzB,CAAC;CACF;AArDD,kDAqDC"}
1
+ {"version":3,"file":"analytics-helpers.js","sourceRoot":"","sources":["../src/analytics-helpers.ts"],"names":[],"mappings":";;;AA6BA,MAAa,aAAa;IACxB,QAAQ,CAAC,KAAU,IAAS,CAAC;IAC7B,KAAK,CAAC,KAAU,IAAS,CAAC;CAC3B;AAHD,sCAGC;AAMD,MAAa,mBAAmB;IAK9B,YAAY,SAA2B,IAAI,aAAa,EAAE;QAJ1D,WAAM,GAAqH,EAAE,CAAC;QAC9H,WAAM,GAAsC,QAAQ,CAAC;QAInD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAED,QAAQ,CAAC,GAAG,IAA8C;QACxD,QAAQ,IAAI,CAAC,MAAM,EAAE;YACnB,KAAK,SAAS;gBACZ,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC;gBAC/B,MAAM;YACR,KAAK,QAAQ;gBACX,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC;gBACrC,MAAM;YACR;gBACE,MAAM;SACT;IACH,CAAC;IAED,KAAK,CAAC,GAAG,IAA2C;QAClD,QAAQ,IAAI,CAAC,MAAM,EAAE;YACnB,KAAK,SAAS;gBACZ,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;gBAC5B,MAAM;YACR,KAAK,QAAQ;gBACX,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;gBAClC,MAAM;YACR;gBACE,MAAM;SACT;IACH,CAAC;IAED,MAAM;QACJ,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACxB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,KAAK,MAAM,KAAK,IAAI,KAAK,EAAE;YACzB,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,UAAU;gBAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACxD,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,OAAO;gBAAE,IAAI,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;SACnD;IACH,CAAC;IAED,OAAO;QACL,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;IACnB,CAAC;IAED,KAAK;QACH,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC;IACzB,CAAC;CACF;AArDD,kDAqDC"}
package/lib/setup-logger-and-telemetry.js CHANGED
@@ -30,23 +30,38 @@ class MultiSet {
30
30
  function setupLoggerAndTelemetry(bus, log, analytics, userTraits, mongosh_version) {
31
31
  const { logId } = log;
32
32
  let userId;
33
+ let telemetryAnonymousId;
34
+ const getTelemetryUserIdentity = () => {
35
+ if (telemetryAnonymousId) {
36
+ return {
37
+ anonymousId: telemetryAnonymousId
38
+ };
39
+ }
40
+ return { userId };
41
+ };
33
42
  let hasStartedMongoshRepl = false;
34
43
  bus.on('mongosh:start-mongosh-repl', (ev) => {
35
- log.info('MONGOSH', mongodb_log_writer_1.mongoLogId(1000000002), 'repl', 'Started REPL', ev);
44
+ log.info('MONGOSH', (0, mongodb_log_writer_1.mongoLogId)(1000000002), 'repl', 'Started REPL', ev);
36
45
  hasStartedMongoshRepl = true;
37
46
  });
38
47
  let usesShellOption = false;
39
48
  bus.on('mongosh:start-loading-cli-scripts', (event) => {
40
- log.info('MONGOSH', mongodb_log_writer_1.mongoLogId(1000000003), 'repl', 'Start loading CLI scripts');
49
+ log.info('MONGOSH', (0, mongodb_log_writer_1.mongoLogId)(1000000003), 'repl', 'Start loading CLI scripts');
41
50
  usesShellOption = event.usesShellOption;
42
51
  });
43
52
  bus.on('mongosh:connect', function (args) {
44
- const connectionUri = history_1.redactURICredentials(args.uri);
53
+ const connectionUri = (0, history_1.redactURICredentials)(args.uri);
45
54
  const { uri: _uri, ...argsWithoutUri } = args;
46
- const params = { session_id: logId, userId, connectionUri, ...argsWithoutUri };
47
- log.info('MONGOSH', mongodb_log_writer_1.mongoLogId(1000000004), 'connect', 'Connecting to server', params);
48
- analytics.track({
55
+ const params = {
56
+ session_id: logId,
49
57
  userId,
58
+ telemetryAnonymousId,
59
+ connectionUri,
60
+ ...argsWithoutUri
61
+ };
62
+ log.info('MONGOSH', (0, mongodb_log_writer_1.mongoLogId)(1000000004), 'connect', 'Connecting to server', params);
63
+ analytics.track({
64
+ ...getTelemetryUserIdentity(),
50
65
  event: 'New Connection',
51
66
  properties: {
52
67
  mongosh_version,
@@ -55,25 +70,43 @@ function setupLoggerAndTelemetry(bus, log, analytics, userTraits, mongosh_versio
55
70
  }
56
71
  });
57
72
  });
58
- bus.on('mongosh:new-user', function (id) {
59
- userId = id;
60
- analytics.identify({ userId, traits: userTraits });
73
+ bus.on('mongosh:new-user', function (newTelemetryUserIdentity) {
74
+ if (!newTelemetryUserIdentity.anonymousId) {
75
+ userId = newTelemetryUserIdentity.userId;
76
+ }
77
+ telemetryAnonymousId = newTelemetryUserIdentity.anonymousId;
78
+ analytics.identify({
79
+ anonymousId: newTelemetryUserIdentity.anonymousId,
80
+ traits: userTraits
81
+ });
61
82
  });
62
- bus.on('mongosh:update-user', function (id) {
63
- userId = id;
64
- analytics.identify({ userId, traits: userTraits });
65
- log.info('MONGOSH', mongodb_log_writer_1.mongoLogId(1000000005), 'config', 'User updated');
83
+ bus.on('mongosh:update-user', function (updatedTelemetryUserIdentity) {
84
+ if (updatedTelemetryUserIdentity.anonymousId) {
85
+ telemetryAnonymousId = updatedTelemetryUserIdentity.anonymousId;
86
+ analytics.identify({
87
+ anonymousId: updatedTelemetryUserIdentity.anonymousId,
88
+ traits: userTraits
89
+ });
90
+ }
91
+ else {
92
+ userId = updatedTelemetryUserIdentity.userId;
93
+ analytics.identify({
94
+ userId: updatedTelemetryUserIdentity.userId,
95
+ traits: userTraits
96
+ });
97
+ }
98
+ log.info('MONGOSH', (0, mongodb_log_writer_1.mongoLogId)(1000000005), 'config', 'User updated');
66
99
  });
67
100
  bus.on('mongosh:error', function (error, context) {
68
101
  if (context === 'fatal') {
69
- log.fatal('MONGOSH', mongodb_log_writer_1.mongoLogId(1000000006), context, `${error.name}: ${error.message}`, error);
102
+ log.fatal('MONGOSH', (0, mongodb_log_writer_1.mongoLogId)(1000000006), context, `${error.name}: ${error.message}`, error);
70
103
  }
71
104
  else {
72
- log.error('MONGOSH', mongodb_log_writer_1.mongoLogId(1000000006), context, `${error.name}: ${error.message}`, error);
105
+ log.error('MONGOSH', (0, mongodb_log_writer_1.mongoLogId)(1000000006), context, `${error.name}: ${error.message}`, error);
73
106
  }
74
107
  if (error.name.includes('Mongosh')) {
75
108
  analytics.track({
76
- userId,
109
+ ...getTelemetryUserIdentity(),
77
110
  event: 'Error',
78
111
  properties: {
79
112
  mongosh_version,
@@ -86,15 +119,15 @@ function setupLoggerAndTelemetry(bus, log, analytics, userTraits, mongosh_versio
86
119
  }
87
120
  });
88
121
  bus.on('mongosh:globalconfig-load', function (args) {
89
- log.info('MONGOSH', mongodb_log_writer_1.mongoLogId(1000000048), 'config', 'Loading global configuration file', args);
122
+ log.info('MONGOSH', (0, mongodb_log_writer_1.mongoLogId)(1000000048), 'config', 'Loading global configuration file', args);
90
123
  });
91
124
  bus.on('mongosh:evaluate-input', function (args) {
92
- log.info('MONGOSH', mongodb_log_writer_1.mongoLogId(1000000007), 'repl', 'Evaluating input', args);
125
+ log.info('MONGOSH', (0, mongodb_log_writer_1.mongoLogId)(1000000007), 'repl', 'Evaluating input', args);
93
126
  });
94
127
  bus.on('mongosh:use', function (args) {
95
- log.info('MONGOSH', mongodb_log_writer_1.mongoLogId(1000000008), 'shell-api', 'Used "use" command', args);
128
+ log.info('MONGOSH', (0, mongodb_log_writer_1.mongoLogId)(1000000008), 'shell-api', 'Used "use" command', args);
96
129
  analytics.track({
97
- userId,
130
+ ...getTelemetryUserIdentity(),
98
131
  event: 'Use',
99
132
  properties: {
100
133
  mongosh_version
@@ -102,9 +135,9 @@ function setupLoggerAndTelemetry(bus, log, analytics, userTraits, mongosh_versio
102
135
  });
103
136
  });
104
137
  bus.on('mongosh:show', function (args) {
105
- log.info('MONGOSH', mongodb_log_writer_1.mongoLogId(1000000009), 'shell-api', 'Used "show" command', args);
138
+ log.info('MONGOSH', (0, mongodb_log_writer_1.mongoLogId)(1000000009), 'shell-api', 'Used "show" command', args);
106
139
  analytics.track({
107
- userId,
140
+ ...getTelemetryUserIdentity(),
108
141
  event: 'Show',
109
142
  properties: {
110
143
  mongosh_version,
@@ -113,7 +146,7 @@ function setupLoggerAndTelemetry(bus, log, analytics, userTraits, mongosh_versio
113
146
  });
114
147
  });
115
148
  bus.on('mongosh:setCtx', function (args) {
116
- log.info('MONGOSH', mongodb_log_writer_1.mongoLogId(1000000010), 'shell-api', 'Initialized context', args);
149
+ log.info('MONGOSH', (0, mongodb_log_writer_1.mongoLogId)(1000000010), 'shell-api', 'Initialized context', args);
117
150
  });
118
151
  bus.on('mongosh:api-call-with-arguments', function (args) {
119
152
  let arg;
@@ -121,14 +154,14 @@ function setupLoggerAndTelemetry(bus, log, analytics, userTraits, mongosh_versio
121
154
  arg = JSON.parse(JSON.stringify(args));
122
155
  }
123
156
  catch (_a) {
124
- arg = { _inspected: util_1.inspect(args) };
157
+ arg = { _inspected: (0, util_1.inspect)(args) };
125
158
  }
126
- log.info('MONGOSH', mongodb_log_writer_1.mongoLogId(1000000011), 'shell-api', 'Performed API call', mongodb_redact_1.default(arg));
159
+ log.info('MONGOSH', (0, mongodb_log_writer_1.mongoLogId)(1000000011), 'shell-api', 'Performed API call', (0, mongodb_redact_1.default)(arg));
127
160
  });
128
161
  bus.on('mongosh:api-load-file', function (args) {
129
- log.info('MONGOSH', mongodb_log_writer_1.mongoLogId(1000000012), 'shell-api', 'Loading file via load()', args);
162
+ log.info('MONGOSH', (0, mongodb_log_writer_1.mongoLogId)(1000000012), 'shell-api', 'Loading file via load()', args);
130
163
  analytics.track({
131
- userId,
164
+ ...getTelemetryUserIdentity(),
132
165
  event: hasStartedMongoshRepl ? 'Script Loaded' : 'Script Loaded CLI',
133
166
  properties: {
134
167
  mongosh_version,
@@ -138,9 +171,9 @@ function setupLoggerAndTelemetry(bus, log, analytics, userTraits, mongosh_versio
138
171
  });
139
172
  });
140
173
  bus.on('mongosh:eval-cli-script', function () {
141
- log.info('MONGOSH', mongodb_log_writer_1.mongoLogId(1000000013), 'repl', 'Evaluating script passed on the command line');
174
+ log.info('MONGOSH', (0, mongodb_log_writer_1.mongoLogId)(1000000013), 'repl', 'Evaluating script passed on the command line');
142
175
  analytics.track({
143
- userId,
176
+ ...getTelemetryUserIdentity(),
144
177
  event: 'Script Evaluated',
145
178
  properties: {
146
179
  mongosh_version,
@@ -149,9 +182,9 @@ function setupLoggerAndTelemetry(bus, log, analytics, userTraits, mongosh_versio
149
182
  });
150
183
  });
151
184
  bus.on('mongosh:mongoshrc-load', function () {
152
- log.info('MONGOSH', mongodb_log_writer_1.mongoLogId(1000000014), 'repl', 'Loading .mongoshrc.js');
185
+ log.info('MONGOSH', (0, mongodb_log_writer_1.mongoLogId)(1000000014), 'repl', 'Loading .mongoshrc.js');
153
186
  analytics.track({
154
- userId,
187
+ ...getTelemetryUserIdentity(),
155
188
  event: 'Mongoshrc Loaded',
156
189
  properties: {
157
190
  mongosh_version
@@ -159,69 +192,65 @@ function setupLoggerAndTelemetry(bus, log, analytics, userTraits, mongosh_versio
159
192
  });
160
193
  });
161
194
  bus.on('mongosh:mongoshrc-mongorc-warn', function () {
162
- log.info('MONGOSH', mongodb_log_writer_1.mongoLogId(1000000015), 'repl', 'Warning about .mongorc.js/.mongoshrc.js mismatch');
195
+ log.info('MONGOSH', (0, mongodb_log_writer_1.mongoLogId)(1000000015), 'repl', 'Warning about .mongorc.js/.mongoshrc.js mismatch');
163
196
  analytics.track({
164
- userId,
197
+ ...getTelemetryUserIdentity(),
165
198
  event: 'Mongorc Warning',
166
199
  properties: {
167
200
  mongosh_version
168
201
  }
169
202
  });
170
203
  });
171
- bus.on('mongosh:mongocryptd-tryspawn', function (ev) {
172
- log.info('MONGOCRYPTD', mongodb_log_writer_1.mongoLogId(1000000016), 'mongocryptd', 'Trying to spawn mongocryptd', ev);
204
+ bus.on('mongosh:csfle-load-skip', function (ev) {
205
+ log.info('CSFLE', (0, mongodb_log_writer_1.mongoLogId)(1000000050), 'csfle', 'Skipping shared library candidate', ev);
173
206
  });
174
- bus.on('mongosh:mongocryptd-error', function (ev) {
175
- var _a;
176
- log.warn('MONGOCRYPTD', mongodb_log_writer_1.mongoLogId(1000000017), 'mongocryptd', 'Error running mongocryptd', {
177
- ...ev,
178
- error: (_a = ev.error) === null || _a === void 0 ? void 0 : _a.message
207
+ bus.on('mongosh:csfle-load-found', function (ev) {
208
+ log.warn('CSFLE', (0, mongodb_log_writer_1.mongoLogId)(1000000051), 'csfle', 'Accepted shared library candidate', {
209
+ csflePath: ev.csflePath,
210
+ expectedVersion: ev.expectedVersion.versionStr
179
211
  });
180
212
  });
181
- bus.on('mongosh:mongocryptd-log', function (ev) {
182
- log.info('MONGOCRYPTD', mongodb_log_writer_1.mongoLogId(1000000018), 'mongocryptd', 'mongocryptd log message', ev);
183
- });
184
213
  bus.on('mongosh-snippets:loaded', function (ev) {
185
- log.info('MONGOSH-SNIPPETS', mongodb_log_writer_1.mongoLogId(1000000019), 'snippets', 'Loaded snippets', ev);
214
+ log.info('MONGOSH-SNIPPETS', (0, mongodb_log_writer_1.mongoLogId)(1000000019), 'snippets', 'Loaded snippets', ev);
186
215
  });
187
216
  bus.on('mongosh-snippets:npm-lookup', function (ev) {
188
- log.info('MONGOSH-SNIPPETS', mongodb_log_writer_1.mongoLogId(1000000020), 'snippets', 'Performing npm lookup', ev);
217
+ log.info('MONGOSH-SNIPPETS', (0, mongodb_log_writer_1.mongoLogId)(1000000020), 'snippets', 'Performing npm lookup', ev);
189
218
  });
190
219
  bus.on('mongosh-snippets:npm-lookup-stopped', function () {
191
- log.info('MONGOSH-SNIPPETS', mongodb_log_writer_1.mongoLogId(1000000021), 'snippets', 'npm lookup stopped');
220
+ log.info('MONGOSH-SNIPPETS', (0, mongodb_log_writer_1.mongoLogId)(1000000021), 'snippets', 'npm lookup stopped');
192
221
  });
193
222
  bus.on('mongosh-snippets:npm-download-failed', function (ev) {
194
- log.info('MONGOSH-SNIPPETS', mongodb_log_writer_1.mongoLogId(1000000022), 'snippets', 'npm download failed', ev);
223
+ log.info('MONGOSH-SNIPPETS', (0, mongodb_log_writer_1.mongoLogId)(1000000022), 'snippets', 'npm download failed', ev);
195
224
  });
196
225
  bus.on('mongosh-snippets:npm-download-active', function (ev) {
197
- log.info('MONGOSH-SNIPPETS', mongodb_log_writer_1.mongoLogId(1000000023), 'snippets', 'npm download active', ev);
226
+ log.info('MONGOSH-SNIPPETS', (0, mongodb_log_writer_1.mongoLogId)(1000000023), 'snippets', 'npm download active', ev);
198
227
  });
199
228
  bus.on('mongosh-snippets:fetch-index', function (ev) {
200
- log.info('MONGOSH-SNIPPETS', mongodb_log_writer_1.mongoLogId(1000000024), 'snippets', 'Fetching snippet index', ev);
229
+ log.info('MONGOSH-SNIPPETS', (0, mongodb_log_writer_1.mongoLogId)(1000000024), 'snippets', 'Fetching snippet index', ev);
201
230
  });
202
231
  bus.on('mongosh-snippets:fetch-cache-invalid', function () {
203
- log.info('MONGOSH-SNIPPETS', mongodb_log_writer_1.mongoLogId(1000000025), 'snippets', 'Snippet cache invalid');
232
+ log.info('MONGOSH-SNIPPETS', (0, mongodb_log_writer_1.mongoLogId)(1000000025), 'snippets', 'Snippet cache invalid');
204
233
  });
205
234
  bus.on('mongosh-snippets:fetch-index-error', function (ev) {
206
- log.info('MONGOSH-SNIPPETS', mongodb_log_writer_1.mongoLogId(1000000026), 'snippets', 'Fetching snippet index failed', ev);
235
+ log.info('MONGOSH-SNIPPETS', (0, mongodb_log_writer_1.mongoLogId)(1000000026), 'snippets', 'Fetching snippet index failed', ev);
207
236
  });
208
237
  bus.on('mongosh-snippets:fetch-index-done', function () {
209
- log.info('MONGOSH-SNIPPETS', mongodb_log_writer_1.mongoLogId(1000000027), 'snippets', 'Fetching snippet index done');
238
+ log.info('MONGOSH-SNIPPETS', (0, mongodb_log_writer_1.mongoLogId)(1000000027), 'snippets', 'Fetching snippet index done');
210
239
  });
211
240
  bus.on('mongosh-snippets:package-json-edit-error', function (ev) {
212
- log.info('MONGOSH-SNIPPETS', mongodb_log_writer_1.mongoLogId(1000000028), 'snippets', 'Modifying snippets package.json failed', ev);
241
+ log.info('MONGOSH-SNIPPETS', (0, mongodb_log_writer_1.mongoLogId)(1000000028), 'snippets', 'Modifying snippets package.json failed', ev);
213
242
  });
214
243
  bus.on('mongosh-snippets:spawn-child', function (ev) {
215
- log.info('MONGOSH-SNIPPETS', mongodb_log_writer_1.mongoLogId(1000000029), 'snippets', 'Spawning helper', ev);
244
+ log.info('MONGOSH-SNIPPETS', (0, mongodb_log_writer_1.mongoLogId)(1000000029), 'snippets', 'Spawning helper', ev);
216
245
  });
217
246
  bus.on('mongosh-snippets:load-snippet', function (ev) {
218
- log.info('MONGOSH-SNIPPETS', mongodb_log_writer_1.mongoLogId(1000000030), 'snippets', 'Loading snippet', ev);
247
+ log.info('MONGOSH-SNIPPETS', (0, mongodb_log_writer_1.mongoLogId)(1000000030), 'snippets', 'Loading snippet', ev);
219
248
  });
220
249
  bus.on('mongosh-snippets:snippet-command', function (ev) {
221
- log.info('MONGOSH-SNIPPETS', mongodb_log_writer_1.mongoLogId(1000000031), 'snippets', 'Running snippet command', ev);
250
+ log.info('MONGOSH-SNIPPETS', (0, mongodb_log_writer_1.mongoLogId)(1000000031), 'snippets', 'Running snippet command', ev);
222
251
  if (ev.args[0] === 'install') {
223
252
  analytics.track({
224
- userId,
253
+ ...getTelemetryUserIdentity(),
225
254
  event: 'Snippet Install',
226
255
  properties: {
227
256
  mongosh_version
@@ -230,7 +259,7 @@ function setupLoggerAndTelemetry(bus, log, analytics, userTraits, mongosh_versio
230
259
  }
231
260
  });
232
261
  bus.on('mongosh-snippets:transform-error', function (ev) {
233
- log.info('MONGOSH-SNIPPETS', mongodb_log_writer_1.mongoLogId(1000000032), 'snippets', 'Rewrote error message', ev);
262
+ log.info('MONGOSH-SNIPPETS', (0, mongodb_log_writer_1.mongoLogId)(1000000032), 'snippets', 'Rewrote error message', ev);
234
263
  });
235
264
  const deprecatedApiCalls = new MultiSet();
236
265
  const apiCalls = new MultiSet();
@@ -248,9 +277,9 @@ function setupLoggerAndTelemetry(bus, log, analytics, userTraits, mongosh_versio
248
277
  });
249
278
  bus.on('mongosh:evaluate-finished', function () {
250
279
  for (const [entry] of deprecatedApiCalls) {
251
- log.warn('MONGOSH', mongodb_log_writer_1.mongoLogId(1000000033), 'shell-api', 'Deprecated API call', entry);
280
+ log.warn('MONGOSH', (0, mongodb_log_writer_1.mongoLogId)(1000000033), 'shell-api', 'Deprecated API call', entry);
252
281
  analytics.track({
253
- userId,
282
+ ...getTelemetryUserIdentity(),
254
283
  event: 'Deprecated Method',
255
284
  properties: {
256
285
  mongosh_version,
@@ -260,7 +289,7 @@ function setupLoggerAndTelemetry(bus, log, analytics, userTraits, mongosh_versio
260
289
  }
261
290
  for (const [entry, count] of apiCalls) {
262
291
  analytics.track({
263
- userId,
292
+ ...getTelemetryUserIdentity(),
264
293
  event: 'API Call',
265
294
  properties: {
266
295
  mongosh_version,
@@ -272,18 +301,18 @@ function setupLoggerAndTelemetry(bus, log, analytics, userTraits, mongosh_versio
272
301
  deprecatedApiCalls.clear();
273
302
  apiCalls.clear();
274
303
  });
275
- devtools_connect_1.hookLogger(bus, log, 'mongosh', history_1.redactURICredentials);
304
+ (0, devtools_connect_1.hookLogger)(bus, log, 'mongosh', history_1.redactURICredentials);
276
305
  bus.on('mongosh-sp:reset-connection-options', function () {
277
- log.info('MONGOSH-SP', mongodb_log_writer_1.mongoLogId(1000000040), 'connect', 'Reconnect because of changed connection options');
306
+ log.info('MONGOSH-SP', (0, mongodb_log_writer_1.mongoLogId)(1000000040), 'connect', 'Reconnect because of changed connection options');
278
307
  });
279
308
  bus.on('mongosh-editor:run-edit-command', function (ev) {
280
- log.error('MONGOSH-EDITOR', mongodb_log_writer_1.mongoLogId(1000000047), 'editor', 'Open external editor', mongodb_redact_1.default(ev));
309
+ log.error('MONGOSH-EDITOR', (0, mongodb_log_writer_1.mongoLogId)(1000000047), 'editor', 'Open external editor', (0, mongodb_redact_1.default)(ev));
281
310
  });
282
311
  bus.on('mongosh-editor:read-vscode-extensions-done', function (ev) {
283
- log.error('MONGOSH-EDITOR', mongodb_log_writer_1.mongoLogId(1000000043), 'editor', 'Reading vscode extensions from file system succeeded', ev);
312
+ log.error('MONGOSH-EDITOR', (0, mongodb_log_writer_1.mongoLogId)(1000000043), 'editor', 'Reading vscode extensions from file system succeeded', ev);
284
313
  });
285
314
  bus.on('mongosh-editor:read-vscode-extensions-failed', function (ev) {
286
- log.error('MONGOSH-EDITOR', mongodb_log_writer_1.mongoLogId(1000000044), 'editor', 'Reading vscode extensions from file system failed', {
315
+ log.error('MONGOSH-EDITOR', (0, mongodb_log_writer_1.mongoLogId)(1000000044), 'editor', 'Reading vscode extensions from file system failed', {
287
316
  ...ev,
288
317
  error: ev.error.message
289
318
  });
package/lib/setup-logger-and-telemetry.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"setup-logger-and-telemetry.js","sourceRoot":"","sources":["../src/setup-logger-and-telemetry.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"setup-logger-and-telemetry.js","sourceRoot":"","sources":["../src/setup-logger-and-telemetry.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mongosh/logging",
3
- "version": "1.2.3",
3
+ "version": "1.4.1",
4
4
  "description": "MongoDB Shell Logging Utilities Package",
5
5
  "homepage": "https://github.com/mongodb-js/mongosh",
6
6
  "license": "Apache-2.0",
@@ -17,10 +17,10 @@
17
17
  "node": ">=12.4.0"
18
18
  },
19
19
  "dependencies": {
20
- "@mongodb-js/devtools-connect": "^1.2.4",
21
- "@mongosh/errors": "1.2.3",
22
- "@mongosh/history": "1.2.3",
23
- "@mongosh/types": "1.2.3",
20
+ "@mongodb-js/devtools-connect": "^1.4.2",
21
+ "@mongosh/errors": "1.4.1",
22
+ "@mongosh/history": "1.4.1",
23
+ "@mongosh/types": "1.4.1",
24
24
  "mongodb-log-writer": "^1.1.3",
25
25
  "mongodb-redact": "^0.2.2"
26
26
  },
@@ -35,5 +35,5 @@
35
35
  "mongosh": {
36
36
  "unitTestsOnly": true
37
37
  },
38
- "gitHead": "b715268260871b62ac628cef3eb1009203a91264"
38
+ "gitHead": "4e88ce238c93af5f2eb5ad9f9e3a2ac5ef1eb2e0"
39
39
  }
package/src/analytics-helpers.ts CHANGED
@@ -1,14 +1,18 @@
1
+ export type MongoshAnalyticsIdentity = {
2
+ userId: string;
3
+ } | {
4
+ anonymousId: string;
5
+ };
6
+
1
7
  /**
2
8
  * General interface for an Analytics provider that mongosh can use.
3
9
  */
4
10
  export interface MongoshAnalytics {
5
- identify(message: {
6
- userId: string,
11
+ identify(message: MongoshAnalyticsIdentity & {
7
12
  traits: { platform: string }
8
13
  }): void;
9
14
 
10
- track(message: {
11
- userId: string,
15
+ track(message: MongoshAnalyticsIdentity & {
12
16
  event: string,
13
17
  properties: {
14
18
  // eslint-disable-next-line camelcase
package/src/setup-logger-and-telemetry.spec.ts CHANGED
@@ -36,9 +36,8 @@ describe('setupLoggerAndTelemetry', () => {
36
36
  expect(logOutput).to.have.lengthOf(0);
37
37
  expect(analyticsOutput).to.be.empty;
38
38
 
39
- bus.emit('mongosh:new-user', userId);
40
-
41
- bus.emit('mongosh:update-user', userId);
39
+ bus.emit('mongosh:new-user', { userId, anonymousId: userId });
40
+ bus.emit('mongosh:update-user', { userId, anonymousId: userId });
42
41
  bus.emit('mongosh:connect', {
43
42
  uri: 'mongodb://localhost/',
44
43
  is_localhost: true,
@@ -69,9 +68,8 @@ describe('setupLoggerAndTelemetry', () => {
69
68
  bus.emit('mongosh:eval-cli-script');
70
69
  bus.emit('mongosh:globalconfig-load', { filename: '/etc/mongosh.conf', found: true });
71
70
 
72
- bus.emit('mongosh:mongocryptd-tryspawn', { spawnPath: ['mongocryptd'], path: 'path' });
73
- bus.emit('mongosh:mongocryptd-error', { cause: 'something', error: new Error('mongocryptd error!'), stderr: 'stderr', pid: 12345 });
74
- bus.emit('mongosh:mongocryptd-log', { pid: 12345, logEntry: {} });
71
+ bus.emit('mongosh:csfle-load-skip', { csflePath: 'path', reason: 'reason' });
72
+ bus.emit('mongosh:csfle-load-found', { csflePath: 'path', expectedVersion: { versionStr: 'someversion' } });
75
73
 
76
74
  bus.emit('mongosh-snippets:loaded', { installdir: '/' });
77
75
  bus.emit('mongosh-snippets:npm-lookup', { existingVersion: 'v1.2.3' });
@@ -98,7 +96,7 @@ describe('setupLoggerAndTelemetry', () => {
98
96
  bus.emit('devtools-connect:connect-heartbeat-failure', { connectionId: 'localhost', failure: new Error('cause'), isFailFast: true, isKnownServer: true });
99
97
  bus.emit('devtools-connect:connect-heartbeat-succeeded', { connectionId: 'localhost' });
100
98
  bus.emit('devtools-connect:connect-fail-early');
101
- bus.emit('devtools-connect:connect-attempt-finished');
99
+ bus.emit('devtools-connect:connect-attempt-finished', {});
102
100
  bus.emit('devtools-connect:resolve-srv-error', {
103
101
  from: 'mongodb+srv://foo:bar@hello.world/',
104
102
  error: new Error('failed'),
@@ -121,7 +119,7 @@ describe('setupLoggerAndTelemetry', () => {
121
119
  expect(logOutput[i++].msg).to.equal('User updated');
122
120
  expect(logOutput[i].msg).to.equal('Connecting to server');
123
121
  expect(logOutput[i].attr.session_id).to.equal('5fb3c20ee1507e894e5340f3');
124
- expect(logOutput[i].attr.userId).to.equal('53defe995fa47e6c13102d9d');
122
+ expect(logOutput[i].attr.telemetryAnonymousId).to.equal('53defe995fa47e6c13102d9d');
125
123
  expect(logOutput[i].attr.connectionUri).to.equal('mongodb://localhost/');
126
124
  expect(logOutput[i].attr.is_localhost).to.equal(true);
127
125
  expect(logOutput[i].attr.is_atlas).to.equal(false);
@@ -156,12 +154,10 @@ describe('setupLoggerAndTelemetry', () => {
156
154
  expect(logOutput[i++].msg).to.equal('Evaluating script passed on the command line');
157
155
  expect(logOutput[i].msg).to.equal('Loading global configuration file');
158
156
  expect(logOutput[i++].attr.filename).to.equal('/etc/mongosh.conf');
159
- expect(logOutput[i].msg).to.equal('Trying to spawn mongocryptd');
160
- expect(logOutput[i++].attr).to.deep.equal({ spawnPath: ['mongocryptd'], path: 'path' });
161
- expect(logOutput[i].msg).to.equal('Error running mongocryptd');
162
- expect(logOutput[i++].attr).to.deep.equal({ cause: 'something', error: 'mongocryptd error!', stderr: 'stderr', pid: 12345 });
163
- expect(logOutput[i].msg).to.equal('mongocryptd log message');
164
- expect(logOutput[i++].attr).to.deep.equal({ pid: 12345, logEntry: {} });
157
+ expect(logOutput[i].msg).to.equal('Skipping shared library candidate');
158
+ expect(logOutput[i++].attr).to.deep.equal({ csflePath: 'path', reason: 'reason' });
159
+ expect(logOutput[i].msg).to.equal('Accepted shared library candidate');
160
+ expect(logOutput[i++].attr).to.deep.equal({ csflePath: 'path', expectedVersion: 'someversion' });
165
161
  expect(logOutput[i].msg).to.equal('Loaded snippets');
166
162
  expect(logOutput[i++].attr).to.deep.equal({ installdir: '/' });
167
163
  expect(logOutput[i].msg).to.equal('Performing npm lookup');
@@ -215,7 +211,7 @@ describe('setupLoggerAndTelemetry', () => {
215
211
  [
216
212
  'identify',
217
213
  {
218
- userId: '53defe995fa47e6c13102d9d',
214
+ anonymousId: '53defe995fa47e6c13102d9d',
219
215
  traits: {
220
216
  platform: process.platform,
221
217
  arch: process.arch
@@ -225,7 +221,7 @@ describe('setupLoggerAndTelemetry', () => {
225
221
  [
226
222
  'identify',
227
223
  {
228
- userId: '53defe995fa47e6c13102d9d',
224
+ anonymousId: '53defe995fa47e6c13102d9d',
229
225
  traits: {
230
226
  platform: process.platform,
231
227
  arch: process.arch
@@ -235,7 +231,7 @@ describe('setupLoggerAndTelemetry', () => {
235
231
  [
236
232
  'track',
237
233
  {
238
- userId: '53defe995fa47e6c13102d9d',
234
+ anonymousId: '53defe995fa47e6c13102d9d',
239
235
  event: 'New Connection',
240
236
  properties: {
241
237
  mongosh_version: '1.0.0',
@@ -249,7 +245,7 @@ describe('setupLoggerAndTelemetry', () => {
249
245
  [
250
246
  'track',
251
247
  {
252
- userId: '53defe995fa47e6c13102d9d',
248
+ anonymousId: '53defe995fa47e6c13102d9d',
253
249
  event: 'Error',
254
250
  properties: {
255
251
  mongosh_version: '1.0.0',
@@ -263,7 +259,7 @@ describe('setupLoggerAndTelemetry', () => {
263
259
  [
264
260
  'track',
265
261
  {
266
- userId: '53defe995fa47e6c13102d9d',
262
+ anonymousId: '53defe995fa47e6c13102d9d',
267
263
  event: 'Error',
268
264
  properties: {
269
265
  mongosh_version: '1.0.0',
@@ -277,7 +273,7 @@ describe('setupLoggerAndTelemetry', () => {
277
273
  [
278
274
  'track',
279
275
  {
280
- userId: '53defe995fa47e6c13102d9d',
276
+ anonymousId: '53defe995fa47e6c13102d9d',
281
277
  event: 'Use',
282
278
  properties: { mongosh_version: '1.0.0' }
283
279
  }
@@ -285,7 +281,7 @@ describe('setupLoggerAndTelemetry', () => {
285
281
  [
286
282
  'track',
287
283
  {
288
- userId: '53defe995fa47e6c13102d9d',
284
+ anonymousId: '53defe995fa47e6c13102d9d',
289
285
  event: 'Show',
290
286
  properties: {
291
287
  mongosh_version: '1.0.0',
@@ -302,7 +298,7 @@ describe('setupLoggerAndTelemetry', () => {
302
298
  nested: true,
303
299
  shell: true
304
300
  },
305
- userId: '53defe995fa47e6c13102d9d'
301
+ anonymousId: '53defe995fa47e6c13102d9d'
306
302
  }
307
303
  ],
308
304
  [
@@ -313,7 +309,7 @@ describe('setupLoggerAndTelemetry', () => {
313
309
  mongosh_version: '1.0.0',
314
310
  nested: false
315
311
  },
316
- userId: '53defe995fa47e6c13102d9d'
312
+ anonymousId: '53defe995fa47e6c13102d9d'
317
313
  }
318
314
  ],
319
315
  [
@@ -323,7 +319,7 @@ describe('setupLoggerAndTelemetry', () => {
323
319
  properties: {
324
320
  mongosh_version: '1.0.0',
325
321
  },
326
- userId: '53defe995fa47e6c13102d9d'
322
+ anonymousId: '53defe995fa47e6c13102d9d'
327
323
  }
328
324
  ],
329
325
  [
@@ -333,7 +329,7 @@ describe('setupLoggerAndTelemetry', () => {
333
329
  properties: {
334
330
  mongosh_version: '1.0.0',
335
331
  },
336
- userId: '53defe995fa47e6c13102d9d'
332
+ anonymousId: '53defe995fa47e6c13102d9d'
337
333
  }
338
334
  ],
339
335
  [
@@ -344,13 +340,13 @@ describe('setupLoggerAndTelemetry', () => {
344
340
  mongosh_version: '1.0.0',
345
341
  shell: true
346
342
  },
347
- userId: '53defe995fa47e6c13102d9d'
343
+ anonymousId: '53defe995fa47e6c13102d9d'
348
344
  }
349
345
  ],
350
346
  [
351
347
  'track',
352
348
  {
353
- userId: '53defe995fa47e6c13102d9d',
349
+ anonymousId: '53defe995fa47e6c13102d9d',
354
350
  event: 'Snippet Install',
355
351
  properties: {
356
352
  mongosh_version: '1.0.0'
@@ -365,7 +361,7 @@ describe('setupLoggerAndTelemetry', () => {
365
361
  expect(logOutput).to.have.lengthOf(0);
366
362
  expect(analyticsOutput).to.be.empty;
367
363
 
368
- bus.emit('mongosh:new-user', userId);
364
+ bus.emit('mongosh:new-user', { userId, anonymousId: userId });
369
365
 
370
366
  logOutput = [];
371
367
  analyticsOutput = [];
@@ -394,7 +390,7 @@ describe('setupLoggerAndTelemetry', () => {
394
390
  [
395
391
  'track',
396
392
  {
397
- userId: '53defe995fa47e6c13102d9d',
393
+ anonymousId: '53defe995fa47e6c13102d9d',
398
394
  event: 'Deprecated Method',
399
395
  properties: {
400
396
  mongosh_version: '1.0.0',
@@ -406,7 +402,7 @@ describe('setupLoggerAndTelemetry', () => {
406
402
  [
407
403
  'track',
408
404
  {
409
- userId: '53defe995fa47e6c13102d9d',
405
+ anonymousId: '53defe995fa47e6c13102d9d',
410
406
  event: 'Deprecated Method',
411
407
  properties: {
412
408
  mongosh_version: '1.0.0',
@@ -418,7 +414,7 @@ describe('setupLoggerAndTelemetry', () => {
418
414
  [
419
415
  'track',
420
416
  {
421
- userId: '53defe995fa47e6c13102d9d',
417
+ anonymousId: '53defe995fa47e6c13102d9d',
422
418
  event: 'Deprecated Method',
423
419
  properties: {
424
420
  mongosh_version: '1.0.0',
@@ -430,7 +426,7 @@ describe('setupLoggerAndTelemetry', () => {
430
426
  [
431
427
  'track',
432
428
  {
433
- userId: '53defe995fa47e6c13102d9d',
429
+ anonymousId: '53defe995fa47e6c13102d9d',
434
430
  event: 'API Call',
435
431
  properties: {
436
432
  mongosh_version: '1.0.0',
@@ -443,7 +439,7 @@ describe('setupLoggerAndTelemetry', () => {
443
439
  [
444
440
  'track',
445
441
  {
446
- userId: '53defe995fa47e6c13102d9d',
442
+ anonymousId: '53defe995fa47e6c13102d9d',
447
443
  event: 'API Call',
448
444
  properties: {
449
445
  mongosh_version: '1.0.0',
@@ -455,7 +451,7 @@ describe('setupLoggerAndTelemetry', () => {
455
451
  ],
456
452
  ]);
457
453
 
458
- bus.emit('mongosh:new-user', userId);
454
+ bus.emit('mongosh:new-user', { userId, anonymousId: userId });
459
455
  logOutput = [];
460
456
  analyticsOutput = [];
461
457
 
package/src/setup-logger-and-telemetry.ts CHANGED
@@ -13,9 +13,8 @@ import type {
13
13
  StartLoadingCliScriptsEvent,
14
14
  StartMongoshReplEvent,
15
15
  GlobalConfigFileLoadEvent,
16
- MongocryptdTrySpawnEvent,
17
- MongocryptdLogEvent,
18
- MongocryptdErrorEvent,
16
+ CSFLELibrarySkipEvent,
17
+ CSFLELibraryFoundEvent,
19
18
  SnippetsCommandEvent,
20
19
  SnippetsErrorEvent,
21
20
  SnippetsFetchIndexErrorEvent,
@@ -73,6 +72,17 @@ export function setupLoggerAndTelemetry(
73
72
  mongosh_version: string): void {
74
73
  const { logId } = log;
75
74
  let userId: string;
75
+ let telemetryAnonymousId: string;
76
+
77
+ const getTelemetryUserIdentity = () => {
78
+ if (telemetryAnonymousId) {
79
+ return {
80
+ anonymousId: telemetryAnonymousId
81
+ };
82
+ }
83
+
84
+ return { userId };
85
+ };
76
86
 
77
87
  // We emit different analytics events for loading files and evaluating scripts
78
88
  // depending on whether we're already in the REPL or not yet. We store the
@@ -93,11 +103,17 @@ export function setupLoggerAndTelemetry(
93
103
  bus.on('mongosh:connect', function(args: ConnectEvent) {
94
104
  const connectionUri = redactURICredentials(args.uri);
95
105
  const { uri: _uri, ...argsWithoutUri } = args; // eslint-disable-line @typescript-eslint/no-unused-vars
96
- const params = { session_id: logId, userId, connectionUri, ...argsWithoutUri };
106
+ const params = {
107
+ session_id: logId,
108
+ userId,
109
+ telemetryAnonymousId,
110
+ connectionUri,
111
+ ...argsWithoutUri
112
+ };
97
113
  log.info('MONGOSH', mongoLogId(1_000_000_004), 'connect', 'Connecting to server', params);
98
114
 
99
115
  analytics.track({
100
- userId,
116
+ ...getTelemetryUserIdentity(),
101
117
  event: 'New Connection',
102
118
  properties: {
103
119
  mongosh_version,
@@ -107,14 +123,31 @@ export function setupLoggerAndTelemetry(
107
123
  });
108
124
  });
109
125
 
110
- bus.on('mongosh:new-user', function(id: string) {
111
- userId = id;
112
- analytics.identify({ userId, traits: userTraits });
126
+ bus.on('mongosh:new-user', function(newTelemetryUserIdentity: { userId: string; anonymousId: string }) {
127
+ if (!newTelemetryUserIdentity.anonymousId) {
128
+ userId = newTelemetryUserIdentity.userId;
129
+ }
130
+ telemetryAnonymousId = newTelemetryUserIdentity.anonymousId;
131
+ analytics.identify({
132
+ anonymousId: newTelemetryUserIdentity.anonymousId,
133
+ traits: userTraits
134
+ });
113
135
  });
114
136
 
115
- bus.on('mongosh:update-user', function(id: string) {
116
- userId = id;
117
- analytics.identify({ userId, traits: userTraits });
137
+ bus.on('mongosh:update-user', function(updatedTelemetryUserIdentity: { userId: string; anonymousId?: string }) {
138
+ if (updatedTelemetryUserIdentity.anonymousId) {
139
+ telemetryAnonymousId = updatedTelemetryUserIdentity.anonymousId;
140
+ analytics.identify({
141
+ anonymousId: updatedTelemetryUserIdentity.anonymousId,
142
+ traits: userTraits
143
+ });
144
+ } else {
145
+ userId = updatedTelemetryUserIdentity.userId;
146
+ analytics.identify({
147
+ userId: updatedTelemetryUserIdentity.userId,
148
+ traits: userTraits
149
+ });
150
+ }
118
151
  log.info('MONGOSH', mongoLogId(1_000_000_005), 'config', 'User updated');
119
152
  });
120
153
 
@@ -127,7 +160,7 @@ export function setupLoggerAndTelemetry(
127
160
 
128
161
  if (error.name.includes('Mongosh')) {
129
162
  analytics.track({
130
- userId,
163
+ ...getTelemetryUserIdentity(),
131
164
  event: 'Error',
132
165
  properties: {
133
166
  mongosh_version,
@@ -152,7 +185,7 @@ export function setupLoggerAndTelemetry(
152
185
  log.info('MONGOSH', mongoLogId(1_000_000_008), 'shell-api', 'Used "use" command', args);
153
186
 
154
187
  analytics.track({
155
- userId,
188
+ ...getTelemetryUserIdentity(),
156
189
  event: 'Use',
157
190
  properties: {
158
191
  mongosh_version
@@ -164,7 +197,7 @@ export function setupLoggerAndTelemetry(
164
197
  log.info('MONGOSH', mongoLogId(1_000_000_009), 'shell-api', 'Used "show" command', args);
165
198
 
166
199
  analytics.track({
167
- userId,
200
+ ...getTelemetryUserIdentity(),
168
201
  event: 'Show',
169
202
  properties: {
170
203
  mongosh_version,
@@ -192,7 +225,7 @@ export function setupLoggerAndTelemetry(
192
225
  log.info('MONGOSH', mongoLogId(1_000_000_012), 'shell-api', 'Loading file via load()', args);
193
226
 
194
227
  analytics.track({
195
- userId,
228
+ ...getTelemetryUserIdentity(),
196
229
  event: hasStartedMongoshRepl ? 'Script Loaded' : 'Script Loaded CLI',
197
230
  properties: {
198
231
  mongosh_version,
@@ -206,7 +239,7 @@ export function setupLoggerAndTelemetry(
206
239
  log.info('MONGOSH', mongoLogId(1_000_000_013), 'repl', 'Evaluating script passed on the command line');
207
240
 
208
241
  analytics.track({
209
- userId,
242
+ ...getTelemetryUserIdentity(),
210
243
  event: 'Script Evaluated',
211
244
  properties: {
212
245
  mongosh_version,
@@ -219,7 +252,7 @@ export function setupLoggerAndTelemetry(
219
252
  log.info('MONGOSH', mongoLogId(1_000_000_014), 'repl', 'Loading .mongoshrc.js');
220
253
 
221
254
  analytics.track({
222
- userId,
255
+ ...getTelemetryUserIdentity(),
223
256
  event: 'Mongoshrc Loaded',
224
257
  properties: {
225
258
  mongosh_version
@@ -231,7 +264,7 @@ export function setupLoggerAndTelemetry(
231
264
  log.info('MONGOSH', mongoLogId(1_000_000_015), 'repl', 'Warning about .mongorc.js/.mongoshrc.js mismatch');
232
265
 
233
266
  analytics.track({
234
- userId,
267
+ ...getTelemetryUserIdentity(),
235
268
  event: 'Mongorc Warning',
236
269
  properties: {
237
270
  mongosh_version
@@ -239,21 +272,17 @@ export function setupLoggerAndTelemetry(
239
272
  });
240
273
  });
241
274
 
242
- bus.on('mongosh:mongocryptd-tryspawn', function(ev: MongocryptdTrySpawnEvent) {
243
- log.info('MONGOCRYPTD', mongoLogId(1_000_000_016), 'mongocryptd', 'Trying to spawn mongocryptd', ev);
275
+ bus.on('mongosh:csfle-load-skip', function(ev: CSFLELibrarySkipEvent) {
276
+ log.info('CSFLE', mongoLogId(1_000_000_050), 'csfle', 'Skipping shared library candidate', ev);
244
277
  });
245
278
 
246
- bus.on('mongosh:mongocryptd-error', function(ev: MongocryptdErrorEvent) {
247
- log.warn('MONGOCRYPTD', mongoLogId(1_000_000_017), 'mongocryptd', 'Error running mongocryptd', {
248
- ...ev,
249
- error: ev.error?.message
279
+ bus.on('mongosh:csfle-load-found', function(ev: CSFLELibraryFoundEvent) {
280
+ log.warn('CSFLE', mongoLogId(1_000_000_051), 'csfle', 'Accepted shared library candidate', {
281
+ csflePath: ev.csflePath,
282
+ expectedVersion: ev.expectedVersion.versionStr
250
283
  });
251
284
  });
252
285
 
253
- bus.on('mongosh:mongocryptd-log', function(ev: MongocryptdLogEvent) {
254
- log.info('MONGOCRYPTD', mongoLogId(1_000_000_018), 'mongocryptd', 'mongocryptd log message', ev);
255
- });
256
-
257
286
  bus.on('mongosh-snippets:loaded', function(ev: SnippetsLoadedEvent) {
258
287
  log.info('MONGOSH-SNIPPETS', mongoLogId(1_000_000_019), 'snippets', 'Loaded snippets', ev);
259
288
  });
@@ -307,7 +336,7 @@ export function setupLoggerAndTelemetry(
307
336
 
308
337
  if (ev.args[0] === 'install') {
309
338
  analytics.track({
310
- userId,
339
+ ...getTelemetryUserIdentity(),
311
340
  event: 'Snippet Install',
312
341
  properties: {
313
342
  mongosh_version
@@ -343,7 +372,7 @@ export function setupLoggerAndTelemetry(
343
372
  log.warn('MONGOSH', mongoLogId(1_000_000_033), 'shell-api', 'Deprecated API call', entry);
344
373
 
345
374
  analytics.track({
346
- userId,
375
+ ...getTelemetryUserIdentity(),
347
376
  event: 'Deprecated Method',
348
377
  properties: {
349
378
  mongosh_version,
@@ -353,7 +382,7 @@ export function setupLoggerAndTelemetry(
353
382
  }
354
383
  for (const [entry, count] of apiCalls) {
355
384
  analytics.track({
356
- userId,
385
+ ...getTelemetryUserIdentity(),
357
386
  event: 'API Call',
358
387
  properties: {
359
388
  mongosh_version,