Skip to content

Vminitd: Adjust guest agent logs #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
crosbymichael merged 1 commit into from
Jun 10, 2025
Merged

Vminitd: Adjust guest agent logs #72

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 46 additions & 24 deletions vminitd/Sources/vminitd/Server+GRPC.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ extension Initd: Com_Apple_Containerization_Sandbox_V3_SandboxContextAsyncProvid
}
} catch {
log.error(
"deleteProcess",
"sysctl",
metadata: [
"error": "\(error)"
])
Expand All @@ -156,7 +156,7 @@ extension Initd: Com_Apple_Containerization_Sandbox_V3_SandboxContextAsyncProvid
context: GRPC.GRPCAsyncServerCallContext
) async throws -> Com_Apple_Containerization_Sandbox_V3_ProxyVsockResponse {
log.debug(
"proxy vsock",
"proxyVsock",
metadata: [
"id": "\(request.id)",
"port": "\(request.vsockPort)",
Expand Down Expand Up @@ -196,7 +196,7 @@ extension Initd: Com_Apple_Containerization_Sandbox_V3_SandboxContextAsyncProvid
context: GRPC.GRPCAsyncServerCallContext
) async throws -> Com_Apple_Containerization_Sandbox_V3_StopVsockProxyResponse {
log.debug(
"stop vsock proxy",
"stopVsockProxy",
metadata: [
"id": "\(request.id)"
])
Expand Down Expand Up @@ -286,7 +286,7 @@ extension Initd: Com_Apple_Containerization_Sandbox_V3_SandboxContextAsyncProvid
async throws -> Com_Apple_Containerization_Sandbox_V3_UmountResponse
{
log.debug(
"unmount",
"umount",
metadata: [
"path": "\(request.path)",
"flags": "\(request.flags)",
Expand All @@ -304,7 +304,7 @@ extension Initd: Com_Apple_Containerization_Sandbox_V3_SandboxContextAsyncProvid
let error = swiftErrno("umount")

log.error(
"unmount",
"umount",
metadata: [
"error": "\(error)"
])
Expand All @@ -314,7 +314,7 @@ extension Initd: Com_Apple_Containerization_Sandbox_V3_SandboxContextAsyncProvid
}
return .init()
#else
fatalError("unmount not supported on platform")
fatalError("umount not supported on platform")
#endif
}

Expand Down Expand Up @@ -363,7 +363,7 @@ extension Initd: Com_Apple_Containerization_Sandbox_V3_SandboxContextAsyncProvid
request: Com_Apple_Containerization_Sandbox_V3_CreateProcessRequest, context: GRPC.GRPCAsyncServerCallContext
) async throws -> Com_Apple_Containerization_Sandbox_V3_CreateProcessResponse {
log.debug(
"create process",
"createProcess",
metadata: [
"id": "\(request.id)",
"containerID": "\(request.containerID)",
Expand Down Expand Up @@ -437,9 +437,11 @@ extension Initd: Com_Apple_Containerization_Sandbox_V3_SandboxContextAsyncProvid
return .init()
} catch {
log.error(
"create managed process",
"createProcess",
metadata: [
"error": "\(error)"
"id": "\(request.id)",
"containerID": "\(request.containerID)",
"error": "\(error)",
])
if error is GRPCStatus {
throw error
Expand All @@ -453,9 +455,10 @@ extension Initd: Com_Apple_Containerization_Sandbox_V3_SandboxContextAsyncProvid
context: GRPC.GRPCAsyncServerCallContext
) async throws -> Com_Apple_Containerization_Sandbox_V3_KillProcessResponse {
log.debug(
"kill process",
"killProcess",
metadata: [
"id": "\(request.id)",
"containerID": "\(request.containerID)",
"signal": "\(request.signal)",
])

Expand All @@ -472,20 +475,18 @@ extension Initd: Com_Apple_Containerization_Sandbox_V3_SandboxContextAsyncProvid
try proc.kill(request.signal)
}

log.debug(
"kill process result",
metadata: [
"id": "\(request.id)",
"signal": "\(request.signal)",
])

return .init()
}

func deleteProcess(
request: Com_Apple_Containerization_Sandbox_V3_DeleteProcessRequest, context: GRPC.GRPCAsyncServerCallContext
) async throws -> Com_Apple_Containerization_Sandbox_V3_DeleteProcessResponse {
log.debug("delete process on port \(request.id)")
log.debug(
"deleteProcess",
metadata: [
"id": "\(request.id)",
"containerID": "\(request.containerID)",
])

if !request.hasContainerID {
fatalError("processes in the root of the vm not implemented")
Expand All @@ -508,7 +509,12 @@ extension Initd: Com_Apple_Containerization_Sandbox_V3_SandboxContextAsyncProvid
func startProcess(
request: Com_Apple_Containerization_Sandbox_V3_StartProcessRequest, context: GRPCAsyncServerCallContext
) async throws -> Com_Apple_Containerization_Sandbox_V3_StartProcessResponse {
log.debug("starting process \(request.id)")
log.debug(
"startProcess",
metadata: [
"id": "\(request.id)",
"containerID": "\(request.containerID)",
])

if !request.hasContainerID {
fatalError("processes in the root of the vm not implemented")
Expand All @@ -534,7 +540,9 @@ extension Initd: Com_Apple_Containerization_Sandbox_V3_SandboxContextAsyncProvid
log.error(
"startProcess",
metadata: [
"error": "\(error)"
"id": "\(request.id)",
"containerID": "\(request.containerID)",
"error": "\(error)",
])
throw GRPCStatus(
code: .internalError,
Expand All @@ -546,7 +554,12 @@ extension Initd: Com_Apple_Containerization_Sandbox_V3_SandboxContextAsyncProvid
func resizeProcess(
request: Com_Apple_Containerization_Sandbox_V3_ResizeProcessRequest, context: GRPCAsyncServerCallContext
) async throws -> Com_Apple_Containerization_Sandbox_V3_ResizeProcessResponse {
log.debug("resizing process pty \(request.id)")
log.debug(
"resizeProcess",
metadata: [
"id": "\(request.id)",
"containerID": "\(request.containerID)",
])

if !request.hasContainerID {
fatalError("processes in the root of the vm not implemented")
Expand All @@ -566,7 +579,9 @@ extension Initd: Com_Apple_Containerization_Sandbox_V3_SandboxContextAsyncProvid
log.error(
"resizeProcess",
metadata: [
"error": "\(error)"
"id": "\(request.id)",
"containerID": "\(request.containerID)",
"error": "\(error)",
])
throw GRPCStatus(
code: .internalError,
Expand All @@ -580,7 +595,12 @@ extension Initd: Com_Apple_Containerization_Sandbox_V3_SandboxContextAsyncProvid
func waitProcess(
request: Com_Apple_Containerization_Sandbox_V3_WaitProcessRequest, context: GRPCAsyncServerCallContext
) async throws -> Com_Apple_Containerization_Sandbox_V3_WaitProcessResponse {
log.debug("waiting on process \(request.id)")
log.debug(
"waitProcess",
metadata: [
"id": "\(request.id)",
"containerID": "\(request.containerID)",
])

if !request.hasContainerID {
fatalError("processes in the root of the vm not implemented")
Expand All @@ -604,7 +624,9 @@ extension Initd: Com_Apple_Containerization_Sandbox_V3_SandboxContextAsyncProvid
log.error(
"waitProcess",
metadata: [
"error": "\(error)"
"id": "\(request.id)",
"containerID": "\(request.containerID)",
"error": "\(error)",
])
throw GRPCStatus(
code: .internalError,
Expand Down