Drop the version metadata Mutex from AgentCommand

Author: dkovba

vminitd/Sources/VminitdCore/AgentCommand.swift

@@ -26,7 +26,6 @@ import GRPCCore
 import Logging
 import NIOCore
 import NIOPosix
-import Synchronization
 
 #if os(Linux)
 #if canImport(Musl)
@@ -46,8 +45,6 @@ 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() {}
@@ -81,7 +78,7 @@ public struct AgentCommand: AsyncParsableCommand {
 
         signal(SIGPIPE, SIG_IGN)
 
-        log.info("vminitd booting", metadata: Self.versionMetadata.withLock { $0 })
+        log.info("vminitd booting", metadata: versionMetadata())
 
         // 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/VminitdCore/Logging.swift

@@ -50,6 +50,16 @@ public struct LogLevelOption: ParsableArguments {
 }
 
 private let _loggingBootstrapped = Mutex(false)
+private let _versionMetadata = Mutex<Logger.Metadata>([:])
+
+/// Set the version metadata logged on boot.
+public func setVersionMetadata(_ metadata: Logger.Metadata) {
+    _versionMetadata.withLock { $0 = metadata }
+}
+
+func versionMetadata() -> Logger.Metadata {
+    _versionMetadata.withLock { $0 }
+}
 
 func makeLogger(label: String, level: Logger.Level) -> Logger {
     _loggingBootstrapped.withLock { bootstrapped in

vminitd/Sources/vminitd/Application.swift

@@ -36,7 +36,7 @@ struct Application: AsyncParsableCommand {
     )
 
     static func main() async throws {
-        AgentCommand.versionMetadata.withLock { $0 = Self.versionMetadata() }
+        setVersionMetadata(Self.versionMetadata())
 
         // Busybox-style: if invoked as .cz-init, run init mode directly.
         let invoked = CommandLine.arguments.first?.split(separator: "/").last.map(String.init) ?? ""