vminitd: Log git info (#609)

Logs the git sha, tag (if we're on one), and build time.

Author: dcantah

vminitd/Makefile

@@ -14,6 +14,9 @@
 
 BUILD_CONFIGURATION ?= debug
 WARNINGS_AS_ERRORS ?= true
+export GIT_COMMIT := $(shell git rev-parse HEAD)
+export GIT_TAG := $(shell git describe --tags --exact-match 2>/dev/null || echo "")
+export BUILD_TIME := $(shell date -u +%Y-%m-%dT%H:%M:%SZ)
 SWIFT_WARNING_CONFIG := $(if $(filter-out false,$(WARNINGS_AS_ERRORS)),-Xswiftc -warnings-as-errors)
 SWIFT_CONFIGURATION := --swift-sdk aarch64-swift-linux-musl $(SWIFT_WARNING_CONFIG) -Xlinker -s --disable-automatic-resolution
 

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,6 +38,14 @@ 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)\""),
+            ]
+        ),
         .target(
             name: "LCShim"
         ),
@@ -56,6 +69,7 @@ let package = Package(
                 .product(name: "ContainerizationIO", package: "containerization"),
                 .product(name: "ContainerizationOS", package: "containerization"),
                 .product(name: "SystemPackage", package: "swift-system"),
+                "CVersion",
                 "LCShim",
                 "Cgroup",
             ]

vminitd/Sources/CVersion/include/version.h

@@ -0,0 +1,24 @@
+/*
+ * Copyright © 2026 Apple Inc. and the Containerization project authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef CZ_VERSION_H
+#define CZ_VERSION_H
+
+const char* CZ_get_git_commit(void);
+const char* CZ_get_git_tag(void);
+const char* CZ_get_build_time(void);
+
+#endif

vminitd/Sources/CVersion/version.c

@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2026 Apple Inc. and the Containerization project authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "version.h"
+
+#ifndef GIT_COMMIT
+#define GIT_COMMIT "unspecified"
+#endif
+
+#ifndef GIT_TAG
+#define GIT_TAG ""
+#endif
+
+#ifndef BUILD_TIME
+#define BUILD_TIME "unspecified"
+#endif
+
+const char* CZ_get_git_commit(void) {
+    return GIT_COMMIT;
+}
+
+const char* CZ_get_git_tag(void) {
+    return GIT_TAG;
+}
+
+const char* CZ_get_build_time(void) {
+    return BUILD_TIME;
+}

vminitd/Sources/vminitd/AgentCommand.swift

@@ -15,6 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
+import CVersion
 import Cgroup
 import Containerization
 import ContainerizationError
@@ -67,7 +68,14 @@ struct AgentCommand: AsyncParsableCommand {
 
         signal(SIGPIPE, SIG_IGN)
 
-        log.info("vminitd booting", metadata: ["version": "\(Application.configuration.version)"])
+        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)
 
         // 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