Use identifyServerName in parallel with requesting build info

Author: kraenhansen

packages/service-provider-core/src/connect-info.spec.ts

@@ -6,6 +6,9 @@ chai.use(chaiAsPromised);
 import getConnectExtraInfo from './connect-info';
 import { ConnectionString } from 'mongodb-connection-string-url';
 
+const mockedAdminCommand = () =>
+  Promise.reject(new Error('adminCommand was mocked'));
+
 describe('getConnectInfo', function () {
   const BUILD_INFO = {
     version: '3.2.0-rc2',
@@ -79,9 +82,10 @@ describe('getConnectInfo', function () {
       getConnectExtraInfo({
         connectionString: new ConnectionString(ATLAS_URI_WITH_AUTH),
         buildInfo: Promise.resolve(BUILD_INFO),
-        atlasVersion: Promise.resolve(ATLAS_VERSION),
+        atlasVersion: ATLAS_VERSION,
         resolvedHostname: 'test-data-sets-00-02-a011bb.mongodb.net',
-        isLocalAtlas: Promise.resolve(false),
+        isLocalAtlas: false,
+        adminCommand: mockedAdminCommand,
       })
     ).to.eventually.deep.equal(output);
   });
@@ -111,9 +115,10 @@ describe('getConnectInfo', function () {
       getConnectExtraInfo({
         connectionString: new ConnectionString(ATLAS_URI),
         buildInfo: Promise.resolve(BUILD_INFO),
-        atlasVersion: Promise.resolve(ATLAS_VERSION),
+        atlasVersion: ATLAS_VERSION,
         resolvedHostname: 'test-data-sets-00-02-a011bb.mongodb.net',
-        isLocalAtlas: Promise.resolve(false),
+        isLocalAtlas: false,
+        adminCommand: mockedAdminCommand,
       })
     ).to.eventually.deep.equal(output);
   });
@@ -145,10 +150,11 @@ describe('getConnectInfo', function () {
       getConnectExtraInfo({
         connectionString: new ConnectionString(streamUri),
         buildInfo: Promise.resolve(BUILD_INFO),
-        atlasVersion: Promise.resolve(undefined),
+        atlasVersion: undefined,
         resolvedHostname:
           'atlas-stream-67b8e1cd6d60357be377be7b-1dekw.virginia-usa.a.query.mongodb-dev.net',
-        isLocalAtlas: Promise.resolve(false),
+        isLocalAtlas: false,
+        adminCommand: mockedAdminCommand,
       })
     ).to.eventually.deep.equal(output);
   });
@@ -177,9 +183,10 @@ describe('getConnectInfo', function () {
     await expect(
       getConnectExtraInfo({
         buildInfo: Promise.resolve(BUILD_INFO),
-        atlasVersion: Promise.resolve(undefined),
+        atlasVersion: undefined,
         resolvedHostname: 'localhost',
-        isLocalAtlas: Promise.resolve(true),
+        isLocalAtlas: true,
+        adminCommand: mockedAdminCommand,
       })
     ).to.eventually.deep.equal(output);
   });
@@ -208,8 +215,9 @@ describe('getConnectInfo', function () {
     await expect(
       getConnectExtraInfo({
         buildInfo: Promise.resolve(null),
-        atlasVersion: Promise.resolve(undefined),
-        isLocalAtlas: Promise.resolve(false),
+        atlasVersion: undefined,
+        isLocalAtlas: false,
+        adminCommand: mockedAdminCommand,
       })
     ).to.eventually.deep.equal(output);
   });

packages/service-provider-core/src/connect-info.ts

