SERVER-25402 Fewer binaries depend on interpolated version info

8 files changed, 20 insertions, 17 deletions

diff --git a/src/mongo/db/commands/generic.cpp b/src/mongo/db/commands/generic.cpp
index 941ac0d2503..9ef0f60adf1 100644
--- a/src/mongo/db/commands/generic.cpp
+++ b/src/mongo/db/commands/generic.cpp
@@ -95,7 +95,7 @@ public:
              int,  // options
              std::string& errmsg,
              BSONObjBuilder& result) {
-        appendBuildInfo(result);
+        VersionInfoInterface::instance().appendBuildInfo(&result);
         appendStorageEngineList(&result);
         return true;
     }
diff --git a/src/mongo/db/commands/server_status.cpp b/src/mongo/db/commands/server_status.cpp
index 531d477db5f..ff0b1cbb376 100644
--- a/src/mongo/db/commands/server_status.cpp
+++ b/src/mongo/db/commands/server_status.cpp
@@ -106,7 +106,7 @@ public:
         result.append("host", prettyHostName());
         result.append("advisoryHostFQDNs", canonicalizer->getCanonicalizedFQDNs());
 
-        result.append("version", versionString);
+        result.append("version", VersionInfoInterface::instance().version());
         result.append("process", serverGlobalParams.binaryName);
         result.append("pid", ProcessId::getCurrent().asLongLong());
         result.append("uptime", (double)(time(0) - serverGlobalParams.started));
diff --git a/src/mongo/db/db.cpp b/src/mongo/db/db.cpp
index 270e8e7ea41..c10f85b94c4 100644
--- a/src/mongo/db/db.cpp
+++ b/src/mongo/db/db.cpp
@@ -188,7 +188,7 @@ static void logStartup(OperationContext* txn) {
 
 
     BSONObjBuilder buildinfo(toLog.subobjStart("buildinfo"));
-    appendBuildInfo(buildinfo);
+    VersionInfoInterface::instance().appendBuildInfo(&buildinfo);
     appendStorageEngineList(&buildinfo);
     buildinfo.doneFast();
 
@@ -509,7 +509,7 @@ static ExitCode _initAndListen(int listenPort) {
     DEV log(LogComponent::kControl) << "DEBUG build (which is slower)" << endl;
 
 #if defined(_WIN32)
-    printTargetMinOS();
+    VersionInfoInterface::instance().logTargetMinOS();
 #endif
 
     logProcessDetails();
diff --git a/src/mongo/db/dbwebserver.cpp b/src/mongo/db/dbwebserver.cpp
index a5b9ca74fdb..b202e0500b9 100644
--- a/src/mongo/db/dbwebserver.cpp
+++ b/src/mongo/db/dbwebserver.cpp
@@ -74,10 +74,11 @@ namespace {
 
 void doUnlockedStuff(stringstream& ss) {
     // This is in the header already ss << "port:      " << port << '\n'
+    auto&& vii = VersionInfoInterface::instance();
     ss << "<pre>";
-    ss << mongodVersion() << '\n';
-    ss << "git hash: " << gitVersion() << '\n';
-    ss << openSSLVersion("OpenSSL version: ", "\n");
+    ss << mongodVersion(vii) << '\n';
+    ss << "git hash: " << vii.gitVersion() << '\n';
+    ss << vii.openSSLVersion("OpenSSL version: ", "\n");
     ss << "uptime: " << time(0) - serverGlobalParams.started << " seconds\n";
     ss << "</pre>";
 }
diff --git a/src/mongo/db/log_process_details.cpp b/src/mongo/db/log_process_details.cpp
index cd75444fe69..125106fd331 100644
--- a/src/mongo/db/log_process_details.cpp
+++ b/src/mongo/db/log_process_details.cpp
@@ -48,8 +48,9 @@ bool is32bit() {
 }
 
 void logProcessDetails() {
-    log() << mongodVersion();
-    printBuildInfo();
+    auto&& vii = VersionInfoInterface::instance();
+    log() << mongodVersion(vii);
+    vii.logBuildInfo();
     printCommandLineOpts();
 }
 
diff --git a/src/mongo/db/mongod_options.cpp b/src/mongo/db/mongod_options.cpp
index 161475d567b..b030a26d3a9 100644
--- a/src/mongo/db/mongod_options.cpp
+++ b/src/mongo/db/mongod_options.cpp
@@ -599,8 +599,9 @@ bool handlePreValidationMongodOptions(const moe::Environment& params,
     }
     if (params.count("version") && params["version"].as<bool>() == true) {
         setPlainConsoleLogger();
-        log() << mongodVersion() << endl;
-        printBuildInfo();
+        auto&& vii = VersionInfoInterface::instance();
+        log() << mongodVersion(vii);
+        vii.logBuildInfo();
         return false;
     }
     if (params.count("sysinfo") && params["sysinfo"].as<bool>() == true) {
diff --git a/src/mongo/db/query/explain.cpp b/src/mongo/db/query/explain.cpp
index af29fa60d08..944c730ebf4 100644
--- a/src/mongo/db/query/explain.cpp
+++ b/src/mongo/db/query/explain.cpp
@@ -676,8 +676,9 @@ void Explain::generateServerInfo(BSONObjBuilder* out) {
     BSONObjBuilder serverBob(out->subobjStart("serverInfo"));
     out->append("host", getHostNameCached());
     out->appendNumber("port", serverGlobalParams.port);
-    out->append("version", versionString);
-    out->append("gitVersion", gitVersion());
+    auto&& vii = VersionInfoInterface::instance();
+    out->append("version", vii.version());
+    out->append("gitVersion", vii.gitVersion());
     serverBob.doneFast();
 }
 
diff --git a/src/mongo/db/startup_warnings_common.cpp b/src/mongo/db/startup_warnings_common.cpp
index c045a3f5f8d..9c444410b51 100644
--- a/src/mongo/db/startup_warnings_common.cpp
+++ b/src/mongo/db/startup_warnings_common.cpp
@@ -51,11 +51,10 @@ void logCommonStartupWarnings(const ServerGlobalParams& serverParams) {
 
     bool warned = false;
     {
-        const char* foo = strchr(versionString, '.') + 1;
-        int bar = atoi(foo);
-        if ((2 * (bar / 2)) != bar) {
+        auto&& vii = VersionInfoInterface::instance();
+        if ((vii.minorVersion() % 2) != 0) {
             log() << startupWarningsLog;
-            log() << "** NOTE: This is a development version (" << versionString << ") of MongoDB."
+            log() << "** NOTE: This is a development version (" << vii.version() << ") of MongoDB."
                   << startupWarningsLog;
             log() << "**       Not recommended for production." << startupWarningsLog;
             warned = true;