Merge pull request containerd#10145 from thaJeztah/cri_startup_logs_step1

Maksym Pavlenko · web-flow · commit b3dd6e38608d · 2024-04-29T19:54:39.000Z
pkg/cri/server/base: use structured log for CRI plugin startup and log config as embedded JSON
diff --git a/plugins/cri/runtime/plugin.go b/plugins/cri/runtime/plugin.go
@@ -99,7 +99,9 @@ func initCRIRuntime(ic *plugin.InitContext) (interface{}, error) {
 		StateDir:           stateDir,
 	}
 
-	log.G(ctx).Infof("Start cri plugin with config %+v", c)
+	// Ignoring errors here; this should never fail.
+	cfg, _ := json.Marshal(c)
+	log.G(ctx).WithFields(log.Fields{"config": string(cfg)}).Info("starting cri plugin")
 
 	if err := setGLogLevel(); err != nil {
 		return nil, fmt.Errorf("failed to set glog level: %w", err)

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,9 @@ func initCRIRuntime(ic *plugin.InitContext) (interface{}, error) {`
`99`	`99`	`StateDir: stateDir,`
`100`	`100`	`}`
`101`	`101`
`102`		`- log.G(ctx).Infof("Start cri plugin with config %+v", c)`
	`102`	`+ // Ignoring errors here; this should never fail.`
	`103`	`+ cfg, _ := json.Marshal(c)`
	`104`	`+ log.G(ctx).WithFields(log.Fields{"config": string(cfg)}).Info("starting cri plugin")`
`103`	`105`
`104`	`106`	`if err := setGLogLevel(); err != nil {`
`105`	`107`	`return nil, fmt.Errorf("failed to set glog level: %w", err)`