Move to use github.com/containerd/log

Add github.com/containerd/log to go.mod

Signed-off-by: Derek McGowan <derek@mcg.dev>

runtime/events.go

@@ -18,7 +18,7 @@ package runtime
 
 import (
 	"github.com/containerd/containerd/api/events"
-	"github.com/containerd/containerd/log"
+	"github.com/containerd/log"
 )
 
 const (

runtime/restart/monitor/monitor.go

@@ -24,10 +24,10 @@ import (
 	"time"
 
 	"github.com/containerd/containerd"
-	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/namespaces"
 	"github.com/containerd/containerd/plugin"
 	"github.com/containerd/containerd/runtime/restart"
+	"github.com/containerd/log"
 )
 
 type duration struct {

runtime/restart/restart.go

@@ -39,7 +39,7 @@ import (
 	"github.com/containerd/containerd"
 	"github.com/containerd/containerd/cio"
 	"github.com/containerd/containerd/containers"
-	"github.com/containerd/containerd/log"
+	"github.com/containerd/log"
 )
 
 const (

runtime/v2/README.md

@@ -351,7 +351,7 @@ If a shim does not or cannot implement an rpc call, it MUST return a `github.com
 
 A fifo on unix or named pipe on Windows will be provided to the shim.
 It can be located inside the `cwd` of the shim named "log".
-The shims can use the existing `github.com/containerd/containerd/log` package to log debug messages.
+The shims can use the existing `github.com/containerd/log` package to log debug messages.
 Messages will automatically be output in the containerd's daemon logs with the correct fields and runtime set.
 
 #### ttrpc

runtime/v2/binary.go

@@ -26,13 +26,13 @@ import (
 	gruntime "runtime"
 
 	"github.com/containerd/containerd/api/runtime/task/v2"
-	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/namespaces"
 	"github.com/containerd/containerd/protobuf"
 	"github.com/containerd/containerd/protobuf/proto"
 	"github.com/containerd/containerd/protobuf/types"
 	"github.com/containerd/containerd/runtime"
 	client "github.com/containerd/containerd/runtime/v2/shim"
+	"github.com/containerd/log"
 )
 
 type shimBinaryConfig struct {

runtime/v2/manager.go

@@ -28,7 +28,6 @@ import (
 	"github.com/containerd/containerd/containers"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/events/exchange"
-	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/metadata"
 	"github.com/containerd/containerd/namespaces"
 	"github.com/containerd/containerd/pkg/cleanup"
@@ -39,6 +38,7 @@ import (
 	"github.com/containerd/containerd/runtime"
 	shimbinary "github.com/containerd/containerd/runtime/v2/shim"
 	"github.com/containerd/containerd/sandbox"
+	"github.com/containerd/log"
 )
 
 // Config for the v2 runtime

runtime/v2/runc/container.go

@@ -32,12 +32,12 @@ import (
 	"github.com/containerd/console"
 	"github.com/containerd/containerd/api/runtime/task/v2"
 	"github.com/containerd/containerd/errdefs"
-	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/mount"
 	"github.com/containerd/containerd/namespaces"
 	"github.com/containerd/containerd/pkg/process"
 	"github.com/containerd/containerd/pkg/stdio"
 	"github.com/containerd/containerd/runtime/v2/runc/options"
+	"github.com/containerd/log"
 	"github.com/containerd/typeurl/v2"
 )
 

runtime/v2/runc/manager/manager_linux.go

@@ -29,7 +29,6 @@ import (
 	"github.com/containerd/cgroups/v3"
 	"github.com/containerd/cgroups/v3/cgroup1"
 	cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2"
-	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/mount"
 	"github.com/containerd/containerd/namespaces"
 	"github.com/containerd/containerd/oci"
@@ -39,6 +38,7 @@ import (
 	"github.com/containerd/containerd/runtime/v2/runc/options"
 	"github.com/containerd/containerd/runtime/v2/shim"
 	runcC "github.com/containerd/go-runc"
+	"github.com/containerd/log"
 	exec "golang.org/x/sys/execabs"
 	"golang.org/x/sys/unix"
 )

runtime/v2/runc/pause/sandbox.go

@@ -23,9 +23,9 @@ import (
 	"runtime"
 
 	"github.com/containerd/containerd/api/types"
-	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/pkg/shutdown"
 	"github.com/containerd/containerd/runtime/v2/shim"
+	"github.com/containerd/log"
 	"github.com/containerd/ttrpc"
 
 	api "github.com/containerd/containerd/api/runtime/sandbox/v1"

runtime/v2/runc/task/service.go

@@ -31,7 +31,6 @@ import (
 	taskAPI "github.com/containerd/containerd/api/runtime/task/v2"
 	"github.com/containerd/containerd/api/types/task"
 	"github.com/containerd/containerd/errdefs"
-	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/namespaces"
 	"github.com/containerd/containerd/pkg/oom"
 	oomv1 "github.com/containerd/containerd/pkg/oom/v1"
@@ -48,6 +47,7 @@ import (
 	"github.com/containerd/containerd/runtime/v2/shim"
 	"github.com/containerd/containerd/sys/reaper"
 	runcC "github.com/containerd/go-runc"
+	"github.com/containerd/log"
 	"github.com/containerd/ttrpc"
 	"github.com/containerd/typeurl/v2"
 )

runtime/v2/runc/util.go

@@ -22,8 +22,8 @@ import (
 	"context"
 	"path/filepath"
 
-	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/oci"
+	"github.com/containerd/log"
 	"github.com/opencontainers/runtime-spec/specs-go"
 )
 

runtime/v2/shim.go

@@ -38,13 +38,13 @@ import (
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/events/exchange"
 	"github.com/containerd/containerd/identifiers"
-	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/pkg/dialer"
 	"github.com/containerd/containerd/pkg/timeout"
 	"github.com/containerd/containerd/protobuf"
 	ptypes "github.com/containerd/containerd/protobuf/types"
 	"github.com/containerd/containerd/runtime"
 	client "github.com/containerd/containerd/runtime/v2/shim"
+	"github.com/containerd/log"
 )
 
 const (

runtime/v2/shim/publisher.go

@@ -23,10 +23,10 @@ import (
 
 	v1 "github.com/containerd/containerd/api/services/ttrpc/events/v1"
 	"github.com/containerd/containerd/events"
-	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/namespaces"
 	"github.com/containerd/containerd/pkg/ttrpcutil"
 	"github.com/containerd/containerd/protobuf"
+	"github.com/containerd/log"
 	"github.com/containerd/ttrpc"
 )
 

runtime/v2/shim/shim.go

@@ -31,13 +31,13 @@ import (
 
 	shimapi "github.com/containerd/containerd/api/runtime/task/v2"
 	"github.com/containerd/containerd/events"
-	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/namespaces"
 	"github.com/containerd/containerd/pkg/shutdown"
 	"github.com/containerd/containerd/plugin"
 	"github.com/containerd/containerd/protobuf"
 	"github.com/containerd/containerd/protobuf/proto"
 	"github.com/containerd/containerd/version"
+	"github.com/containerd/log"
 	"github.com/containerd/ttrpc"
 	"github.com/sirupsen/logrus"
 )

runtime/v2/shim/shim_unix.go

@@ -27,9 +27,9 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/sys/reaper"
 	"github.com/containerd/fifo"
+	"github.com/containerd/log"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
 )

runtime/v2/shim_load.go

@@ -23,10 +23,10 @@ import (
 	"path/filepath"
 
 	"github.com/containerd/containerd/errdefs"
-	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/mount"
 	"github.com/containerd/containerd/namespaces"
 	"github.com/containerd/containerd/pkg/cleanup"
+	"github.com/containerd/log"
 )
 
 func (m *ShimManager) loadExistingTasks(ctx context.Context) error {