Merge branch 'main' into 1.29-releases

Author: mcasimir

AUTHORS

@@ -56,3 +56,4 @@ chrisrichie25 <[email protected]>
 Le Roux Bodenstein <[email protected]>
 Grimmer <[email protected]>
 Vladimir Isakov <[email protected]>
+Basit <[email protected]>

THIRD-PARTY-NOTICES.md

@@ -1,5 +1,5 @@
 The following third-party software is used by and included in **compass**.
-This document was automatically generated on Wed Nov 10 2021.
+This document was automatically generated on Thu Nov 11 2021.
 
 ## List of dependencies
 
@@ -1498,7 +1498,7 @@ Authors:
 
 <a id="0246a09057539905cb79d6da85f9ec38a0e098bb0f85e64989fa7adffdee8a37"></a>
 ### [kerberos](https://www.npmjs.com/package/kerberos) (version 2.0.0-beta.0)
-<!-- initially found at packages/compass/node_modules/kerberos -->
+<!-- initially found at node_modules/kerberos -->
 > Kerberos library for Node.js
 
 License tags: Apache-2.0
@@ -2490,7 +2490,7 @@ Authors:
 
 <a id="41cf4a77f0b640214c5bcc5fa57dc986f9dc30676e63e34e74f23b134fe518e0"></a>
 ### [node-addon-api](https://www.npmjs.com/package/node-addon-api) (version 4.2.0)
-<!-- initially found at packages/compass/node_modules/kerberos/node_modules/node-addon-api -->
+<!-- initially found at node_modules/kerberos/node_modules/node-addon-api -->
 > Node.js API (Node-API)
 
 License tags: MIT

package-lock.json

@@ -72,13 +72,6 @@ const CollectionCollection = AmpersandCollection.extend({
    * @returns {Promise<void>}
    */
   async fetch({ dataService, fetchInfo = true }) {
-    const listCollectionsAsync = promisify(
-      dataService.listCollections.bind(dataService)
-    );
-    const listCollectionsNameOnlyAsync = promisify(
-      dataService.listCollectionsNamesOnly.bind(dataService)
-    );
-
     const databaseName = this.parent && this.parent.getId();
 
     if (!databaseName) {
@@ -87,20 +80,11 @@ const CollectionCollection = AmpersandCollection.extend({
       );
     }
 
-    let collections = [];
-
-    // When trying to fetch additional information about collections during
-    // collection list fetch we want to fallback to the nameOnly method that
-    // requires less privileges in case user is missing some required ones
-    if (fetchInfo) {
-      try {
-        collections = await listCollectionsAsync(databaseName, {});
-      } catch (e) {
-        collections = await listCollectionsNameOnlyAsync(databaseName);
-      }
-    } else {
-      collections = await listCollectionsNameOnlyAsync(databaseName);
-    }
+    const collections = await dataService.listCollections(
+      databaseName,
+      {},
+      { nameOnly: !fetchInfo }
+    );
 
     this.set(
       collections.filter((coll) => {

packages/collection-model/lib/model.js

@@ -24,13 +24,11 @@ describe('InstanceStore [Store]', () => {
       instance() {
         return Promise.resolve(instanceInfo);
       },
-      listDatabases(_opts, cb) {
-        cb(null, []);
-        return;
+      listDatabases() {
+        return Promise.resolve([]);
       },
-      listCollections(_dbName, cb) {
-        cb(null, []);
-        return;
+      listCollections() {
+        return Promise.resolve([]);
       }
     };
   }

packages/compass-app-stores/src/stores/instance-store.spec.js

@@ -105,6 +105,8 @@
     "mocha": "^7.0.1",
     "mocha-webpack": "^2.0.0-beta.0",
     "moment": "^2.27.0",
+    "mongodb-build-info": "^1.2.0",
+    "mongodb-cloud-info": "^1.1.3",
     "mongodb-connection-model": "^21.8.0",
     "mongodb-data-service": "^21.12.0",
     "mongodb-runner": "^4.8.3",

packages/compass-connect/package.json

@@ -7,6 +7,8 @@ const StateMixin = require('reflux-state-mixin');
 const { promisify } = require('util');
 const { getConnectionTitle, convertConnectionModelToInfo } = require('mongodb-data-service');
 const debug = require('debug')('compass-connect:store');
+const { isAtlas, isLocalhost, isDigitalOcean } = require('mongodb-build-info');
+const { getCloudInfo } = require('mongodb-cloud-info');
 
 const Actions = require('../actions');
 const {
@@ -19,7 +21,7 @@ const ConnectionCollection = Connection.ConnectionCollection;
 const userAgent = navigator.userAgent.toLowerCase();
 
 const { createLoggerAndTelemetry } = require('@mongodb-js/compass-logging');
-const { log, mongoLogId } = createLoggerAndTelemetry('COMPASS-CONNECT-UI');
+const { log, track, mongoLogId } = createLoggerAndTelemetry('COMPASS-CONNECT-UI');
 
 /**
  * A default driverUrl.
@@ -311,6 +313,14 @@ const Store = Reflux.createStore({
       return;
     }
 
+    const { connectionModel } = this.state;
+    const trackEvent = {
+      is_favorite: connectionModel.isFavorite,
+      is_recent: Boolean(connectionModel.lastUsed && !connectionModel.isFavorite),
+      is_new: !connectionModel.lastUsed,
+    };
+    track('Connection Attempt', trackEvent);
+
     this.setState({
       currentConnectionAttempt: createConnectionAttempt(),
       connectingStatusText: LOADING_CONNECTION_TEXT
@@ -682,6 +692,7 @@ const Store = Reflux.createStore({
 
   /**
    * Resets the connection after clicking on the new connection section.
+   *
    */
   onResetConnectionClicked() {
     this.state.viewType = CONNECTION_STRING_VIEW;
@@ -960,6 +971,40 @@ const Store = Reflux.createStore({
     }
   },
 
+  async _trackConnectionInfo() {
+    const { dataService } = this;
+    const {
+      dataLake,
+      genuineMongoDB,
+      host,
+      build,
+    } = await dataService.instance();
+    const {
+      hostname,
+      authMechanism,
+    } = this.state.connectionModel;
+    const { isAws, isAzure, isGcp } = await getCloudInfo(hostname);
+    const isPublicCloud = isAws || isAzure || isGcp;
+    const publicCloudName = isAws ? 'AWS' : isAzure ? 'Azure' : isGcp ? 'GCP' : '';
+
+    const trackEvent = {
+      is_localhost: isLocalhost(hostname),
+      is_atlas: isAtlas(hostname),
+      is_dataLake: dataLake.isDataLake,
+      is_enterprise: build.isEnterprise,
+      is_public_cloud: isPublicCloud,
+      is_do: isDigitalOcean(hostname),
+      public_cloud_name: publicCloudName,
+      is_genuine: genuineMongoDB.isGenuine,
+      non_genuine_server_name: genuineMongoDB.dbType,
+      server_version: host.kernel_version,
+      server_arch: host.arch,
+      server_os_family: host.os_family,
+      auth_type: authMechanism ?? '',
+    };
+    track('New Connection', trackEvent);
+  },
+
   _onConnectSuccess(dataService, connectionInfo) {
     const connectionModel = this.state.connectionModel;
     const currentSaved = this.state.connections[connectionModel._id];
@@ -996,6 +1041,8 @@ const Store = Reflux.createStore({
     // bar, which is hidden after the instance information is loaded
     // in another plugin.
     this.StatusActions.showIndeterminateProgressBar();
+
+    void this._trackConnectionInfo();
   },
 
   /**