@mongosh/logging 1.2.1 → 1.3.0

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 (8) hide show
  1. package/lib/analytics-helpers.d.ts +7 -4
  2. package/lib/analytics-helpers.js.map +1 -1
  3. package/lib/setup-logger-and-telemetry.js +51 -18
  4. package/lib/setup-logger-and-telemetry.js.map +1 -1
  5. package/package.json +5 -5
  6. package/src/analytics-helpers.ts +8 -4
  7. package/src/setup-logger-and-telemetry.spec.ts +23 -24
  8. package/src/setup-logger-and-telemetry.ts +52 -18
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,6 +30,15 @@ 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
44
  log.info('MONGOSH', mongodb_log_writer_1.mongoLogId(1000000002), 'repl', 'Started REPL', ev);
@@ -43,10 +52,16 @@ function setupLoggerAndTelemetry(bus, log, analytics, userTraits, mongosh_versio
43
52
  bus.on('mongosh:connect', function (args) {
44
53
  const connectionUri = history_1.redactURICredentials(args.uri);
45
54
  const { uri: _uri, ...argsWithoutUri } = args;
46
- const params = { session_id: logId, userId, connectionUri, ...argsWithoutUri };
55
+ const params = {
56
+ session_id: logId,
57
+ userId,
58
+ telemetryAnonymousId,
59
+ connectionUri,
60
+ ...argsWithoutUri
61
+ };
47
62
  log.info('MONGOSH', mongodb_log_writer_1.mongoLogId(1000000004), 'connect', 'Connecting to server', params);
48
63
  analytics.track({
49
- userId,
64
+ ...getTelemetryUserIdentity(),
50
65
  event: 'New Connection',
51
66
  properties: {
52
67
  mongosh_version,
@@ -55,13 +70,31 @@ 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 });
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
+ }
65
98
  log.info('MONGOSH', mongodb_log_writer_1.mongoLogId(1000000005), 'config', 'User updated');
66
99
  });
67
100
  bus.on('mongosh:error', function (error, context) {
@@ -73,7 +106,7 @@ function setupLoggerAndTelemetry(bus, log, analytics, userTraits, mongosh_versio
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,
@@ -94,7 +127,7 @@ function setupLoggerAndTelemetry(bus, log, analytics, userTraits, mongosh_versio
94
127
  bus.on('mongosh:use', function (args) {
95
128
  log.info('MONGOSH', 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
@@ -104,7 +137,7 @@ function setupLoggerAndTelemetry(bus, log, analytics, userTraits, mongosh_versio
104
137
  bus.on('mongosh:show', function (args) {
105
138
  log.info('MONGOSH', 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,
@@ -128,7 +161,7 @@ function setupLoggerAndTelemetry(bus, log, analytics, userTraits, mongosh_versio
128
161
  bus.on('mongosh:api-load-file', function (args) {
129
162
  log.info('MONGOSH', 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,
@@ -140,7 +173,7 @@ function setupLoggerAndTelemetry(bus, log, analytics, userTraits, mongosh_versio
140
173
  bus.on('mongosh:eval-cli-script', function () {
141
174
  log.info('MONGOSH', 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,
@@ -151,7 +184,7 @@ function setupLoggerAndTelemetry(bus, log, analytics, userTraits, mongosh_versio
151
184
  bus.on('mongosh:mongoshrc-load', function () {
152
185
  log.info('MONGOSH', 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
@@ -161,7 +194,7 @@ function setupLoggerAndTelemetry(bus, log, analytics, userTraits, mongosh_versio
161
194
  bus.on('mongosh:mongoshrc-mongorc-warn', function () {
162
195
  log.info('MONGOSH', 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
@@ -221,7 +254,7 @@ function setupLoggerAndTelemetry(bus, log, analytics, userTraits, mongosh_versio
221
254
  log.info('MONGOSH-SNIPPETS', mongodb_log_writer_1.mongoLogId(1000000031), 'snippets', 'Running snippet command', ev);
222
255
  if (ev.args[0] === 'install') {
223
256
  analytics.track({
224
- userId,
257
+ ...getTelemetryUserIdentity(),
225
258
  event: 'Snippet Install',
226
259
  properties: {
227
260
  mongosh_version
@@ -250,7 +283,7 @@ function setupLoggerAndTelemetry(bus, log, analytics, userTraits, mongosh_versio
250
283
  for (const [entry] of deprecatedApiCalls) {
251
284
  log.warn('MONGOSH', mongodb_log_writer_1.mongoLogId(1000000033), 'shell-api', 'Deprecated API call', entry);
252
285
  analytics.track({
253
- userId,
286
+ ...getTelemetryUserIdentity(),
254
287
  event: 'Deprecated Method',
255
288
  properties: {
256
289
  mongosh_version,
@@ -260,7 +293,7 @@ function setupLoggerAndTelemetry(bus, log, analytics, userTraits, mongosh_versio
260
293
  }
261
294
  for (const [entry, count] of apiCalls) {
262
295
  analytics.track({
263
- userId,
296
+ ...getTelemetryUserIdentity(),
264
297
  event: 'API Call',
265
298
  properties: {
266
299
  mongosh_version,
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.1",
3
+ "version": "1.3.0",
4
4
  "description": "MongoDB Shell Logging Utilities Package",
5
5
  "homepage": "https://github.com/mongodb-js/mongosh",
6
6
  "license": "Apache-2.0",
@@ -18,9 +18,9 @@
18
18
  },
19
19
  "dependencies": {
20
20
  "@mongodb-js/devtools-connect": "^1.2.4",
21
- "@mongosh/errors": "1.2.1",
22
- "@mongosh/history": "1.2.1",
23
- "@mongosh/types": "1.2.1",
21
+ "@mongosh/errors": "1.3.0",
22
+ "@mongosh/history": "1.3.0",
23
+ "@mongosh/types": "1.3.0",
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": "62b1dff4ce48f4dd3706d4fd9ccd4582df403ee3"
38
+ "gitHead": "df88ce833d498163c966e34c815ab669d2bee50c"
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,
@@ -121,7 +120,7 @@ describe('setupLoggerAndTelemetry', () => {
121
120
  expect(logOutput[i++].msg).to.equal('User updated');
122
121
  expect(logOutput[i].msg).to.equal('Connecting to server');
123
122
  expect(logOutput[i].attr.session_id).to.equal('5fb3c20ee1507e894e5340f3');
124
- expect(logOutput[i].attr.userId).to.equal('53defe995fa47e6c13102d9d');
123
+ expect(logOutput[i].attr.telemetryAnonymousId).to.equal('53defe995fa47e6c13102d9d');
125
124
  expect(logOutput[i].attr.connectionUri).to.equal('mongodb://localhost/');
126
125
  expect(logOutput[i].attr.is_localhost).to.equal(true);
127
126
  expect(logOutput[i].attr.is_atlas).to.equal(false);
@@ -215,7 +214,7 @@ describe('setupLoggerAndTelemetry', () => {
215
214
  [
216
215
  'identify',
217
216
  {
218
- userId: '53defe995fa47e6c13102d9d',
217
+ anonymousId: '53defe995fa47e6c13102d9d',
219
218
  traits: {
220
219
  platform: process.platform,
221
220
  arch: process.arch
@@ -225,7 +224,7 @@ describe('setupLoggerAndTelemetry', () => {
225
224
  [
226
225
  'identify',
227
226
  {
228
- userId: '53defe995fa47e6c13102d9d',
227
+ anonymousId: '53defe995fa47e6c13102d9d',
229
228
  traits: {
230
229
  platform: process.platform,
231
230
  arch: process.arch
@@ -235,7 +234,7 @@ describe('setupLoggerAndTelemetry', () => {
235
234
  [
236
235
  'track',
237
236
  {
238
- userId: '53defe995fa47e6c13102d9d',
237
+ anonymousId: '53defe995fa47e6c13102d9d',
239
238
  event: 'New Connection',
240
239
  properties: {
241
240
  mongosh_version: '1.0.0',
@@ -249,7 +248,7 @@ describe('setupLoggerAndTelemetry', () => {
249
248
  [
250
249
  'track',
251
250
  {
252
- userId: '53defe995fa47e6c13102d9d',
251
+ anonymousId: '53defe995fa47e6c13102d9d',
253
252
  event: 'Error',
254
253
  properties: {
255
254
  mongosh_version: '1.0.0',
@@ -263,7 +262,7 @@ describe('setupLoggerAndTelemetry', () => {
263
262
  [
264
263
  'track',
265
264
  {
266
- userId: '53defe995fa47e6c13102d9d',
265
+ anonymousId: '53defe995fa47e6c13102d9d',
267
266
  event: 'Error',
268
267
  properties: {
269
268
  mongosh_version: '1.0.0',
@@ -277,7 +276,7 @@ describe('setupLoggerAndTelemetry', () => {
277
276
  [
278
277
  'track',
279
278
  {
280
- userId: '53defe995fa47e6c13102d9d',
279
+ anonymousId: '53defe995fa47e6c13102d9d',
281
280
  event: 'Use',
282
281
  properties: { mongosh_version: '1.0.0' }
283
282
  }
@@ -285,7 +284,7 @@ describe('setupLoggerAndTelemetry', () => {
285
284
  [
286
285
  'track',
287
286
  {
288
- userId: '53defe995fa47e6c13102d9d',
287
+ anonymousId: '53defe995fa47e6c13102d9d',
289
288
  event: 'Show',
290
289
  properties: {
291
290
  mongosh_version: '1.0.0',
@@ -302,7 +301,7 @@ describe('setupLoggerAndTelemetry', () => {
302
301
  nested: true,
303
302
  shell: true
304
303
  },
305
- userId: '53defe995fa47e6c13102d9d'
304
+ anonymousId: '53defe995fa47e6c13102d9d'
306
305
  }
307
306
  ],
308
307
  [
@@ -313,7 +312,7 @@ describe('setupLoggerAndTelemetry', () => {
313
312
  mongosh_version: '1.0.0',
314
313
  nested: false
315
314
  },
316
- userId: '53defe995fa47e6c13102d9d'
315
+ anonymousId: '53defe995fa47e6c13102d9d'
317
316
  }
318
317
  ],
319
318
  [
@@ -323,7 +322,7 @@ describe('setupLoggerAndTelemetry', () => {
323
322
  properties: {
324
323
  mongosh_version: '1.0.0',
325
324
  },
326
- userId: '53defe995fa47e6c13102d9d'
325
+ anonymousId: '53defe995fa47e6c13102d9d'
327
326
  }
328
327
  ],
329
328
  [
@@ -333,7 +332,7 @@ describe('setupLoggerAndTelemetry', () => {
333
332
  properties: {
334
333
  mongosh_version: '1.0.0',
335
334
  },
336
- userId: '53defe995fa47e6c13102d9d'
335
+ anonymousId: '53defe995fa47e6c13102d9d'
337
336
  }
338
337
  ],
339
338
  [
@@ -344,13 +343,13 @@ describe('setupLoggerAndTelemetry', () => {
344
343
  mongosh_version: '1.0.0',
345
344
  shell: true
346
345
  },
347
- userId: '53defe995fa47e6c13102d9d'
346
+ anonymousId: '53defe995fa47e6c13102d9d'
348
347
  }
349
348
  ],
350
349
  [
351
350
  'track',
352
351
  {
353
- userId: '53defe995fa47e6c13102d9d',
352
+ anonymousId: '53defe995fa47e6c13102d9d',
354
353
  event: 'Snippet Install',
355
354
  properties: {
356
355
  mongosh_version: '1.0.0'
@@ -365,7 +364,7 @@ describe('setupLoggerAndTelemetry', () => {
365
364
  expect(logOutput).to.have.lengthOf(0);
366
365
  expect(analyticsOutput).to.be.empty;
367
366
 
368
- bus.emit('mongosh:new-user', userId);
367
+ bus.emit('mongosh:new-user', { userId, anonymousId: userId });
369
368
 
370
369
  logOutput = [];
371
370
  analyticsOutput = [];
@@ -394,7 +393,7 @@ describe('setupLoggerAndTelemetry', () => {
394
393
  [
395
394
  'track',
396
395
  {
397
- userId: '53defe995fa47e6c13102d9d',
396
+ anonymousId: '53defe995fa47e6c13102d9d',
398
397
  event: 'Deprecated Method',
399
398
  properties: {
400
399
  mongosh_version: '1.0.0',
@@ -406,7 +405,7 @@ describe('setupLoggerAndTelemetry', () => {
406
405
  [
407
406
  'track',
408
407
  {
409
- userId: '53defe995fa47e6c13102d9d',
408
+ anonymousId: '53defe995fa47e6c13102d9d',
410
409
  event: 'Deprecated Method',
411
410
  properties: {
412
411
  mongosh_version: '1.0.0',
@@ -418,7 +417,7 @@ describe('setupLoggerAndTelemetry', () => {
418
417
  [
419
418
  'track',
420
419
  {
421
- userId: '53defe995fa47e6c13102d9d',
420
+ anonymousId: '53defe995fa47e6c13102d9d',
422
421
  event: 'Deprecated Method',
423
422
  properties: {
424
423
  mongosh_version: '1.0.0',
@@ -430,7 +429,7 @@ describe('setupLoggerAndTelemetry', () => {
430
429
  [
431
430
  'track',
432
431
  {
433
- userId: '53defe995fa47e6c13102d9d',
432
+ anonymousId: '53defe995fa47e6c13102d9d',
434
433
  event: 'API Call',
435
434
  properties: {
436
435
  mongosh_version: '1.0.0',
@@ -443,7 +442,7 @@ describe('setupLoggerAndTelemetry', () => {
443
442
  [
444
443
  'track',
445
444
  {
446
- userId: '53defe995fa47e6c13102d9d',
445
+ anonymousId: '53defe995fa47e6c13102d9d',
447
446
  event: 'API Call',
448
447
  properties: {
449
448
  mongosh_version: '1.0.0',
@@ -455,7 +454,7 @@ describe('setupLoggerAndTelemetry', () => {
455
454
  ],
456
455
  ]);
457
456
 
458
- bus.emit('mongosh:new-user', userId);
457
+ bus.emit('mongosh:new-user', { userId, anonymousId: userId });
459
458
  logOutput = [];
460
459
  analyticsOutput = [];
461
460
 
package/src/setup-logger-and-telemetry.ts CHANGED
@@ -73,6 +73,17 @@ export function setupLoggerAndTelemetry(
73
73
  mongosh_version: string): void {
74
74
  const { logId } = log;
75
75
  let userId: string;
76
+ let telemetryAnonymousId: string;
77
+
78
+ const getTelemetryUserIdentity = () => {
79
+ if (telemetryAnonymousId) {
80
+ return {
81
+ anonymousId: telemetryAnonymousId
82
+ };
83
+ }
84
+
85
+ return { userId };
86
+ };
76
87
 
77
88
  // We emit different analytics events for loading files and evaluating scripts
78
89
  // depending on whether we're already in the REPL or not yet. We store the
@@ -93,11 +104,17 @@ export function setupLoggerAndTelemetry(
93
104
  bus.on('mongosh:connect', function(args: ConnectEvent) {
94
105
  const connectionUri = redactURICredentials(args.uri);
95
106
  const { uri: _uri, ...argsWithoutUri } = args; // eslint-disable-line @typescript-eslint/no-unused-vars
96
- const params = { session_id: logId, userId, connectionUri, ...argsWithoutUri };
107
+ const params = {
108
+ session_id: logId,
109
+ userId,
110
+ telemetryAnonymousId,
111
+ connectionUri,
112
+ ...argsWithoutUri
113
+ };
97
114
  log.info('MONGOSH', mongoLogId(1_000_000_004), 'connect', 'Connecting to server', params);
98
115
 
99
116
  analytics.track({
100
- userId,
117
+ ...getTelemetryUserIdentity(),
101
118
  event: 'New Connection',
102
119
  properties: {
103
120
  mongosh_version,
@@ -107,14 +124,31 @@ export function setupLoggerAndTelemetry(
107
124
  });
108
125
  });
109
126
 
110
- bus.on('mongosh:new-user', function(id: string) {
111
- userId = id;
112
- analytics.identify({ userId, traits: userTraits });
127
+ bus.on('mongosh:new-user', function(newTelemetryUserIdentity: { userId: string; anonymousId: string }) {
128
+ if (!newTelemetryUserIdentity.anonymousId) {
129
+ userId = newTelemetryUserIdentity.userId;
130
+ }
131
+ telemetryAnonymousId = newTelemetryUserIdentity.anonymousId;
132
+ analytics.identify({
133
+ anonymousId: newTelemetryUserIdentity.anonymousId,
134
+ traits: userTraits
135
+ });
113
136
  });
114
137
 
115
- bus.on('mongosh:update-user', function(id: string) {
116
- userId = id;
117
- analytics.identify({ userId, traits: userTraits });
138
+ bus.on('mongosh:update-user', function(updatedTelemetryUserIdentity: { userId: string; anonymousId?: string }) {
139
+ if (updatedTelemetryUserIdentity.anonymousId) {
140
+ telemetryAnonymousId = updatedTelemetryUserIdentity.anonymousId;
141
+ analytics.identify({
142
+ anonymousId: updatedTelemetryUserIdentity.anonymousId,
143
+ traits: userTraits
144
+ });
145
+ } else {
146
+ userId = updatedTelemetryUserIdentity.userId;
147
+ analytics.identify({
148
+ userId: updatedTelemetryUserIdentity.userId,
149
+ traits: userTraits
150
+ });
151
+ }
118
152
  log.info('MONGOSH', mongoLogId(1_000_000_005), 'config', 'User updated');
119
153
  });
120
154
 
@@ -127,7 +161,7 @@ export function setupLoggerAndTelemetry(
127
161
 
128
162
  if (error.name.includes('Mongosh')) {
129
163
  analytics.track({
130
- userId,
164
+ ...getTelemetryUserIdentity(),
131
165
  event: 'Error',
132
166
  properties: {
133
167
  mongosh_version,
@@ -152,7 +186,7 @@ export function setupLoggerAndTelemetry(
152
186
  log.info('MONGOSH', mongoLogId(1_000_000_008), 'shell-api', 'Used "use" command', args);
153
187
 
154
188
  analytics.track({
155
- userId,
189
+ ...getTelemetryUserIdentity(),
156
190
  event: 'Use',
157
191
  properties: {
158
192
  mongosh_version
@@ -164,7 +198,7 @@ export function setupLoggerAndTelemetry(
164
198
  log.info('MONGOSH', mongoLogId(1_000_000_009), 'shell-api', 'Used "show" command', args);
165
199
 
166
200
  analytics.track({
167
- userId,
201
+ ...getTelemetryUserIdentity(),
168
202
  event: 'Show',
169
203
  properties: {
170
204
  mongosh_version,
@@ -192,7 +226,7 @@ export function setupLoggerAndTelemetry(
192
226
  log.info('MONGOSH', mongoLogId(1_000_000_012), 'shell-api', 'Loading file via load()', args);
193
227
 
194
228
  analytics.track({
195
- userId,
229
+ ...getTelemetryUserIdentity(),
196
230
  event: hasStartedMongoshRepl ? 'Script Loaded' : 'Script Loaded CLI',
197
231
  properties: {
198
232
  mongosh_version,
@@ -206,7 +240,7 @@ export function setupLoggerAndTelemetry(
206
240
  log.info('MONGOSH', mongoLogId(1_000_000_013), 'repl', 'Evaluating script passed on the command line');
207
241
 
208
242
  analytics.track({
209
- userId,
243
+ ...getTelemetryUserIdentity(),
210
244
  event: 'Script Evaluated',
211
245
  properties: {
212
246
  mongosh_version,
@@ -219,7 +253,7 @@ export function setupLoggerAndTelemetry(
219
253
  log.info('MONGOSH', mongoLogId(1_000_000_014), 'repl', 'Loading .mongoshrc.js');
220
254
 
221
255
  analytics.track({
222
- userId,
256
+ ...getTelemetryUserIdentity(),
223
257
  event: 'Mongoshrc Loaded',
224
258
  properties: {
225
259
  mongosh_version
@@ -231,7 +265,7 @@ export function setupLoggerAndTelemetry(
231
265
  log.info('MONGOSH', mongoLogId(1_000_000_015), 'repl', 'Warning about .mongorc.js/.mongoshrc.js mismatch');
232
266
 
233
267
  analytics.track({
234
- userId,
268
+ ...getTelemetryUserIdentity(),
235
269
  event: 'Mongorc Warning',
236
270
  properties: {
237
271
  mongosh_version
@@ -307,7 +341,7 @@ export function setupLoggerAndTelemetry(
307
341
 
308
342
  if (ev.args[0] === 'install') {
309
343
  analytics.track({
310
- userId,
344
+ ...getTelemetryUserIdentity(),
311
345
  event: 'Snippet Install',
312
346
  properties: {
313
347
  mongosh_version
@@ -343,7 +377,7 @@ export function setupLoggerAndTelemetry(
343
377
  log.warn('MONGOSH', mongoLogId(1_000_000_033), 'shell-api', 'Deprecated API call', entry);
344
378
 
345
379
  analytics.track({
346
- userId,
380
+ ...getTelemetryUserIdentity(),
347
381
  event: 'Deprecated Method',
348
382
  properties: {
349
383
  mongosh_version,
@@ -353,7 +387,7 @@ export function setupLoggerAndTelemetry(
353
387
  }
354
388
  for (const [entry, count] of apiCalls) {
355
389
  analytics.track({
356
- userId,
390
+ ...getTelemetryUserIdentity(),
357
391
  event: 'API Call',
358
392
  properties: {
359
393
  mongosh_version,