diff --git a/virtcontainers/container.go b/virtcontainers/container.go index 941b7d3968..50b1094e86 100644 --- a/virtcontainers/container.go +++ b/virtcontainers/container.go @@ -264,9 +264,8 @@ func (c *Container) ID() string { // Logger returns a logrus logger appropriate for logging Container messages func (c *Container) Logger() *logrus.Entry { return virtLog.WithFields(logrus.Fields{ - "subsystem": "container", - "container-id": c.id, - "sandbox-id": c.sandboxID, + "subsystem": "container", + "sandbox": c.sandboxID, }) } diff --git a/virtcontainers/kata_agent.go b/virtcontainers/kata_agent.go index f442aabc1d..64e6aa4d5a 100644 --- a/virtcontainers/kata_agent.go +++ b/virtcontainers/kata_agent.go @@ -469,7 +469,7 @@ func (k *kataAgent) startProxy(sandbox *Sandbox) error { proxyParams := proxyParams{ agentURL: agentURL, - logger: k.Logger().WithField("sandbox-id", sandbox.id), + logger: k.Logger().WithField("sandbox", sandbox.id), } // Start the proxy here @@ -494,9 +494,9 @@ func (k *kataAgent) startProxy(sandbox *Sandbox) error { } k.Logger().WithFields(logrus.Fields{ - "sandbox-id": sandbox.id, - "proxy-pid": pid, - "proxy-url": uri, + "sandbox": sandbox.id, + "proxy-pid": pid, + "proxy-url": uri, }).Info("proxy started") return nil diff --git a/virtcontainers/sandbox.go b/virtcontainers/sandbox.go index b3339d252f..f0abcb7bfe 100644 --- a/virtcontainers/sandbox.go +++ b/virtcontainers/sandbox.go @@ -483,8 +483,8 @@ func (s *Sandbox) ID() string { // Logger returns a logrus logger appropriate for logging Sandbox messages func (s *Sandbox) Logger() *logrus.Entry { return virtLog.WithFields(logrus.Fields{ - "subsystem": "sandbox", - "sandbox-id": s.id, + "subsystem": "sandbox", + "sandbox": s.id, }) } @@ -827,7 +827,7 @@ func (s *Sandbox) storeSandbox() error { // fetchSandbox fetches a sandbox config from a sandbox ID and returns a sandbox. func fetchSandbox(sandboxID string) (sandbox *Sandbox, err error) { - virtLog.WithField("sandbox-id", sandboxID).Info("fetch sandbox") + virtLog.Info("fetch sandbox") if sandboxID == "" { return nil, errNeedSandboxID }