Keep CVersion in the vminitd package

Author: dkovba

Package.swift

@@ -21,10 +21,6 @@ import CompilerPluginSupport
 import Foundation
 import PackageDescription
 
-let gitCommit = ProcessInfo.processInfo.environment["GIT_COMMIT"] ?? "unspecified"
-let gitTag = ProcessInfo.processInfo.environment["GIT_TAG"] ?? ""
-let buildTime = ProcessInfo.processInfo.environment["BUILD_TIME"] ?? "unspecified"
-
 let package = Package(
     name: "containerization",
     platforms: [.macOS("15.0")],
@@ -264,15 +260,6 @@ let package = Package(
         .target(
             name: "CShim"
         ),
-        .target(
-            name: "CVersion",
-            path: "vminitd/Sources/CVersion",
-            cSettings: [
-                .define("GIT_COMMIT", to: "\"\(gitCommit)\""),
-                .define("GIT_TAG", to: "\"\(gitTag)\""),
-                .define("BUILD_TIME", to: "\"\(buildTime)\""),
-            ]
-        ),
         .target(
             name: "LCShim",
             path: "vminitd/Sources/LCShim"
@@ -303,7 +290,6 @@ let package = Package(
                 .product(name: "GRPCNIOTransportHTTP2", package: "grpc-swift-nio-transport"),
                 .product(name: "GRPCProtobuf", package: "grpc-swift-protobuf"),
                 "LCShim",
-                "CVersion",
                 "Cgroup",
             ],
             path: "vminitd/Sources/VminitdCore"

vminitd/Package.swift

@@ -17,8 +17,13 @@
 
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
+import Foundation
 import PackageDescription
 
+let gitCommit = ProcessInfo.processInfo.environment["GIT_COMMIT"] ?? "unspecified"
+let gitTag = ProcessInfo.processInfo.environment["GIT_TAG"] ?? ""
+let buildTime = ProcessInfo.processInfo.environment["BUILD_TIME"] ?? "unspecified"
+
 let package = Package(
     name: "swift-vminitd",
     platforms: [.macOS("15")],
@@ -33,13 +38,22 @@ let package = Package(
         .package(name: "containerization", path: "../"),
     ],
     targets: [
+        .target(
+            name: "CVersion",
+            cSettings: [
+                .define("GIT_COMMIT", to: "\"\(gitCommit)\""),
+                .define("GIT_TAG", to: "\"\(gitTag)\""),
+                .define("BUILD_TIME", to: "\"\(buildTime)\""),
+            ]
+        ),
         .executableTarget(
             name: "vminitd",
             dependencies: [
                 .product(name: "ArgumentParser", package: "swift-argument-parser"),
                 .product(name: "ContainerizationOS", package: "containerization"),
                 .product(name: "Logging", package: "swift-log"),
                 .product(name: "VminitdCore", package: "containerization"),
+                "CVersion",
             ]
         ),
         .executableTarget(

vminitd/Sources/VminitdCore/AgentCommand.swift

@@ -17,7 +17,6 @@
 #if os(Linux)
 
 import ArgumentParser
-import CVersion
 import Cgroup
 import Containerization
 import ContainerizationError
@@ -27,6 +26,7 @@ import GRPCCore
 import Logging
 import NIOCore
 import NIOPosix
+import Synchronization
 
 #if os(Linux)
 #if canImport(Musl)
@@ -46,6 +46,8 @@ public struct AgentCommand: AsyncParsableCommand {
     private static let foregroundEnvVar = "FOREGROUND"
     public static let vsockPort = 1024
 
+    public static let versionMetadata = Mutex<Logger.Metadata>([:])
+
     @OptionGroup var options: LogLevelOption
 
     public init() {}
@@ -79,14 +81,7 @@ public struct AgentCommand: AsyncParsableCommand {
 
         signal(SIGPIPE, SIG_IGN)
 
-        let gitCommit = String(cString: CZ_get_git_commit())
-        let gitTag = String(cString: CZ_get_git_tag())
-        let buildTime = String(cString: CZ_get_build_time())
-        var metadata: Logger.Metadata = ["commit": "\(gitCommit)", "built": "\(buildTime)"]
-        if !gitTag.isEmpty {
-            metadata["tag"] = "\(gitTag)"
-        }
-        log.info("vminitd booting", metadata: metadata)
+        log.info("vminitd booting", metadata: Self.versionMetadata.withLock { $0 })
 
         // Set of mounts necessary to be mounted prior to taking any RPCs.
         // 1. /proc as the sysctl rpc wouldn't make sense if it wasn't there (NOTE: This is done before this method

vminitd/Sources/vminitd/Application.swift

@@ -15,6 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
+import CVersion
 import ContainerizationOS
 import Foundation
 import Logging
@@ -35,6 +36,8 @@ struct Application: AsyncParsableCommand {
     )
 
     static func main() async throws {
+        AgentCommand.versionMetadata.withLock { $0 = Self.versionMetadata() }
+
         // Busybox-style: if invoked as .cz-init, run init mode directly.
         let invoked = CommandLine.arguments.first?.split(separator: "/").last.map(String.init) ?? ""
         if invoked == ".cz-init" {
@@ -57,6 +60,17 @@ struct Application: AsyncParsableCommand {
         }
     }
 
+    private static func versionMetadata() -> Logger.Metadata {
+        let gitCommit = String(cString: CZ_get_git_commit())
+        let gitTag = String(cString: CZ_get_git_tag())
+        let buildTime = String(cString: CZ_get_build_time())
+        var metadata: Logger.Metadata = ["commit": "\(gitCommit)", "built": "\(buildTime)"]
+        if !gitTag.isEmpty {
+            metadata["tag"] = "\(gitTag)"
+        }
+        return metadata
+    }
+
     private static func mountProc() throws {
         if isProcMounted() {
             return