Cleanup logrus imports

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>

pkg/cri/io/container_io.go

@@ -23,6 +23,7 @@ import (
 	"sync"
 
 	"github.com/containerd/containerd/cio"
+	"github.com/containerd/containerd/log"
 	"github.com/sirupsen/logrus"
 
 	"github.com/containerd/containerd/pkg/cri/util"
@@ -109,12 +110,12 @@ func (c *ContainerIO) Pipe() {
 		wg.Add(1)
 		go func() {
 			if _, err := io.Copy(c.stdoutGroup, c.stdout); err != nil {
-				logrus.WithError(err).Errorf("Failed to pipe stdout of container %q", c.id)
+				log.L.WithError(err).Errorf("Failed to pipe stdout of container %q", c.id)
 			}
 			c.stdout.Close()
 			c.stdoutGroup.Close()
 			wg.Done()
-			logrus.Debugf("Finish piping stdout of container %q", c.id)
+			log.L.Debugf("Finish piping stdout of container %q", c.id)
 		}()
 	}
 
@@ -122,12 +123,12 @@ func (c *ContainerIO) Pipe() {
 		wg.Add(1)
 		go func() {
 			if _, err := io.Copy(c.stderrGroup, c.stderr); err != nil {
-				logrus.WithError(err).Errorf("Failed to pipe stderr of container %q", c.id)
+				log.L.WithError(err).Errorf("Failed to pipe stderr of container %q", c.id)
 			}
 			c.stderr.Close()
 			c.stderrGroup.Close()
 			wg.Done()
-			logrus.Debugf("Finish piping stderr of container %q", c.id)
+			log.L.Debugf("Finish piping stderr of container %q", c.id)
 		}()
 	}
 }
