logging: Remove unnecessary fields and use standard names

Ensure the entire codebase uses `"sandbox"` and `"container"` log
fields for the sandboxID and containerID respectively.

Simplify code where fields can be dropped.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>

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,
 	})
 }
 

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

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
 	}