@@ -67,32 +67,38 @@ export default async function getConnectExtraInfo({
   atlasVersion,
   resolvedHostname,
   isLocalAtlas,
+  adminCommand,
 }: {
   connectionString?: ConnectionString;
   buildInfo: Promise<Document | null>;
-  atlasVersion: Promise<string | undefined>;
+  atlasVersion: string | undefined;
   resolvedHostname?: string;
-  isLocalAtlas: Promise<boolean>;
+  isLocalAtlas: boolean;
+  adminCommand: (document: Document) => Promise<Document>;
 }): Promise<ConnectionExtraInfo> {
   const auth_type =
     connectionString?.searchParams.get('authMechanism') ?? undefined;
   const uri = connectionString?.toString() ?? '';
 
-  const { isGenuine: is_genuine, serverName: non_genuine_server_name } =
-    getBuildInfo.getGenuineMongoDB(uri);
+  const serverName = await getBuildInfo.identifyServerName({
+    connectionString: uri,
+    buildInfo: buildInfo.then((info) => info ?? {}),
+    adminCommand,
+  });
   // Atlas Data Lake has been renamed to Atlas Data Federation
   const { isDataLake: is_data_federation, dlVersion } =
     getBuildInfo.getDataLake(await buildInfo);
 
   const { serverOs, serverArch } = getBuildInfo.getBuildEnv(await buildInfo);
-  const isAtlas = !!(await atlasVersion) || getBuildInfo.isAtlas(uri);
+  const isAtlas = !!atlasVersion || getBuildInfo.isAtlas(uri);
+  const serverVersion = await buildInfo.then((info) =>
+    typeof info?.version === 'string' ? info.version : undefined
+  );
 
   return {
     ...getHostInformation(resolvedHostname || uri),
     is_atlas: isAtlas,
-    server_version: await buildInfo.then((info) =>
-      typeof info?.version === 'string' ? info.version : undefined
-    ),
+    server_version: serverVersion,
     node_version: process.version,
     server_os: serverOs || undefined,
     uri,
@@ -102,9 +108,10 @@ export default async function getConnectExtraInfo({
     is_data_federation,
     is_stream: getBuildInfo.isAtlasStream(uri),
     dl_version: dlVersion || undefined,
-    atlas_version: await atlasVersion,
-    is_genuine,
-    non_genuine_server_name,
-    is_local_atlas: await isLocalAtlas,
+    atlas_version: atlasVersion,
+    // When the server name is 'unknown', we cannot be certain that it's non-genuine
+    is_genuine: serverName === 'mongodb' || serverName === 'unknown',
+    non_genuine_server_name: serverName,
+    is_local_atlas: isLocalAtlas,
   };
 }

packages/service-provider-node-driver/src/node-driver-service-provider.spec.ts

@@ -1007,7 +1007,7 @@ describe('NodeDriverServiceProvider', function () {
       expect(info.extraInfo?.is_local_atlas).to.equal(false);
       expect(info.extraInfo?.is_localhost).to.equal(true);
       expect(info.extraInfo?.fcv).to.equal(undefined);
-      expect(dbStub.command).to.have.callCount(3);
+      expect(dbStub.command).to.have.callCount(4);
       expect(
         dbStub.collection,
         'calls countDocument on collection to check local atlas cli support'

packages/service-provider-node-driver/src/node-driver-service-provider.ts

@@ -472,42 +472,53 @@ export class NodeDriverServiceProvider
   }
 
   async getConnectionInfo(): Promise<ConnectionInfo> {
-    const [buildInfo = null, atlasVersion = null, fcv = null, atlascliInfo] =
-      await Promise.all([
-        this.runCommandWithCheck(
-          'admin',
-          { buildInfo: 1 },
-          this.baseCmdOptions
-        ).catch(() => {}),
-        this.runCommandWithCheck(
-          'admin',
-          { atlasVersion: 1 },
-          this.baseCmdOptions
-        ).catch(() => {}),
-        this.runCommandWithCheck(
-          'admin',
-          { getParameter: 1, featureCompatibilityVersion: 1 },
-          this.baseCmdOptions
-        ).catch(() => {}),
-        this.countDocuments('admin', 'atlascli', {
-          managedClusterType: 'atlasCliLocalDevCluster',
-        }).catch(() => 0),
-      ]);
+    const buildInfoPromise = this.runCommandWithCheck(
+      'admin',
+      { buildInfo: 1 },
+      this.baseCmdOptions
+    ).catch(() => null);
 
     const resolvedHostname = this._getHostnameForConnection(
       this._lastSeenTopology
     );
 
-    const extraConnectionInfo = getConnectExtraInfo({
+    const [isLocalAtlas, atlasVersion, fcv] = await Promise.all([
+      this.countDocuments('admin', 'atlascli', {
+        managedClusterType: 'atlasCliLocalDevCluster',
+      }).then(
+        (result) => !!result,
+        () => false
+      ),
+      this.runCommandWithCheck(
+        'admin',
+        { atlasVersion: 1 },
+        this.baseCmdOptions
+      ).then(
+        (response) =>
+          typeof response.atlasVersion === 'string'
+            ? response.atlasVersion
+            : undefined,
+        () => undefined
+      ),
+      this.runCommandWithCheck(
+        'admin',
+        { getParameter: 1, featureCompatibilityVersion: 1 },
+        this.baseCmdOptions
+      ).catch(() => null),
+    ]);
+
+    const extraConnectionInfo = await getConnectExtraInfo({
       connectionString: this.uri,
-      buildInfo,
+      buildInfo: buildInfoPromise,
       atlasVersion,
       resolvedHostname,
-      isLocalAtlas: !!atlascliInfo,
+      isLocalAtlas,
+      adminCommand: (request: Document) =>
+        this.runCommandWithCheck('admin', request, this.baseCmdOptions),
     });
 
     return {
-      buildInfo,
+      buildInfo: await buildInfoPromise,
       resolvedHostname,
       extraInfo: {
         ...extraConnectionInfo,