@@ -150,9 +151,9 @@ func (c *ContainerIO) Attach(opts AttachOptions) {
 		wg.Add(1)
 		go func() {
 			if _, err := io.Copy(c.stdin, stdinStreamRC); err != nil {
-				logrus.WithError(err).Errorf("Failed to pipe stdin for container attach %q", c.id)
+				log.L.WithError(err).Errorf("Failed to pipe stdin for container attach %q", c.id)
 			}
-			logrus.Infof("Attach stream %q closed", stdinKey)
+			log.L.Infof("Attach stream %q closed", stdinKey)
 			if opts.StdinOnce && !opts.Tty {
 				// Due to kubectl requirements and current docker behavior, when (opts.StdinOnce &&
 				// opts.Tty) we have to close container stdin and keep stdout and stderr open until

pkg/cri/io/exec_io.go

@@ -21,8 +21,7 @@ import (
 	"sync"
 
 	"github.com/containerd/containerd/cio"
-	"github.com/sirupsen/logrus"
-
+	"github.com/containerd/containerd/log"
 	cioutil "github.com/containerd/containerd/pkg/ioutil"
 )
 
@@ -68,13 +67,13 @@ func (e *ExecIO) Attach(opts AttachOptions) <-chan struct{} {
 		wg.Add(1)
 		go func() {
 			if _, err := io.Copy(e.stdin, stdinStreamRC); err != nil {
-				logrus.WithError(err).Errorf("Failed to redirect stdin for container exec %q", e.id)
+				log.L.WithError(err).Errorf("Failed to redirect stdin for container exec %q", e.id)
 			}
-			logrus.Infof("Container exec %q stdin closed", e.id)
+			log.L.Infof("Container exec %q stdin closed", e.id)
 			if opts.StdinOnce && !opts.Tty {
 				e.stdin.Close()
 				if err := opts.CloseStdin(); err != nil {
-					logrus.WithError(err).Errorf("Failed to close stdin for container exec %q", e.id)
+					log.L.WithError(err).Errorf("Failed to close stdin for container exec %q", e.id)
 				}
 			} else {
 				if e.stdout != nil {
@@ -90,7 +89,7 @@ func (e *ExecIO) Attach(opts AttachOptions) <-chan struct{} {
 
 	attachOutput := func(t StreamType, stream io.WriteCloser, out io.ReadCloser) {
 		if _, err := io.Copy(stream, out); err != nil {
-			logrus.WithError(err).Errorf("Failed to pipe %q for container exec %q", t, e.id)
+			log.L.WithError(err).Errorf("Failed to pipe %q for container exec %q", t, e.id)
 		}
 		out.Close()
 		stream.Close()
@@ -99,7 +98,7 @@ func (e *ExecIO) Attach(opts AttachOptions) <-chan struct{} {
 		}
 		e.closer.wg.Done()
 		wg.Done()
-		logrus.Debugf("Finish piping %q of container exec %q", t, e.id)
+		log.L.Debugf("Finish piping %q of container exec %q", t, e.id)
 	}
 
 	if opts.Stdout != nil {

pkg/cri/opts/spec_linux.go

@@ -28,7 +28,6 @@ import (
 
 	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
 	"github.com/containerd/cgroups/v3"
-	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
 
 	"github.com/containerd/containerd/containers"
@@ -53,14 +52,14 @@ func SwapControllerAvailable() bool {
 			_, unified, err := cgroups.ParseCgroupFileUnified("/proc/self/cgroup")
 			if err != nil {
 				err = fmt.Errorf("failed to parse /proc/self/cgroup: %w", err)
-				logrus.WithError(err).Warn(warn)
+				log.L.WithError(err).Warn(warn)
 				return
 			}
 			p = filepath.Join("/sys/fs/cgroup", unified, "memory.swap.max")
 		}
 		if _, err := os.Stat(p); err != nil {
 			if !errors.Is(err, os.ErrNotExist) {
-				logrus.WithError(err).Warn(warn)
+				log.L.WithError(err).Warn(warn)
 			}
 			return
 		}

pkg/cri/opts/spec_linux_opts.go

@@ -29,7 +29,6 @@ import (
 
 	runtimespec "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/opencontainers/selinux/go-selinux/label"
-	"github.com/sirupsen/logrus"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 
 	"github.com/containerd/containerd/containers"
@@ -347,7 +346,7 @@ func WithResources(resources *runtime.LinuxContainerResources, tolerateMissingHu
 					return errors.New("huge pages limits are specified but hugetlb cgroup controller is missing. " +
 						"Please set tolerate_missing_hugetlb_controller to `true` to ignore this error")
 				}
-				logrus.Warn("hugetlb cgroup controller is absent. skipping huge pages limits")
+				log.L.Warn("hugetlb cgroup controller is absent. skipping huge pages limits")
 			}
 		}
 

pkg/cri/sbserver/blockio_linux.go

@@ -21,8 +21,7 @@ package sbserver
 import (
 	"fmt"
 
-	"github.com/sirupsen/logrus"
-
+	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/pkg/blockio"
 )
 
@@ -37,7 +36,7 @@ func (c *criService) blockIOClassFromAnnotations(containerName string, container
 	if cls != "" && !blockio.IsEnabled() {
 		if c.config.ContainerdConfig.IgnoreBlockIONotEnabledErrors {
 			cls = ""
-			logrus.Debugf("continuing create container %s, ignoring blockio not enabled (%v)", containerName, err)
+			log.L.Debugf("continuing create container %s, ignoring blockio not enabled (%v)", containerName, err)
 		} else {
 			return "", fmt.Errorf("blockio disabled, refusing to set blockio class of container %q to %q", containerName, cls)
 		}

pkg/cri/sbserver/cni_conf_syncer.go

@@ -22,9 +22,9 @@ import (
 	"path/filepath"
 	"sync"
 
+	"github.com/containerd/containerd/log"
 	"github.com/containerd/go-cni"
 	"github.com/fsnotify/fsnotify"
-	"github.com/sirupsen/logrus"
 )
 
 // cniNetConfSyncer is used to reload cni network conf triggered by fs change
@@ -70,7 +70,7 @@ func newCNINetConfSyncer(confDir string, netPlugin cni.CNI, loadOpts []cni.Opt)
 	}
 
 	if err := syncer.netPlugin.Load(syncer.loadOpts...); err != nil {
-		logrus.WithError(err).Error("failed to load cni during init, please check CRI plugin status before setting up network for pods")
+		log.L.WithError(err).Error("failed to load cni during init, please check CRI plugin status before setting up network for pods")
 		syncer.updateLastStatus(err)
 	}
 	return syncer, nil
@@ -83,7 +83,7 @@ func (syncer *cniNetConfSyncer) syncLoop() error {
 		select {
 		case event, ok := <-syncer.watcher.Events:
 			if !ok {
-				logrus.Debugf("cni watcher channel is closed")
+				log.L.Debugf("cni watcher channel is closed")
 				return nil
 			}
 			// Only reload config when receiving write/rename/remove
@@ -92,21 +92,21 @@ func (syncer *cniNetConfSyncer) syncLoop() error {
 			// TODO(fuweid): Might only reload target cni config
 			// files to prevent no-ops.
 			if event.Has(fsnotify.Chmod) || event.Has(fsnotify.Create) {
-				logrus.Debugf("ignore event from cni conf dir: %s", event)
+				log.L.Debugf("ignore event from cni conf dir: %s", event)
 				continue
 			}
-			logrus.Debugf("receiving change event from cni conf dir: %s", event)
+			log.L.Debugf("receiving change event from cni conf dir: %s", event)
 
 			lerr := syncer.netPlugin.Load(syncer.loadOpts...)
 			if lerr != nil {
-				logrus.WithError(lerr).
+				log.L.WithError(lerr).
 					Errorf("failed to reload cni configuration after receiving fs change event(%s)", event)
 			}
 			syncer.updateLastStatus(lerr)
 
 		case err := <-syncer.watcher.Errors:
 			if err != nil {
-				logrus.WithError(err).Error("failed to continue sync cni conf change")
+				log.L.WithError(err).Error("failed to continue sync cni conf change")
 				return err
 			}
 		}

pkg/cri/sbserver/container_remove.go

@@ -26,7 +26,6 @@ import (
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/log"
 	containerstore "github.com/containerd/containerd/pkg/cri/store/container"
-	"github.com/sirupsen/logrus"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
@@ -62,7 +61,7 @@ func (c *criService) RemoveContainer(ctx context.Context, r *runtime.RemoveConta
 	state := container.Status.Get().State()
 	if state == runtime.ContainerState_CONTAINER_RUNNING ||
 		state == runtime.ContainerState_CONTAINER_UNKNOWN {
-		logrus.Infof("Forcibly stopping container %q", id)
+		log.L.Infof("Forcibly stopping container %q", id)
 		if err := c.stopContainer(ctx, container, 0); err != nil {
 			return nil, fmt.Errorf("failed to forcibly stop container %q: %w", id, err)
 		}

pkg/cri/sbserver/container_start.go

@@ -27,7 +27,6 @@ import (
 	containerdio "github.com/containerd/containerd/cio"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/log"
-	"github.com/sirupsen/logrus"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 
 	cio "github.com/containerd/containerd/pkg/cri/io"
@@ -242,7 +241,7 @@ func (c *criService) createContainerLoggers(logPath string, tty bool) (stdout io
 			if stderrCh != nil {
 				<-stderrCh
 			}
-			logrus.Debugf("Finish redirecting log file %q, closing it", logPath)
+			log.L.Debugf("Finish redirecting log file %q, closing it", logPath)
 			f.Close()
 		}()
 	} else {

pkg/cri/sbserver/events.go

@@ -28,13 +28,13 @@ import (
 	containerdio "github.com/containerd/containerd/cio"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/events"
+	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/pkg/cri/constants"
 	containerstore "github.com/containerd/containerd/pkg/cri/store/container"
 	sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox"
 	ctrdutil "github.com/containerd/containerd/pkg/cri/util"
 	"github.com/containerd/containerd/protobuf"
 	"github.com/containerd/typeurl/v2"
-	"github.com/sirupsen/logrus"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 	"k8s.io/utils/clock"
 )
@@ -115,7 +115,7 @@ func (em *eventMonitor) startSandboxExitMonitor(ctx context.Context, id string,
 		case exitRes := <-exitCh:
 			exitStatus, exitedAt, err := exitRes.Result()
 			if err != nil {
-				logrus.WithError(err).Errorf("failed to get task exit status for %q", id)
+				log.L.WithError(err).Errorf("failed to get task exit status for %q", id)
 				exitStatus = unknownExitCode
 				exitedAt = time.Now()
 			}
@@ -128,7 +128,7 @@ func (em *eventMonitor) startSandboxExitMonitor(ctx context.Context, id string,
 				ExitedAt:    protobuf.ToTimestamp(exitedAt),
 			}
 
-			logrus.Debugf("received exit event %+v", e)
+			log.L.Debugf("received exit event %+v", e)
 
 			err = func() error {
 				dctx := ctrdutil.NamespacedContext()
@@ -147,7 +147,7 @@ func (em *eventMonitor) startSandboxExitMonitor(ctx context.Context, id string,
 				return nil
 			}()
 			if err != nil {
-				logrus.WithError(err).Errorf("failed to handle sandbox TaskExit event %+v", e)
+				log.L.WithError(err).Errorf("failed to handle sandbox TaskExit event %+v", e)
 				em.backOff.enBackOff(id, e)
 			}
 			return
@@ -166,7 +166,7 @@ func (em *eventMonitor) startContainerExitMonitor(ctx context.Context, id string
 		case exitRes := <-exitCh:
 			exitStatus, exitedAt, err := exitRes.Result()
 			if err != nil {
-				logrus.WithError(err).Errorf("failed to get task exit status for %q", id)
+				log.L.WithError(err).Errorf("failed to get task exit status for %q", id)
 				exitStatus = unknownExitCode
 				exitedAt = time.Now()
 			}
@@ -179,7 +179,7 @@ func (em *eventMonitor) startContainerExitMonitor(ctx context.Context, id string
 				ExitedAt:    protobuf.ToTimestamp(exitedAt),
 			}
 
-			logrus.Debugf("received exit event %+v", e)
+			log.L.Debugf("received exit event %+v", e)
 
 			err = func() error {
 				dctx := ctrdutil.NamespacedContext()
@@ -198,7 +198,7 @@ func (em *eventMonitor) startContainerExitMonitor(ctx context.Context, id string
 				return nil
 			}()
 			if err != nil {
-				logrus.WithError(err).Errorf("failed to handle container TaskExit event %+v", e)
+				log.L.WithError(err).Errorf("failed to handle container TaskExit event %+v", e)
 				em.backOff.enBackOff(id, e)
 			}
 			return
@@ -251,29 +251,29 @@ func (em *eventMonitor) start() <-chan error {
 		for {
 			select {
 			case e := <-em.ch:
-				logrus.Debugf("Received containerd event timestamp - %v, namespace - %q, topic - %q", e.Timestamp, e.Namespace, e.Topic)
+				log.L.Debugf("Received containerd event timestamp - %v, namespace - %q, topic - %q", e.Timestamp, e.Namespace, e.Topic)
 				if e.Namespace != constants.K8sContainerdNamespace {
-					logrus.Debugf("Ignoring events in namespace - %q", e.Namespace)
+					log.L.Debugf("Ignoring events in namespace - %q", e.Namespace)
 					break
 				}
 				id, evt, err := convertEvent(e.Event)
 				if err != nil {
-					logrus.WithError(err).Errorf("Failed to convert event %+v", e)
+					log.L.WithError(err).Errorf("Failed to convert event %+v", e)
 					break
 				}
 				if em.backOff.isInBackOff(id) {
-					logrus.Infof("Events for %q is in backoff, enqueue event %+v", id, evt)
+					log.L.Infof("Events for %q is in backoff, enqueue event %+v", id, evt)
 					em.backOff.enBackOff(id, evt)
 					break
 				}
 				if err := em.handleEvent(evt); err != nil {
-					logrus.WithError(err).Errorf("Failed to handle event %+v for %s", evt, id)
+					log.L.WithError(err).Errorf("Failed to handle event %+v for %s", evt, id)
 					em.backOff.enBackOff(id, evt)
 				}
 			case err := <-em.errCh:
 				// Close errCh in defer directly if there is no error.
 				if err != nil {
-					logrus.WithError(err).Error("Failed to handle event stream")
+					log.L.WithError(err).Error("Failed to handle event stream")
 					errCh <- err
 				}
 				return
@@ -283,7 +283,7 @@ func (em *eventMonitor) start() <-chan error {
 					queue := em.backOff.deBackOff(id)
 					for i, any := range queue.events {
 						if err := em.handleEvent(any); err != nil {
-							logrus.WithError(err).Errorf("Failed to handle backOff event %+v for %s", any, id)
+							log.L.WithError(err).Errorf("Failed to handle backOff event %+v for %s", any, id)
 							em.backOff.reBackOff(id, queue.events[i:], queue.duration)
 							break
 						}
@@ -310,7 +310,7 @@ func (em *eventMonitor) handleEvent(any interface{}) error {
 
 	switch e := any.(type) {
 	case *eventtypes.TaskExit:
-		logrus.Infof("TaskExit event %+v", e)
+		log.L.Infof("TaskExit event %+v", e)
 		// Use ID instead of ContainerID to rule out TaskExit event for exec.
 		cntr, err := em.c.containerStore.Get(e.ID)
 		if err == nil {
@@ -332,7 +332,7 @@ func (em *eventMonitor) handleEvent(any interface{}) error {
 		}
 		return nil
 	case *eventtypes.TaskOOM:
-		logrus.Infof("TaskOOM event %+v", e)
+		log.L.Infof("TaskOOM event %+v", e)
 		// For TaskOOM, we only care which container it belongs to.
 		cntr, err := em.c.containerStore.Get(e.ContainerID)
 		if err != nil {
@@ -349,13 +349,13 @@ func (em *eventMonitor) handleEvent(any interface{}) error {
 			return fmt.Errorf("failed to update container status for TaskOOM event: %w", err)
 		}
 	case *eventtypes.ImageCreate:
-		logrus.Infof("ImageCreate event %+v", e)
+		log.L.Infof("ImageCreate event %+v", e)
 		return em.c.UpdateImage(ctx, e.Name)
 	case *eventtypes.ImageUpdate:
-		logrus.Infof("ImageUpdate event %+v", e)
+		log.L.Infof("ImageUpdate event %+v", e)
 		return em.c.UpdateImage(ctx, e.Name)
 	case *eventtypes.ImageDelete:
-		logrus.Infof("ImageDelete event %+v", e)
+		log.L.Infof("ImageDelete event %+v", e)
 		return em.c.UpdateImage(ctx, e.Name)
 	}
 
@@ -402,7 +402,7 @@ func handleContainerExit(ctx context.Context, e *eventtypes.TaskExit, cntr conta
 		// Unknown state can only transit to EXITED state, so we need
 		// to handle unknown state here.
 		if status.Unknown {
-			logrus.Debugf("Container %q transited from UNKNOWN to EXITED", cntr.ID)
+			log.L.Debugf("Container %q transited from UNKNOWN to EXITED", cntr.ID)
 			status.Unknown = false
 		}
 		return status, nil

pkg/cri/sbserver/helpers.go

@@ -27,14 +27,17 @@ import (
 	"strings"
 	"time"
 
+	runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
 	"github.com/containerd/typeurl/v2"
 	runtimespec "github.com/opencontainers/runtime-spec/specs-go"
-	"github.com/sirupsen/logrus"
+	"github.com/pelletier/go-toml"
+	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 
 	"github.com/containerd/containerd"
 	"github.com/containerd/containerd/containers"
 	"github.com/containerd/containerd/errdefs"
 	clabels "github.com/containerd/containerd/labels"
+	"github.com/containerd/containerd/log"
 	criconfig "github.com/containerd/containerd/pkg/cri/config"
 	containerstore "github.com/containerd/containerd/pkg/cri/store/container"
 	imagestore "github.com/containerd/containerd/pkg/cri/store/image"
@@ -42,10 +45,6 @@ import (
 	runtimeoptions "github.com/containerd/containerd/pkg/runtimeoptions/v1"
 	"github.com/containerd/containerd/plugin"
 	runcoptions "github.com/containerd/containerd/runtime/v2/runc/options"
-
-	runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
-	"github.com/pelletier/go-toml"
-	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
 // TODO: Move common helpers for sbserver and podsandbox to a dedicated package once basic services are functinal.
@@ -254,7 +253,7 @@ func buildLabels(configLabels, imageConfigLabels map[string]string, containerTyp
 		} else {
 			// In case the image label is invalid, we output a warning and skip adding it to the
 			// container.
-			logrus.WithError(err).Warnf("unable to add image label with key %s to the container", k)
+			log.L.WithError(err).Warnf("unable to add image label with key %s to the container", k)
 		}
 	}
 	// labels from the CRI request (config) will override labels in the image config
@@ -448,12 +447,12 @@ func copyResourcesToStatus(spec *runtimespec.Spec, status containerstore.Status)
 func (c *criService) generateAndSendContainerEvent(ctx context.Context, containerID string, sandboxID string, eventType runtime.ContainerEventType) {
 	podSandboxStatus, err := c.getPodSandboxStatus(ctx, sandboxID)
 	if err != nil {
-		logrus.Warnf("Failed to get podSandbox status for container event for sandboxID %q: %v. Sending the event with nil podSandboxStatus.", sandboxID, err)
+		log.G(ctx).Warnf("Failed to get podSandbox status for container event for sandboxID %q: %v. Sending the event with nil podSandboxStatus.", sandboxID, err)
 		podSandboxStatus = nil
 	}
 	containerStatuses, err := c.getContainerStatuses(ctx, sandboxID)
 	if err != nil {
-		logrus.Errorf("Failed to get container statuses for container event for sandboxID %q: %v", sandboxID, err)
+		log.G(ctx).Errorf("Failed to get container statuses for container event for sandboxID %q: %v", sandboxID, err)
 	}
 
 	event := runtime.ContainerEventResponse{
@@ -468,7 +467,7 @@ func (c *criService) generateAndSendContainerEvent(ctx context.Context, containe
 	select {
 	case c.containerEventsChan <- event:
 	default:
-		logrus.Debugf("containerEventsChan is full, discarding event %+v", event)
+		log.G(ctx).Debugf("containerEventsChan is full, discarding event %+v", event)
 	}
 }
 

pkg/cri/sbserver/images/snapshots.go

@@ -22,11 +22,10 @@ import (
 	"time"
 
 	"github.com/containerd/containerd/errdefs"
-	snapshot "github.com/containerd/containerd/snapshots"
-	"github.com/sirupsen/logrus"
-
+	"github.com/containerd/containerd/log"
 	snapshotstore "github.com/containerd/containerd/pkg/cri/store/snapshot"
 	ctrdutil "github.com/containerd/containerd/pkg/cri/util"
+	snapshot "github.com/containerd/containerd/snapshots"
 )
 
 // snapshotsSyncer syncs snapshot stats periodically. imagefs info and container stats
@@ -60,7 +59,7 @@ func (s *snapshotsSyncer) start() {
 		// check the resource usage and optimize this.
 		for {
 			if err := s.sync(); err != nil {
-				logrus.WithError(err).Error("Failed to sync snapshot stats")
+				log.L.WithError(err).Error("Failed to sync snapshot stats")
 			}
 			<-tick.C
 		}
@@ -101,7 +100,7 @@ func (s *snapshotsSyncer) sync() error {
 		usage, err := s.snapshotter.Usage(ctx, info.Name)
 		if err != nil {
 			if !errdefs.IsNotFound(err) {
-				logrus.WithError(err).Errorf("Failed to get usage for snapshot %q", info.Name)
+				log.L.WithError(err).Errorf("Failed to get usage for snapshot %q", info.Name)
 			}
 			continue
 		}

pkg/cri/sbserver/podsandbox/controller.go

@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/sirupsen/logrus"
+	"github.com/containerd/containerd/log"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 
 	"github.com/containerd/containerd"
@@ -122,11 +122,11 @@ func (c *Controller) waitSandboxExit(ctx context.Context, id string, exitCh <-ch
 	exitedAt = time.Now()
 	select {
 	case exitRes := <-exitCh:
-		logrus.Debugf("received sandbox exit %+v", exitRes)
+		log.G(ctx).Debugf("received sandbox exit %+v", exitRes)
 
 		exitStatus, exitedAt, err = exitRes.Result()
 		if err != nil {
-			logrus.WithError(err).Errorf("failed to get task exit status for %q", id)
+			log.G(ctx).WithError(err).Errorf("failed to get task exit status for %q", id)
 			exitStatus = unknownExitCode
 			exitedAt = time.Now()
 		}
@@ -148,7 +148,7 @@ func (c *Controller) waitSandboxExit(ctx context.Context, id string, exitCh <-ch
 			return nil
 		}()
 		if err != nil {
-			logrus.WithError(err).Errorf("failed to handle sandbox TaskExit %s", id)
+			log.G(ctx).WithError(err).Errorf("failed to handle sandbox TaskExit %s", id)
 			// Don't backoff, the caller is responsible for.
 			return
 		}

pkg/cri/sbserver/rdt.go

@@ -21,8 +21,7 @@ package sbserver
 import (
 	"fmt"
 
-	"github.com/sirupsen/logrus"
-
+	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/pkg/rdt"
 )
 
@@ -40,7 +39,7 @@ func (c *criService) rdtClassFromAnnotations(containerName string, containerAnno
 
 	if err != nil {
 		if !rdt.IsEnabled() && c.config.ContainerdConfig.IgnoreRdtNotEnabledErrors {
-			logrus.Debugf("continuing create container %s, ignoring rdt not enabled (%v)", containerName, err)
+			log.L.Debugf("continuing create container %s, ignoring rdt not enabled (%v)", containerName, err)
 			return "", nil
 		}
 		return "", err

pkg/cri/sbserver/sandbox_remove.go

@@ -24,7 +24,6 @@ import (
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/log"
 
-	"github.com/sirupsen/logrus"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
@@ -49,7 +48,7 @@ func (c *criService) RemovePodSandbox(ctx context.Context, r *runtime.RemovePodS
 	// If the sandbox is still running, not ready, or in an unknown state, forcibly stop it.
 	// Even if it's in a NotReady state, this will close its network namespace, if open.
 	// This can happen if the task process associated with the Pod died or it was killed.
-	logrus.Infof("Forcibly stopping sandbox %q", id)
+	log.G(ctx).Infof("Forcibly stopping sandbox %q", id)
 	if err := c.stopPodSandbox(ctx, sandbox); err != nil {
 		return nil, fmt.Errorf("failed to forcibly stop sandbox %q: %w", id, err)
 	}

pkg/cri/sbserver/sandbox_run.go

@@ -29,7 +29,6 @@ import (
 	"github.com/containerd/go-cni"
 	"github.com/containerd/typeurl/v2"
 	"github.com/hashicorp/go-multierror"
-	"github.com/sirupsen/logrus"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 
 	"github.com/containerd/containerd"
@@ -598,7 +597,7 @@ func (c *criService) getSandboxController(config *runtime.PodSandboxConfig, runt
 }
 
 func logDebugCNIResult(ctx context.Context, sandboxID string, result *cni.Result) {
-	if logrus.GetLevel() < logrus.DebugLevel {
+	if log.GetLevel() < log.DebugLevel {
 		return
 	}
 	cniResult, err := json.Marshal(result)

pkg/cri/sbserver/service.go

@@ -28,6 +28,7 @@ import (
 	"sync/atomic"
 
 	"github.com/containerd/containerd"
+	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/oci"
 	"github.com/containerd/containerd/pkg/cri/instrument"
 	"github.com/containerd/containerd/pkg/cri/nri"
@@ -39,7 +40,6 @@ import (
 	"github.com/containerd/containerd/plugin"
 	"github.com/containerd/containerd/sandbox"
 	"github.com/containerd/go-cni"
-	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 
@@ -140,7 +140,7 @@ func NewCRIService(config criconfig.Config, client *containerd.Client, nri *nri.
 	}
 
 	imageFSPath := imageFSPath(config.ContainerdRootDir, config.ContainerdConfig.Snapshotter)
-	logrus.Infof("Get image filesystem path %q", imageFSPath)
+	log.L.Infof("Get image filesystem path %q", imageFSPath)
 
 	// TODO: expose this as a separate containerd plugin.
 	imageService, err := images.NewService(config, imageFSPath, client)
@@ -238,16 +238,16 @@ func (c *criService) RegisterTCP(s *grpc.Server) error {
 
 // Run starts the CRI service.
 func (c *criService) Run() error {
-	logrus.Info("Start subscribing containerd event")
+	log.L.Info("Start subscribing containerd event")
 	c.eventMonitor.subscribe(c.client)
 
-	logrus.Infof("Start recovering state")
+	log.L.Infof("Start recovering state")
 	if err := c.recover(ctrdutil.NamespacedContext()); err != nil {
 		return fmt.Errorf("failed to recover state: %w", err)
 	}
 
 	// Start event handler.
-	logrus.Info("Start event monitor")
+	log.L.Info("Start event monitor")
 	eventMonitorErrCh := c.eventMonitor.start()
 
 	// Start CNI network conf syncers
@@ -255,7 +255,7 @@ func (c *criService) Run() error {
 	var netSyncGroup sync.WaitGroup
 	for name, h := range c.cniNetConfMonitor {
 		netSyncGroup.Add(1)
-		logrus.Infof("Start cni network conf syncer for %s", name)
+		log.L.Infof("Start cni network conf syncer for %s", name)
 		go func(h *cniNetConfSyncer) {
 			cniNetConfMonitorErrCh <- h.syncLoop()
 			netSyncGroup.Done()
@@ -274,12 +274,12 @@ func (c *criService) Run() error {
 	}
 
 	// Start streaming server.
-	logrus.Info("Start streaming server")
+	log.L.Info("Start streaming server")
 	streamServerErrCh := make(chan error)
 	go func() {
 		defer close(streamServerErrCh)
 		if err := c.streamServer.Start(true); err != nil && err != http.ErrServerClosed {
-			logrus.WithError(err).Error("Failed to start streaming server")
+			log.L.WithError(err).Error("Failed to start streaming server")
 			streamServerErrCh <- err
 		}
 	}()
@@ -307,11 +307,11 @@ func (c *criService) Run() error {
 	if err := <-eventMonitorErrCh; err != nil {
 		eventMonitorErr = err
 	}
-	logrus.Info("Event monitor stopped")
+	log.L.Info("Event monitor stopped")
 	if err := <-streamServerErrCh; err != nil {
 		streamServerErr = err
 	}
-	logrus.Info("Stream server stopped")
+	log.L.Info("Stream server stopped")
 	if eventMonitorErr != nil {
 		return fmt.Errorf("event monitor error: %w", eventMonitorErr)
 	}
@@ -327,10 +327,10 @@ func (c *criService) Run() error {
 // Close stops the CRI service.
 // TODO(random-liu): Make close synchronous.
 func (c *criService) Close() error {
-	logrus.Info("Stop CRI service")
+	log.L.Info("Stop CRI service")
 	for name, h := range c.cniNetConfMonitor {
 		if err := h.stop(); err != nil {
-			logrus.WithError(err).Errorf("failed to stop cni network conf monitor for %s", name)
+			log.L.WithError(err).Errorf("failed to stop cni network conf monitor for %s", name)
 		}
 	}
 	c.eventMonitor.stop()

pkg/cri/sbserver/service_linux.go

@@ -20,11 +20,12 @@ import (
 	"fmt"
 
 	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
+	"github.com/opencontainers/selinux/go-selinux"
+
+	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/pkg/cap"
 	"github.com/containerd/containerd/pkg/userns"
 	"github.com/containerd/go-cni"
-	"github.com/opencontainers/selinux/go-selinux"
-	"github.com/sirupsen/logrus"
 )
 
 // networkAttachCount is the minimum number of networks the PodSandbox
@@ -35,13 +36,13 @@ const networkAttachCount = 2
 func (c *criService) initPlatform() (err error) {
 	if userns.RunningInUserNS() {
 		if !(c.config.DisableCgroup && !c.apparmorEnabled() && c.config.RestrictOOMScoreAdj) {
-			logrus.Warn("Running containerd in a user namespace typically requires disable_cgroup, disable_apparmor, restrict_oom_score_adj set to be true")
+			log.L.Warn("Running containerd in a user namespace typically requires disable_cgroup, disable_apparmor, restrict_oom_score_adj set to be true")
 		}
 	}
 
 	if c.config.EnableSelinux {
 		if !selinux.GetEnabled() {
-			logrus.Warn("Selinux is not supported")
+			log.L.Warn("Selinux is not supported")
 		}
 		if r := c.config.SelinuxCategoryRange; r > 0 {
 			selinux.CategoryRange = uint32(r)

pkg/cri/server/blockio_linux.go

@@ -21,8 +21,7 @@ package server
 import (
 	"fmt"
 
-	"github.com/sirupsen/logrus"
-
+	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/pkg/blockio"
 )
 
@@ -37,7 +36,7 @@ func (c *criService) blockIOClassFromAnnotations(containerName string, container
 	if cls != "" && !blockio.IsEnabled() {
 		if c.config.ContainerdConfig.IgnoreBlockIONotEnabledErrors {
 			cls = ""
-			logrus.Debugf("continuing create container %s, ignoring blockio not enabled (%v)", containerName, err)
+			log.L.Debugf("continuing create container %s, ignoring blockio not enabled (%v)", containerName, err)
 		} else {
 			return "", fmt.Errorf("blockio disabled, refusing to set blockio class of container %q to %q", containerName, cls)
 		}

pkg/cri/server/cni_conf_syncer.go

@@ -22,9 +22,9 @@ import (
 	"path/filepath"
 	"sync"
 
+	"github.com/containerd/containerd/log"
 	cni "github.com/containerd/go-cni"
 	"github.com/fsnotify/fsnotify"
-	"github.com/sirupsen/logrus"
 )
 
 // cniNetConfSyncer is used to reload cni network conf triggered by fs change
@@ -70,7 +70,7 @@ func newCNINetConfSyncer(confDir string, netPlugin cni.CNI, loadOpts []cni.Opt)
 	}
 
 	if err := syncer.netPlugin.Load(syncer.loadOpts...); err != nil {
-		logrus.WithError(err).Error("failed to load cni during init, please check CRI plugin status before setting up network for pods")
+		log.L.WithError(err).Error("failed to load cni during init, please check CRI plugin status before setting up network for pods")
 		syncer.updateLastStatus(err)
 	}
 	return syncer, nil
@@ -83,7 +83,7 @@ func (syncer *cniNetConfSyncer) syncLoop() error {
 		select {
 		case event, ok := <-syncer.watcher.Events:
 			if !ok {
-				logrus.Debugf("cni watcher channel is closed")
+				log.L.Debugf("cni watcher channel is closed")
 				return nil
 			}
 			// Only reload config when receiving write/rename/remove
@@ -92,21 +92,21 @@ func (syncer *cniNetConfSyncer) syncLoop() error {
 			// TODO(fuweid): Might only reload target cni config
 			// files to prevent no-ops.
 			if event.Has(fsnotify.Chmod) || event.Has(fsnotify.Create) {
-				logrus.Debugf("ignore event from cni conf dir: %s", event)
+				log.L.Debugf("ignore event from cni conf dir: %s", event)
 				continue
 			}
-			logrus.Debugf("receiving change event from cni conf dir: %s", event)
+			log.L.Debugf("receiving change event from cni conf dir: %s", event)
 
 			lerr := syncer.netPlugin.Load(syncer.loadOpts...)
 			if lerr != nil {
-				logrus.WithError(lerr).
+				log.L.WithError(lerr).
 					Errorf("failed to reload cni configuration after receiving fs change event(%s)", event)
 			}
 			syncer.updateLastStatus(lerr)
 
 		case err := <-syncer.watcher.Errors:
 			if err != nil {
-				logrus.WithError(err).Error("failed to continue sync cni conf change")
+				log.L.WithError(err).Error("failed to continue sync cni conf change")
 				return err
 			}
 		}

pkg/cri/server/container_remove.go

@@ -26,7 +26,6 @@ import (
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/log"
 	containerstore "github.com/containerd/containerd/pkg/cri/store/container"
-	"github.com/sirupsen/logrus"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
@@ -62,7 +61,7 @@ func (c *criService) RemoveContainer(ctx context.Context, r *runtime.RemoveConta
 	state := container.Status.Get().State()
 	if state == runtime.ContainerState_CONTAINER_RUNNING ||
 		state == runtime.ContainerState_CONTAINER_UNKNOWN {
-		logrus.Infof("Forcibly stopping container %q", id)
+		log.L.Infof("Forcibly stopping container %q", id)
 		if err := c.stopContainer(ctx, container, 0); err != nil {
 			return nil, fmt.Errorf("failed to forcibly stop container %q: %w", id, err)
 		}

pkg/cri/server/container_start.go

@@ -27,7 +27,6 @@ import (
 	containerdio "github.com/containerd/containerd/cio"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/log"
-	"github.com/sirupsen/logrus"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 
 	cio "github.com/containerd/containerd/pkg/cri/io"
@@ -241,7 +240,7 @@ func (c *criService) createContainerLoggers(logPath string, tty bool) (stdout io
 			if stderrCh != nil {
 				<-stderrCh
 			}
-			logrus.Debugf("Finish redirecting log file %q, closing it", logPath)
+			log.L.Debugf("Finish redirecting log file %q, closing it", logPath)
 			f.Close()
 		}()
 	} else {

pkg/cri/server/events.go

@@ -28,6 +28,7 @@ import (
 	containerdio "github.com/containerd/containerd/cio"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/events"
+	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/pkg/cri/constants"
 	containerstore "github.com/containerd/containerd/pkg/cri/store/container"
 	sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox"
@@ -115,7 +116,7 @@ func (em *eventMonitor) startSandboxExitMonitor(ctx context.Context, id string,
 		case exitRes := <-exitCh:
 			exitStatus, exitedAt, err := exitRes.Result()
 			if err != nil {
-				logrus.WithError(err).Errorf("failed to get task exit status for %q", id)
+				log.L.WithError(err).Errorf("failed to get task exit status for %q", id)
 				exitStatus = unknownExitCode
 				exitedAt = time.Now()
 			}
@@ -128,7 +129,7 @@ func (em *eventMonitor) startSandboxExitMonitor(ctx context.Context, id string,
 				ExitedAt:    protobuf.ToTimestamp(exitedAt),
 			}
 
-			logrus.Debugf("received exit event %+v", e)
+			log.L.Debugf("received exit event %+v", e)
 
 			err = func() error {
 				dctx := ctrdutil.NamespacedContext()
@@ -147,7 +148,7 @@ func (em *eventMonitor) startSandboxExitMonitor(ctx context.Context, id string,
 				return nil
 			}()
 			if err != nil {
-				logrus.WithError(err).Errorf("failed to handle sandbox TaskExit event %+v", e)
+				log.L.WithError(err).Errorf("failed to handle sandbox TaskExit event %+v", e)
 				em.backOff.enBackOff(id, e)
 			}
 			return
@@ -166,7 +167,7 @@ func (em *eventMonitor) startContainerExitMonitor(ctx context.Context, id string
 		case exitRes := <-exitCh:
 			exitStatus, exitedAt, err := exitRes.Result()
 			if err != nil {
-				logrus.WithError(err).Errorf("failed to get task exit status for %q", id)
+				log.L.WithError(err).Errorf("failed to get task exit status for %q", id)
 				exitStatus = unknownExitCode
 				exitedAt = time.Now()
 			}
@@ -179,7 +180,7 @@ func (em *eventMonitor) startContainerExitMonitor(ctx context.Context, id string
 				ExitedAt:    protobuf.ToTimestamp(exitedAt),
 			}
 
-			logrus.Debugf("received exit event %+v", e)
+			log.L.Debugf("received exit event %+v", e)
 
 			err = func() error {
 				dctx := ctrdutil.NamespacedContext()
@@ -198,7 +199,7 @@ func (em *eventMonitor) startContainerExitMonitor(ctx context.Context, id string
 				return nil
 			}()
 			if err != nil {
-				logrus.WithError(err).Errorf("failed to handle container TaskExit event %+v", e)
+				log.L.WithError(err).Errorf("failed to handle container TaskExit event %+v", e)
 				em.backOff.enBackOff(id, e)
 			}
 			return
@@ -251,14 +252,14 @@ func (em *eventMonitor) start() <-chan error {
 		for {
 			select {
 			case e := <-em.ch:
-				logrus.Debugf("Received containerd event timestamp - %v, namespace - %q, topic - %q", e.Timestamp, e.Namespace, e.Topic)
+				log.L.Debugf("Received containerd event timestamp - %v, namespace - %q, topic - %q", e.Timestamp, e.Namespace, e.Topic)
 				if e.Namespace != constants.K8sContainerdNamespace {
-					logrus.Debugf("Ignoring events in namespace - %q", e.Namespace)
+					log.L.Debugf("Ignoring events in namespace - %q", e.Namespace)
 					break
 				}
 				id, evt, err := convertEvent(e.Event)
 				if err != nil {
-					logrus.WithError(err).Errorf("Failed to convert event %+v", e)
+					log.L.WithError(err).Errorf("Failed to convert event %+v", e)
 					break
 				}
 				if em.backOff.isInBackOff(id) {

pkg/cri/server/helpers.go

@@ -30,6 +30,7 @@ import (
 	"github.com/containerd/containerd/containers"
 	"github.com/containerd/containerd/errdefs"
 	clabels "github.com/containerd/containerd/labels"
+	"github.com/containerd/containerd/log"
 	criconfig "github.com/containerd/containerd/pkg/cri/config"
 	containerstore "github.com/containerd/containerd/pkg/cri/store/container"
 	imagestore "github.com/containerd/containerd/pkg/cri/store/image"
@@ -295,7 +296,7 @@ func buildLabels(configLabels, imageConfigLabels map[string]string, containerTyp
 		} else {
 			// In case the image label is invalid, we output a warning and skip adding it to the
 			// container.
-			logrus.WithError(err).Warnf("unable to add image label with key %s to the container", k)
+			log.L.WithError(err).Warnf("unable to add image label with key %s to the container", k)
 		}
 	}
 	// labels from the CRI request (config) will override labels in the image config
@@ -517,7 +518,7 @@ func copyResourcesToStatus(spec *runtimespec.Spec, status containerstore.Status)
 func (c *criService) generateAndSendContainerEvent(ctx context.Context, containerID string, sandboxID string, eventType runtime.ContainerEventType) {
 	podSandboxStatus, err := c.getPodSandboxStatus(ctx, sandboxID)
 	if err != nil {
-		logrus.Warnf("Failed to get podSandbox status for container event for sandboxID %q: %v. Sending the event with nil podSandboxStatus.", sandboxID, err)
+		log.L.Warnf("Failed to get podSandbox status for container event for sandboxID %q: %v. Sending the event with nil podSandboxStatus.", sandboxID, err)
 		podSandboxStatus = nil
 	}
 	containerStatuses, err := c.getContainerStatuses(ctx, sandboxID)

pkg/cri/server/rdt_linux.go

@@ -21,8 +21,7 @@ package server
 import (
 	"fmt"
 
-	"github.com/sirupsen/logrus"
-
+	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/pkg/rdt"
 )
 
@@ -40,7 +39,7 @@ func (c *criService) rdtClassFromAnnotations(containerName string, containerAnno
 
 	if err != nil {
 		if !rdt.IsEnabled() && c.config.ContainerdConfig.IgnoreRdtNotEnabledErrors {
-			logrus.Debugf("continuing create container %s, ignoring rdt not enabled (%v)", containerName, err)
+			log.L.Debugf("continuing create container %s, ignoring rdt not enabled (%v)", containerName, err)
 			return "", nil
 		}
 		return "", err

pkg/cri/server/sandbox_remove.go

@@ -25,7 +25,6 @@ import (
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/log"
 
-	"github.com/sirupsen/logrus"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
@@ -50,7 +49,7 @@ func (c *criService) RemovePodSandbox(ctx context.Context, r *runtime.RemovePodS
 	// If the sandbox is still running, not ready, or in an unknown state, forcibly stop it.
 	// Even if it's in a NotReady state, this will close its network namespace, if open.
 	// This can happen if the task process associated with the Pod died or it was killed.
-	logrus.Infof("Forcibly stopping sandbox %q", id)
+	log.L.Infof("Forcibly stopping sandbox %q", id)
 	if err := c.stopPodSandbox(ctx, sandbox); err != nil {
 		return nil, fmt.Errorf("failed to forcibly stop sandbox %q: %w", id, err)
 	}

pkg/cri/server/sandbox_run.go

@@ -31,7 +31,6 @@ import (
 	"github.com/containerd/typeurl/v2"
 	"github.com/davecgh/go-spew/spew"
 	selinux "github.com/opencontainers/selinux/go-selinux"
-	"github.com/sirupsen/logrus"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 
 	"github.com/containerd/containerd"
@@ -765,7 +764,7 @@ func (c *criService) getSandboxRuntime(config *runtime.PodSandboxConfig, runtime
 }
 
 func logDebugCNIResult(ctx context.Context, sandboxID string, result *cni.Result) {
-	if logrus.GetLevel() < logrus.DebugLevel {
+	if log.GetLevel() < log.DebugLevel {
 		return
 	}
 	cniResult, err := json.Marshal(result)

pkg/cri/server/service.go

@@ -28,6 +28,7 @@ import (
 	"time"
 
 	"github.com/containerd/containerd"
+	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/oci"
 	"github.com/containerd/containerd/pkg/cri/instrument"
 	"github.com/containerd/containerd/pkg/cri/nri"
@@ -144,7 +145,7 @@ func NewCRIService(config criconfig.Config, client *containerd.Client, nri *nri.
 	}
 
 	c.imageFSPath = imageFSPath(config.ContainerdRootDir, config.ContainerdConfig.Snapshotter)
-	logrus.Infof("Get image filesystem path %q", c.imageFSPath)
+	log.L.Infof("Get image filesystem path %q", c.imageFSPath)
 
 	if err := c.initPlatform(); err != nil {
 		return nil, fmt.Errorf("initialize platform: %w", err)
@@ -203,20 +204,20 @@ func (c *criService) RegisterTCP(s *grpc.Server) error {
 
 // Run starts the CRI service.
 func (c *criService) Run() error {
-	logrus.Info("Start subscribing containerd event")
+	log.L.Info("Start subscribing containerd event")
 	c.eventMonitor.subscribe(c.client)
 
-	logrus.Infof("Start recovering state")
+	log.L.Infof("Start recovering state")
 	if err := c.recover(ctrdutil.NamespacedContext()); err != nil {
 		return fmt.Errorf("failed to recover state: %w", err)
 	}
 
 	// Start event handler.
-	logrus.Info("Start event monitor")
+	log.L.Info("Start event monitor")
 	eventMonitorErrCh := c.eventMonitor.start()
 
 	// Start snapshot stats syncer, it doesn't need to be stopped.
-	logrus.Info("Start snapshots syncer")
+	log.L.Info("Start snapshots syncer")
 	snapshotsSyncer := newSnapshotsSyncer(
 		c.snapshotStore,
 		c.client.SnapshotService(c.config.ContainerdConfig.Snapshotter),
@@ -229,7 +230,7 @@ func (c *criService) Run() error {
 	var netSyncGroup sync.WaitGroup
 	for name, h := range c.cniNetConfMonitor {
 		netSyncGroup.Add(1)
-		logrus.Infof("Start cni network conf syncer for %s", name)
+		log.L.Infof("Start cni network conf syncer for %s", name)
 		go func(h *cniNetConfSyncer) {
 			cniNetConfMonitorErrCh <- h.syncLoop()
 			netSyncGroup.Done()
@@ -248,12 +249,12 @@ func (c *criService) Run() error {
 	}
 
 	// Start streaming server.
-	logrus.Info("Start streaming server")
+	log.L.Info("Start streaming server")
 	streamServerErrCh := make(chan error)
 	go func() {
 		defer close(streamServerErrCh)
 		if err := c.streamServer.Start(true); err != nil && err != http.ErrServerClosed {
-			logrus.WithError(err).Error("Failed to start streaming server")
+			log.L.WithError(err).Error("Failed to start streaming server")
 			streamServerErrCh <- err
 		}
 	}()
@@ -281,11 +282,11 @@ func (c *criService) Run() error {
 	if err := <-eventMonitorErrCh; err != nil {
 		eventMonitorErr = err
 	}
-	logrus.Info("Event monitor stopped")
+	log.L.Info("Event monitor stopped")
 	if err := <-streamServerErrCh; err != nil {
 		streamServerErr = err
 	}
-	logrus.Info("Stream server stopped")
+	log.L.Info("Stream server stopped")
 	if eventMonitorErr != nil {
 		return fmt.Errorf("event monitor error: %w", eventMonitorErr)
 	}

pkg/cri/server/service_linux.go

@@ -20,11 +20,11 @@ import (
 	"fmt"
 
 	"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
+	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/pkg/cap"
 	"github.com/containerd/containerd/pkg/userns"
 	cni "github.com/containerd/go-cni"
 	"github.com/opencontainers/selinux/go-selinux"
-	"github.com/sirupsen/logrus"
 )
 
 // networkAttachCount is the minimum number of networks the PodSandbox
@@ -35,13 +35,13 @@ const networkAttachCount = 2
 func (c *criService) initPlatform() (err error) {
 	if userns.RunningInUserNS() {
 		if !(c.config.DisableCgroup && !c.apparmorEnabled() && c.config.RestrictOOMScoreAdj) {
-			logrus.Warn("Running containerd in a user namespace typically requires disable_cgroup, disable_apparmor, restrict_oom_score_adj set to be true")
+			log.L.Warn("Running containerd in a user namespace typically requires disable_cgroup, disable_apparmor, restrict_oom_score_adj set to be true")
 		}
 	}
 
 	if c.config.EnableSelinux {
 		if !selinux.GetEnabled() {
-			logrus.Warn("Selinux is not supported")
+			log.L.Warn("Selinux is not supported")
 		}
 		if r := c.config.SelinuxCategoryRange; r > 0 {
 			selinux.CategoryRange = uint32(r)

pkg/cri/server/snapshots.go

@@ -22,11 +22,10 @@ import (
 	"time"
 
 	"github.com/containerd/containerd/errdefs"
-	snapshot "github.com/containerd/containerd/snapshots"
-	"github.com/sirupsen/logrus"
-
+	"github.com/containerd/containerd/log"
 	snapshotstore "github.com/containerd/containerd/pkg/cri/store/snapshot"
 	ctrdutil "github.com/containerd/containerd/pkg/cri/util"
+	snapshot "github.com/containerd/containerd/snapshots"
 )
 
 // snapshotsSyncer syncs snapshot stats periodically. imagefs info and container stats
@@ -60,7 +59,7 @@ func (s *snapshotsSyncer) start() {
 		// check the resource usage and optimize this.
 		for {
 			if err := s.sync(); err != nil {
-				logrus.WithError(err).Error("Failed to sync snapshot stats")
+				log.L.WithError(err).Error("Failed to sync snapshot stats")
 			}
 			<-tick.C
 		}
@@ -101,7 +100,7 @@ func (s *snapshotsSyncer) sync() error {
 		usage, err := s.snapshotter.Usage(ctx, info.Name)
 		if err != nil {
 			if !errdefs.IsNotFound(err) {
-				logrus.WithError(err).Errorf("Failed to get usage for snapshot %q", info.Name)
+				log.L.WithError(err).Errorf("Failed to get usage for snapshot %q", info.Name)
 			}
 			continue
 		}