Track builder in version info

Summary:
To prepare for more potential places that pixie artifacts might be
built, add some builder info to versions via xdefs.

Test Plan: Built the CLI and ran px version

Reviewers: zasgar, michelle

Reviewed By: michelle

Signed-off-by: Vihang Mehta <[email protected]>

Differential Revision: https://phab.corp.pixielabs.ai/D11697

GitOrigin-RevId: a3f63b6

bazel/get_workspace_status.sh

@@ -38,6 +38,7 @@ then
     echo "STABLE_BUILD_TAG $(cat VERSION)"
     echo "STABLE_BUILD_NUMBER ${BUILD_NUMBER}"
     echo "STABLE_BUILD_SCM_STATUS Distribution"
+    echo "STABLE_BUILT_BY jenkins"
 
     # Build buddy tags.
     echo "COMMIT_SHA $(cat GIT_COMMIT)"
@@ -68,6 +69,7 @@ echo "STABLE_BUILD_SCM_REVISION ${git_rev}"
 echo "STABLE_BUILD_TAG 0.0.0-dev"
 echo "STABLE_BUILD_NUMBER 0"
 echo "STABLE_BUILD_SCM_STATUS ${tree_status}"
+echo "STABLE_BUILT_BY ${USER}"
 
 # Build buddy variables.
 echo "COMMIT_SHA ${git_rev}"

src/shared/goversion/BUILD.bazel

