From a37d3d8453ab2be7605a20b095bd5ed36d2587f9 Mon Sep 17 00:00:00 2001
From: Irina Shestak <shestak.irina@gmail.com>
Date: Fri, 26 Jun 2020 10:00:21 +0200
Subject: [PATCH] log out mongosh_version to log file

---
 .../src/stitch-service-provider-browser.ts                  | 2 ++
 packages/service-provider-core/src/connect-info.spec.ts     | 4 ++++
 packages/service-provider-core/src/connect-info.ts          | 6 ++++--
 .../service-provider-server/src/cli-service-provider.ts     | 2 ++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/service-provider-browser/src/stitch-service-provider-browser.ts b/packages/service-provider-browser/src/stitch-service-provider-browser.ts
index 621535476c..218783f892 100644
--- a/packages/service-provider-browser/src/stitch-service-provider-browser.ts
+++ b/packages/service-provider-browser/src/stitch-service-provider-browser.ts
@@ -71,6 +71,7 @@ class StitchServiceProviderBrowser implements ServiceProvider {
   async getConnectionInfo(): Promise<any> {
     const buildInfo = await this.buildInfo();
     const topology = await this.getTopology();
+    const { version } = require('../package.json');
     let cmdLineOpts = null;
     try {
       cmdLineOpts = await this.getCmdLineOpts();
@@ -79,6 +80,7 @@ class StitchServiceProviderBrowser implements ServiceProvider {
     }
     const connectInfo = getConnectInfo(
       '', // TODO: something more useful?
+      version,
       buildInfo,
       cmdLineOpts,
       topology
diff --git a/packages/service-provider-core/src/connect-info.spec.ts b/packages/service-provider-core/src/connect-info.spec.ts
index 7c829af218..0feec6e1f6 100644
--- a/packages/service-provider-core/src/connect-info.spec.ts
+++ b/packages/service-provider-core/src/connect-info.spec.ts
@@ -78,6 +78,7 @@ describe('getConnectInfo', function() {
       is_atlas: true,
       is_localhost: false,
       server_version: '3.2.0-rc2',
+      mongosh_version: '0.0.6',
       is_enterprise: true,
       auth_type: 'LDAP',
       is_data_lake: false,
@@ -91,6 +92,7 @@ describe('getConnectInfo', function() {
     };
     expect(getConnectInfo(
       ATLAS_URI,
+      '0.0.6',
       BUILD_INFO,
       CMD_LINE_OPTS,
       TOPOLOGY_WITH_CREDENTIALS)).to.deep.equal(output);
@@ -101,6 +103,7 @@ describe('getConnectInfo', function() {
       is_atlas: true,
       is_localhost: false,
       server_version: '3.2.0-rc2',
+      mongosh_version: '0.0.6',
       is_enterprise: true,
       auth_type: null,
       is_data_lake: false,
@@ -114,6 +117,7 @@ describe('getConnectInfo', function() {
     };
     expect(getConnectInfo(
       ATLAS_URI,
+      '0.0.6',
       BUILD_INFO,
       CMD_LINE_OPTS,
       TOPOLOGY_NO_CREDENTIALS)).to.deep.equal(output);
diff --git a/packages/service-provider-core/src/connect-info.ts b/packages/service-provider-core/src/connect-info.ts
index c061b8d19a..b247a616ae 100644
--- a/packages/service-provider-core/src/connect-info.ts
+++ b/packages/service-provider-core/src/connect-info.ts
@@ -7,6 +7,7 @@ interface ConnectInfo {
   is_atlas: boolean;
   is_localhost: boolean;
   server_version: string;
+  mongosh_version: string;
   server_os?: string;
   server_arch?: string;
   is_enterprise: boolean;
@@ -19,7 +20,7 @@ interface ConnectInfo {
   uri: string;
 }
 
-export default function getConnectInfo(uri: string, buildInfo: any, cmdLineOpts: any, topology: any): ConnectInfo {
+export default function getConnectInfo(uri: string, mongoshVersion: string, buildInfo: any, cmdLineOpts: any, topology: any): ConnectInfo {
   const { isGenuine: is_genuine, serverName: non_genuine_server_name } =
     getBuildInfo.getGenuineMongoDB(buildInfo, cmdLineOpts);
   const { isDataLake: is_data_lake, dlVersion: dl_version }
@@ -36,6 +37,8 @@ export default function getConnectInfo(uri: string, buildInfo: any, cmdLineOpts:
     is_atlas: getBuildInfo.isAtlas(uri),
     is_localhost: getBuildInfo.isLocalhost(uri),
     server_version: buildInfo.version,
+    node_version: process.version,
+    mongosh_version: mongoshVersion,
     server_os,
     uri,
     server_arch,
@@ -43,7 +46,6 @@ export default function getConnectInfo(uri: string, buildInfo: any, cmdLineOpts:
     auth_type,
     is_data_lake,
     dl_version,
-    node_version: process.version,
     is_genuine,
     non_genuine_server_name
   };
diff --git a/packages/service-provider-server/src/cli-service-provider.ts b/packages/service-provider-server/src/cli-service-provider.ts
index 0952db0613..dfcb7c0ee1 100644
--- a/packages/service-provider-server/src/cli-service-provider.ts
+++ b/packages/service-provider-server/src/cli-service-provider.ts
@@ -105,6 +105,7 @@ class CliServiceProvider implements ServiceProvider {
   async getConnectionInfo(): Promise<any> {
     const buildInfo = await this.buildInfo();
     const topology = await this.getTopology();
+    const { version } = require('../package.json');
     let cmdLineOpts = null;
     try {
       cmdLineOpts = await this.getCmdLineOpts();
@@ -113,6 +114,7 @@ class CliServiceProvider implements ServiceProvider {
     }
     const connectInfo = getConnectInfo(
       this.uri,
+      version,
       buildInfo,
       cmdLineOpts,
       topology