[Cisco] Expose BGP build information over Thrift

neteng/fboss/bgp/cpp/BgpServiceBase.cpp

@@ -37,6 +37,7 @@
 #include "neteng/fboss/bgp/cpp/BgpProfiler.h"
 #include "neteng/fboss/bgp/cpp/BgpServiceBase.h"
 #include "neteng/fboss/bgp/cpp/BgpServiceUtil.h"
+#include "neteng/fboss/bgp/cpp/common/BuildInfo.h"
 #include "neteng/fboss/bgp/cpp/common/EvbUtils.h"
 #include "neteng/fboss/bgp/cpp/peer/PeerManagerBase.h"
 #include "neteng/fboss/bgp/cpp/stats/StatsBase.h"
@@ -92,6 +93,11 @@ TBgpNetwork toBgpNetwork(const TIpPrefix& prefix, const TBgpPath& path) {
 
 namespace facebook::bgp {
 
+void BgpServiceBase::getBuildInfo(
+    std::map<std::string, std::string>& info) {
+  info = BuildInfo::toMap();
+}
+
 BgpServiceBase::BgpServiceBase(
     PeerManagerBase& peerMgr,
     std::shared_ptr<ConfigManager> configManager,

neteng/fboss/bgp/cpp/BgpServiceBase.h

@@ -16,6 +16,7 @@
 
 #pragma once
 
+#include <map>
 #include <set>
 #include <string>
 #include <string_view>
@@ -53,6 +54,8 @@ class BgpServiceBase
       bool enable_thrift_protection);
   ~BgpServiceBase() override = default;
 
+  void getBuildInfo(std::map<std::string, std::string>& info) override;
+
   /**
    * [Logging]
    *

neteng/fboss/bgp/cpp/common/BuildInfo.cpp

@@ -88,6 +88,27 @@ const char* BuildInfo::getBuildMode() {
   return BuildInfo_kBuildMode;
 }
 
+std::map<std::string, std::string> BuildInfo::toMap() {
+  const auto packageName = std::string(getBuildPackageName()).empty()
+      ? "bgp"
+      : getBuildPackageName();
+  const auto packageVersion = std::string(getBuildPackageVersion()).empty()
+      ? getBuildRevision()
+      : getBuildPackageVersion();
+  return {
+      {"build_package_name", packageName},
+      {"build_package_version", packageVersion},
+      {"build_package_info",
+       fmt::format("{}-{}", packageName, packageVersion)},
+      {"build_user", getBuildUser()},
+      {"build_time", getBuildTime()},
+      {"build_host", getBuildHost()},
+      {"build_path", getBuildPath()},
+      {"build_platform", getBuildPlatform()},
+      {"build_revision", getBuildRevision()},
+  };
+}
+
 std::string BuildInfo::toDebugString() {
   return fmt::format(
       "\n  Built by: {}\n"

neteng/fboss/bgp/cpp/common/BuildInfo.h

@@ -17,6 +17,7 @@
 #pragma once
 
 #include <inttypes.h>
+#include <map>
 #include <ostream>
 #include <string>
 
@@ -46,6 +47,9 @@ class BuildInfo {
   static const char* getBuildTool();
   static const char* getBuildMode();
 
+  /** Returns build metadata using the fb303-compatible build_* keys. */
+  static std::map<std::string, std::string> toMap();
+
   /**
    * Returns a formatted debug string with all build information.
    * Used for gflags version string (--version output).

neteng/fboss/bgp/cpp/tests/BgpServiceBaseTest.cpp

@@ -17,6 +17,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+#include <map>
 #include <stdexcept>
 
 #include <folly/ScopeGuard.h>
@@ -498,4 +499,14 @@ TEST_F(BgpServiceBaseTestFixture, GetProcessUptimeSecondsTest) {
   EXPECT_GE(uptime2, uptime1);
 }
 
+TEST_F(BgpServiceBaseTestFixture, GetBuildInfoReturnsRunningBinaryMetadata) {
+  std::map<std::string, std::string> info;
+
+  service_->getBuildInfo(info);
+
+  EXPECT_EQ(info.at("build_package_name"), "bgp");
+  EXPECT_FALSE(info.at("build_package_version").empty());
+  EXPECT_EQ(info.at("build_package_version"), info.at("build_revision"));
+}
+
 } // namespace facebook::bgp

neteng/fboss/bgp/cpp/tests/BuildInfoTest.cpp

@@ -48,3 +48,14 @@ TEST(BuildInfoTest, LogWritesFieldLabelsToStream) {
   EXPECT_NE(std::string::npos, output.find("Built by"));
   EXPECT_NE(std::string::npos, output.find("Build Revision"));
 }
+
+TEST(BuildInfoTest, ToMapContainsCliVersionFields) {
+  const auto info = BuildInfo::toMap();
+
+  EXPECT_EQ(info.at("build_package_name"), "bgp");
+  EXPECT_EQ(
+      info.at("build_package_version"), BuildInfo::getBuildRevision());
+  EXPECT_EQ(info.at("build_revision"), BuildInfo::getBuildRevision());
+  EXPECT_EQ(info.at("build_user"), BuildInfo::getBuildUser());
+  EXPECT_EQ(info.at("build_platform"), BuildInfo::getBuildPlatform());
+}

neteng/fboss/bgp/if/bgp_thrift.thrift

@@ -1422,6 +1422,11 @@ enum ClearBgpNeighborDirection {
 
 // @lint-ignore THRIFTCHECKS facebook-service-deprecated existing service inheritance is out of scope for this API addition
 service TBgpService extends fb303.FacebookService {
+  /**
+   * Return build metadata for the running BGP process.
+   */
+  map<string, string> getBuildInfo();
+
   /**
    * [Logging]
    *