Move metrics to core/metrics

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

Vagrantfile

@@ -257,7 +257,7 @@ EOF
         set -eux -o pipefail
         rm -rf /var/lib/containerd-test /run/containerd-test
         cd ${GOPATH}/src/github.com/containerd/containerd
-        go test -v -count=1 -race ./metrics/cgroups
+        go test -v -count=1 -race ./core/metrics/cgroups
         make integration EXTRA_TESTFLAGS="-timeout 15m -no-criu -test.v" TEST_RUNTIME=io.containerd.runc.v2 RUNC_FLAVOR=$RUNC_FLAVOR
     SHELL
   end

cmd/containerd/builtins/builtins_linux.go

@@ -17,8 +17,8 @@
 package builtins
 
 import (
-	_ "github.com/containerd/containerd/v2/metrics/cgroups"
+	_ "github.com/containerd/containerd/v2/core/metrics/cgroups"
-	_ "github.com/containerd/containerd/v2/metrics/cgroups/v2"
+	_ "github.com/containerd/containerd/v2/core/metrics/cgroups/v2"
 	_ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin"
 	_ "github.com/containerd/containerd/v2/plugins/snapshots/native/plugin"
 	_ "github.com/containerd/containerd/v2/plugins/snapshots/overlay/plugin"

cmd/containerd/command/main.go

@@ -29,9 +29,9 @@ import (
 
 	"github.com/containerd/containerd/v2/cmd/containerd/server"
 	srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config"
+	_ "github.com/containerd/containerd/v2/core/metrics" // import containerd build info
 	"github.com/containerd/containerd/v2/core/mount"
 	"github.com/containerd/containerd/v2/defaults"
-	_ "github.com/containerd/containerd/v2/metrics" // import containerd build info
 	"github.com/containerd/containerd/v2/pkg/errdefs"
 	"github.com/containerd/containerd/v2/pkg/sys"
 	"github.com/containerd/containerd/v2/version"

contrib/fuzz/builtins_linux.go

@@ -18,8 +18,8 @@ package fuzz
 
 import (
 	// Linux specific imports
-	_ "github.com/containerd/containerd/v2/metrics/cgroups"
+	_ "github.com/containerd/containerd/v2/core/metrics/cgroups"
-	_ "github.com/containerd/containerd/v2/metrics/cgroups/v2"
+	_ "github.com/containerd/containerd/v2/core/metrics/cgroups/v2"
 	_ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin"
 	_ "github.com/containerd/containerd/v2/plugins/snapshots/native/plugin"
 	_ "github.com/containerd/containerd/v2/plugins/snapshots/overlay/plugin"

core/metrics/cgroups/cgroups.go

@@ -20,8 +20,8 @@ package cgroups
 
 import (
 	"github.com/containerd/cgroups/v3"
-	v1 "github.com/containerd/containerd/v2/metrics/cgroups/v1"
+	v1 "github.com/containerd/containerd/v2/core/metrics/cgroups/v1"
-	v2 "github.com/containerd/containerd/v2/metrics/cgroups/v2"
+	v2 "github.com/containerd/containerd/v2/core/metrics/cgroups/v2"
 	"github.com/containerd/containerd/v2/pkg/events"
 	"github.com/containerd/containerd/v2/platforms"
 	"github.com/containerd/containerd/v2/plugins"

core/metrics/cgroups/metrics_test.go

@@ -26,11 +26,11 @@ import (
 	"time"
 
 	"github.com/containerd/cgroups/v3"
-	"github.com/containerd/containerd/v2/metrics/cgroups/common"
+	"github.com/containerd/containerd/v2/core/metrics/cgroups/common"
-	v1 "github.com/containerd/containerd/v2/metrics/cgroups/v1"
+	v1 "github.com/containerd/containerd/v2/core/metrics/cgroups/v1"
-	v2 "github.com/containerd/containerd/v2/metrics/cgroups/v2"
+	v2 "github.com/containerd/containerd/v2/core/metrics/cgroups/v2"
-	v1types "github.com/containerd/containerd/v2/metrics/types/v1"
+	v1types "github.com/containerd/containerd/v2/core/metrics/types/v1"
-	v2types "github.com/containerd/containerd/v2/metrics/types/v2"
+	v2types "github.com/containerd/containerd/v2/core/metrics/types/v2"
 	"github.com/containerd/containerd/v2/protobuf"
 	"github.com/prometheus/client_golang/prometheus"
 

core/metrics/cgroups/v1/blkio.go

@@ -21,7 +21,7 @@ package v1
 import (
 	"strconv"
 
-	v1 "github.com/containerd/containerd/v2/metrics/types/v1"
+	v1 "github.com/containerd/containerd/v2/core/metrics/types/v1"
 	metrics "github.com/docker/go-metrics"
 	"github.com/prometheus/client_golang/prometheus"
 )

core/metrics/cgroups/v1/cpu.go

@@ -21,7 +21,7 @@ package v1
 import (
 	"strconv"
 
-	v1 "github.com/containerd/containerd/v2/metrics/types/v1"
+	v1 "github.com/containerd/containerd/v2/core/metrics/types/v1"
 	metrics "github.com/docker/go-metrics"
 	"github.com/prometheus/client_golang/prometheus"
 )

core/metrics/cgroups/v1/hugetlb.go

@@ -19,7 +19,7 @@
 package v1
 
 import (
-	v1 "github.com/containerd/containerd/v2/metrics/types/v1"
+	v1 "github.com/containerd/containerd/v2/core/metrics/types/v1"
 	metrics "github.com/docker/go-metrics"
 	"github.com/prometheus/client_golang/prometheus"
 )

core/metrics/cgroups/v1/memory.go

@@ -19,7 +19,7 @@
 package v1
 
 import (
-	v1 "github.com/containerd/containerd/v2/metrics/types/v1"
+	v1 "github.com/containerd/containerd/v2/core/metrics/types/v1"
 	metrics "github.com/docker/go-metrics"
 	"github.com/prometheus/client_golang/prometheus"
 )

core/metrics/cgroups/v1/metric.go

@@ -19,7 +19,7 @@
 package v1
 
 import (
-	v1 "github.com/containerd/containerd/v2/metrics/types/v1"
+	v1 "github.com/containerd/containerd/v2/core/metrics/types/v1"
 	metrics "github.com/docker/go-metrics"
 	"github.com/prometheus/client_golang/prometheus"
 )

core/metrics/cgroups/v1/metrics.go

@@ -24,9 +24,9 @@ import (
 	"sync"
 
 	cgroups "github.com/containerd/cgroups/v3/cgroup1"
-	cmetrics "github.com/containerd/containerd/v2/metrics"
+	cmetrics "github.com/containerd/containerd/v2/core/metrics"
-	"github.com/containerd/containerd/v2/metrics/cgroups/common"
+	"github.com/containerd/containerd/v2/core/metrics/cgroups/common"
-	v1 "github.com/containerd/containerd/v2/metrics/types/v1"
+	v1 "github.com/containerd/containerd/v2/core/metrics/types/v1"
 	"github.com/containerd/containerd/v2/pkg/namespaces"
 	"github.com/containerd/containerd/v2/pkg/timeout"
 	"github.com/containerd/log"

core/metrics/cgroups/v1/pids.go

@@ -19,7 +19,7 @@
 package v1
 
 import (
-	v1 "github.com/containerd/containerd/v2/metrics/types/v1"
+	v1 "github.com/containerd/containerd/v2/core/metrics/types/v1"
 	metrics "github.com/docker/go-metrics"
 	"github.com/prometheus/client_golang/prometheus"
 )

core/metrics/cgroups/v2/cpu.go

@@ -19,7 +19,7 @@
 package v2
 
 import (
-	v2 "github.com/containerd/containerd/v2/metrics/types/v2"
+	v2 "github.com/containerd/containerd/v2/core/metrics/types/v2"
 	metrics "github.com/docker/go-metrics"
 	"github.com/prometheus/client_golang/prometheus"
 )

core/metrics/cgroups/v2/io.go

@@ -21,7 +21,7 @@ package v2
 import (
 	"strconv"
 
-	v2 "github.com/containerd/containerd/v2/metrics/types/v2"
+	v2 "github.com/containerd/containerd/v2/core/metrics/types/v2"
 	metrics "github.com/docker/go-metrics"
 	"github.com/prometheus/client_golang/prometheus"
 )

core/metrics/cgroups/v2/memory.go

@@ -19,7 +19,7 @@
 package v2
 
 import (
-	v2 "github.com/containerd/containerd/v2/metrics/types/v2"
+	v2 "github.com/containerd/containerd/v2/core/metrics/types/v2"
 	metrics "github.com/docker/go-metrics"
 	"github.com/prometheus/client_golang/prometheus"
 )

core/metrics/cgroups/v2/metric.go

@@ -19,7 +19,7 @@
 package v2
 
 import (
-	v2 "github.com/containerd/containerd/v2/metrics/types/v2"
+	v2 "github.com/containerd/containerd/v2/core/metrics/types/v2"
 	metrics "github.com/docker/go-metrics"
 	"github.com/prometheus/client_golang/prometheus"
 )

core/metrics/cgroups/v2/metrics.go

@@ -23,9 +23,9 @@ import (
 	"fmt"
 	"sync"
 
-	cmetrics "github.com/containerd/containerd/v2/metrics"
+	cmetrics "github.com/containerd/containerd/v2/core/metrics"
-	"github.com/containerd/containerd/v2/metrics/cgroups/common"
+	"github.com/containerd/containerd/v2/core/metrics/cgroups/common"
-	v2 "github.com/containerd/containerd/v2/metrics/types/v2"
+	v2 "github.com/containerd/containerd/v2/core/metrics/types/v2"
 	"github.com/containerd/containerd/v2/pkg/namespaces"
 	"github.com/containerd/containerd/v2/pkg/timeout"
 	"github.com/containerd/log"

core/metrics/cgroups/v2/pids.go

@@ -19,7 +19,7 @@
 package v2
 
 import (
-	v2 "github.com/containerd/containerd/v2/metrics/types/v2"
+	v2 "github.com/containerd/containerd/v2/core/metrics/types/v2"
 	metrics "github.com/docker/go-metrics"
 	"github.com/prometheus/client_golang/prometheus"
 )