Add call to identifyServerName in service-provider-node-driver

Author: kraenhansen

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

@@ -64,7 +64,7 @@ describe('getConnectInfo', function () {
       auth_type: 'PLAIN',
       is_data_federation: false,
       is_stream: false,
-      dl_version: null,
+      dl_version: undefined,
       atlas_version: '20210330.0.0.1617063608',
       is_genuine: true,
       non_genuine_server_name: 'mongodb',
@@ -81,6 +81,7 @@ describe('getConnectInfo', function () {
         atlasVersion: ATLAS_VERSION,
         resolvedHostname: 'test-data-sets-00-02-a011bb.mongodb.net',
         isLocalAtlas: false,
+        serverName: 'mongodb',
       })
     ).to.deep.equal(output);
   });
@@ -96,7 +97,7 @@ describe('getConnectInfo', function () {
       auth_type: undefined,
       is_data_federation: false,
       is_stream: false,
-      dl_version: null,
+      dl_version: undefined,
       atlas_version: '20210330.0.0.1617063608',
       is_genuine: true,
       non_genuine_server_name: 'mongodb',
@@ -113,6 +114,7 @@ describe('getConnectInfo', function () {
         atlasVersion: ATLAS_VERSION,
         resolvedHostname: 'test-data-sets-00-02-a011bb.mongodb.net',
         isLocalAtlas: false,
+        serverName: 'mongodb',
       })
     ).to.deep.equal(output);
   });
@@ -130,7 +132,7 @@ describe('getConnectInfo', function () {
       auth_type: undefined,
       is_data_federation: false,
       is_stream: true,
-      dl_version: null,
+      dl_version: undefined,
       atlas_version: null,
       is_genuine: true,
       is_local_atlas: false,
@@ -148,6 +150,7 @@ describe('getConnectInfo', function () {
         resolvedHostname:
           'atlas-stream-67b8e1cd6d60357be377be7b-1dekw.virginia-usa.a.query.mongodb-dev.net',
         isLocalAtlas: false,
+        serverName: 'mongodb',
       })
     ).to.deep.equal(output);
   });
@@ -163,7 +166,7 @@ describe('getConnectInfo', function () {
       auth_type: undefined,
       is_data_federation: false,
       is_stream: false,
-      dl_version: null,
+      dl_version: undefined,
       atlas_version: null,
       is_genuine: true,
       non_genuine_server_name: 'mongodb',
@@ -179,6 +182,7 @@ describe('getConnectInfo', function () {
         atlasVersion: null,
         resolvedHostname: 'localhost',
         isLocalAtlas: true,
+        serverName: 'mongodb',
       })
     ).to.deep.equal(output);
   });
@@ -194,13 +198,13 @@ describe('getConnectInfo', function () {
       auth_type: undefined,
       is_data_federation: false,
       is_stream: false,
-      dl_version: null,
+      dl_version: undefined,
       atlas_version: null,
       is_genuine: true,
       non_genuine_server_name: 'mongodb',
-      server_arch: null,
       node_version: process.version,
-      server_os: null,
+      server_os: undefined,
+      server_arch: undefined,
       uri: '',
       is_local_atlas: false,
     };
@@ -209,6 +213,7 @@ describe('getConnectInfo', function () {
         buildInfo: null,
         atlasVersion: null,
         isLocalAtlas: false,
+        serverName: 'mongodb',
       })
     ).to.deep.equal(output);
   });

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

@@ -1,6 +1,6 @@
 // ^ segment data is in snake_case: forgive me javascript, for i have sinned.
 
-import getBuildInfo from 'mongodb-build-info';
+import * as getBuildInfo from 'mongodb-build-info';
 import type { ConnectionString } from 'mongodb-connection-string-url';
 
 export type ConnectionExtraInfo = {
@@ -65,20 +65,20 @@ export default function getConnectExtraInfo({
   atlasVersion,
   resolvedHostname,
   isLocalAtlas,
+  serverName = 'unknown',
 }: {
   connectionString?: ConnectionString;
   buildInfo: any;
   atlasVersion: any;
   resolvedHostname?: string;
   isLocalAtlas: boolean;
+  serverName?: string;
 }): ConnectionExtraInfo {
   const auth_type =
     connectionString?.searchParams.get('authMechanism') ?? undefined;
   const uri = connectionString?.toString() ?? '';
 
   buildInfo ??= {}; // We're currently not getting buildInfo with --apiStrict.
-  const { isGenuine: is_genuine, serverName: non_genuine_server_name } =
-    getBuildInfo.getGenuineMongoDB(uri);
   // Atlas Data Lake has been renamed to Atlas Data Federation
   const { isDataLake: is_data_federation, dlVersion } =
     getBuildInfo.getDataLake(buildInfo);
@@ -100,8 +100,8 @@ export default function getConnectExtraInfo({
     is_stream: getBuildInfo.isAtlasStream(uri),
     dl_version: dlVersion || undefined,
     atlas_version: atlasVersion?.atlasVersion ?? null,
-    is_genuine,
-    non_genuine_server_name,
+    is_genuine: serverName === 'mongodb' || serverName === 'unknown',
+    non_genuine_server_name: serverName,
     is_local_atlas: isLocalAtlas,
   };
 }

packages/service-provider-node-driver/package.json

@@ -54,6 +54,7 @@
     "@mongosh/types": "^3.14.0",
     "aws4": "^1.12.0",
     "mongodb": "^6.19.0",
+    "mongodb-build-info": "^1.8.1",
     "mongodb-connection-string-url": "^3.0.2",
     "socks": "^2.8.3",
     "mongodb-client-encryption": "^6.5.0",

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

@@ -93,6 +93,7 @@ import {
   ClientEncryption,
 } from 'mongodb';
 import { connectMongoClient } from '@mongodb-js/devtools-connect';
+import { identifyServerName } from 'mongodb-build-info';
 
 const bsonlib = () => {
   const {
@@ -472,27 +473,40 @@ 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 [
+      buildInfo,
+      atlasVersion = null,
+      fcv = null,
+      atlascliInfo,
+      serverName,
+    ] = await Promise.all([
+      buildInfoPromise,
+      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),
+      identifyServerName({
+        connectionString: this.uri?.toString() ?? '',
+        buildInfo: buildInfoPromise.then((bi) => bi ?? {}),
+        adminCommand: (command) =>
+          this.runCommandWithCheck('admin', command, this.baseCmdOptions),
+      }),
+    ]);
 
     const resolvedHostname = this._getHostnameForConnection(
       this._lastSeenTopology
@@ -504,6 +518,7 @@ export class NodeDriverServiceProvider
       atlasVersion,
       resolvedHostname,
       isLocalAtlas: !!atlascliInfo,
+      serverName,
     });
 
     return {