@@ -24,6 +24,7 @@ stamped_xdefs = {
     "buildSCMStatus": "{STABLE_BUILD_SCM_STATUS}",
     "buildSemver": "{STABLE_BUILD_TAG}",
     "buildTimeStamp": "{BUILD_TIMESTAMP}",
+    "builtBy": "{STABLE_BUILT_BY}",
 }
 
 unstamped_xdefs = {
@@ -32,6 +33,7 @@ unstamped_xdefs = {
     "buildSCMStatus": "Modified",
     "buildSemver": "0.0.0-dev",
     "buildTimeStamp": "0",
+    "builtBy": "Unknown",
 }
 
 go_library(

src/shared/goversion/version.go

@@ -33,6 +33,7 @@ var (
 	buildSemver    = "0.0.0-dev"
 	buildTimeStamp = "0"
 	buildNumber    = "0"
+	builtBy        = "Unknown"
 )
 
 var versionInstance *Version
@@ -43,6 +44,7 @@ type Version struct {
 	buildSCMStatus   string
 	buildSemver      semver.Version
 	buildTimeStamp   time.Time
+	builtBy          string
 }
 
 func init() {
@@ -66,6 +68,7 @@ func init() {
 		buildSCMRevisionShort,
 		t.Format("20060102150405"),
 		buildNumber,
+		builtBy,
 	}
 	v.Build = buildMetadata
 
@@ -74,6 +77,7 @@ func init() {
 		buildSCMStatus:   buildSCMStatus,
 		buildSemver:      v,
 		buildTimeStamp:   t,
+		builtBy:          builtBy,
 	}
 }
 
@@ -92,6 +96,11 @@ func (v *Version) BuildTimestamp() string {
 	return v.buildTimeStamp.UTC().String()
 }
 
+// Builder returns the built by.
+func (v *Version) Builder() string {
+	return v.builtBy
+}
+
 // ToString returns the semver string.
 func (v *Version) ToString() string {
 	return v.buildSemver.String()

src/shared/version/BUILD.bazel

@@ -37,6 +37,9 @@ genrule(
     STABLE_BUILD_NUMBER=$$(
           grep STABLE_BUILD_NUMBER bazel-out/stable-status.txt \\
         | sed 's/^STABLE_BUILD_NUMBER //')
+    STABLE_BUILT_BY=$$(
+          grep STABLE_BUILT_BY bazel-out/stable-status.txt \\
+        | sed 's/^STABLE_BUILT_BY //')
 
 
     BUILD_TIMESTAMP=$$(
@@ -47,6 +50,7 @@ genrule(
     echo "#define BUILD_SCM_STATUS \\"$$STABLE_BUILD_SCM_STATUS\\"" >> $@
     echo "#define BUILD_TAG \\"$$STABLE_BUILD_TAG\\"" >> $@
     echo "#define BUILD_NUMBER \\"$$STABLE_BUILD_NUMBER\\"" >> $@
+    echo "#define BUILT_BY \\"$$STABLE_BUILT_BY\\"" >> $@
 
     echo "#define BUILD_TIMESTAMP $$BUILD_TIMESTAMP" >> $@
     cat $(location :version_linkstamp.cc) >> $@

src/shared/version/placeholder_version_linkstamp.cc

@@ -23,9 +23,11 @@ extern const char* kBuildSCMRevision;
 extern const int64_t kBuildTimeStamp;
 extern const char* kBuildSemver;
 extern const char* kBuildNumber;
+extern const char* kBuiltBy;
 
 const char* kBuildSCMStatus = "Modified";
 const char* kBuildSCMRevision = "0000000";
 const int64_t kBuildTimeStamp = 0;       // UNIX TIMESTAMP seconds.
 const char* kBuildSemver = "0.0.0-dev";  // Semver string.
 const char* kBuildNumber = "0";          // Build number..
+const char* kBuiltBy = "Unknown";

src/shared/version/version.cc

@@ -28,13 +28,16 @@ extern const char* kBuildSCMRevision;
 extern const int64_t kBuildTimeStamp;
 extern const char* kBuildSemver;
 extern const char* kBuildNumber;
+extern const char* kBuiltBy;
 
 namespace px {
 
 std::string VersionInfo::Revision() { return kBuildSCMRevision; }
 
 std::string VersionInfo::RevisionStatus() { return kBuildSCMStatus; }
 
+std::string VersionInfo::Builder() { return kBuiltBy; }
+
 int VersionInfo::BuildNumber() {
   int build_number = 0;
   bool ok = absl::SimpleAtoi(kBuildNumber, &build_number);
@@ -50,8 +53,8 @@ std::string VersionInfo::VersionString() {
   std::string short_rev = Revision().substr(0, 7);
   auto t = absl::FromUnixSeconds(kBuildTimeStamp);
   auto build_time = absl::FormatTime("%Y%m%d%H%M", t, absl::LocalTimeZone());
-  return absl::Substitute("v$0+$1.$2.$3.$4.$5", kBuildSemver, RevisionStatus(), short_rev,
-                          build_time, BuildNumber(), build_type);
+  return absl::Substitute("v$0+$1.$2.$3.$4.$5.$6", kBuildSemver, RevisionStatus(), short_rev,
+                          build_time, BuildNumber(), build_type, Builder());
 }
 
 }  // namespace px

src/shared/version/version.h

@@ -36,6 +36,12 @@ class VersionInfo {
    */
   static std::string RevisionStatus();
 
+  /**
+   * Get the built by.
+   * @return string
+   */
+  static std::string Builder();
+
   /**
    * Returns a version string with git info, release status.
    * @return string

src/shared/version/version_linkstamp.cc

@@ -23,9 +23,11 @@ extern const char* kBuildSCMRevision;
 extern const int64_t kBuildTimeStamp;
 extern const char* kBuildSemver;
 extern const char* kBuildNumber;
+extern const char* kBuiltBy;
 
 const char* kBuildSCMStatus = BUILD_SCM_STATUS;
 const char* kBuildSCMRevision = BUILD_SCM_REVISION;
 const int64_t kBuildTimeStamp = BUILD_TIMESTAMP;  // UNIX TIMESTAMP seconds.
 const char* kBuildSemver = BUILD_TAG;             // Semver string.
 const char* kBuildNumber = BUILD_NUMBER;          // Build number..
+const char* kBuiltBy = BUILT_BY;