diff --git a/Vagrantfile b/Vagrantfile index ba7d1b0a8..1f5458532 100644 --- a/Vagrantfile +++ b/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 diff --git a/cmd/containerd/builtins/builtins_linux.go b/cmd/containerd/builtins/builtins_linux.go index 623cf9149..d580526bd 100644 --- a/cmd/containerd/builtins/builtins_linux.go +++ b/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/metrics/cgroups/v2" + _ "github.com/containerd/containerd/v2/core/metrics/cgroups" + _ "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" diff --git a/cmd/containerd/command/main.go b/cmd/containerd/command/main.go index 2259282ec..70f9ae857 100644 --- a/cmd/containerd/command/main.go +++ b/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" diff --git a/contrib/fuzz/builtins_linux.go b/contrib/fuzz/builtins_linux.go index be544d9a7..e4c24ed72 100644 --- a/contrib/fuzz/builtins_linux.go +++ b/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/metrics/cgroups/v2" + _ "github.com/containerd/containerd/v2/core/metrics/cgroups" + _ "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" diff --git a/metrics/cgroups/cgroups.go b/core/metrics/cgroups/cgroups.go similarity index 93% rename from metrics/cgroups/cgroups.go rename to core/metrics/cgroups/cgroups.go index 5ba02d606..140c17f5d 100644 --- a/metrics/cgroups/cgroups.go +++ b/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" - v2 "github.com/containerd/containerd/v2/metrics/cgroups/v2" + v1 "github.com/containerd/containerd/v2/core/metrics/cgroups/v1" + 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" diff --git a/metrics/cgroups/common/type.go b/core/metrics/cgroups/common/type.go similarity index 100% rename from metrics/cgroups/common/type.go rename to core/metrics/cgroups/common/type.go diff --git a/metrics/cgroups/metrics_test.go b/core/metrics/cgroups/metrics_test.go similarity index 89% rename from metrics/cgroups/metrics_test.go rename to core/metrics/cgroups/metrics_test.go index b0d10d5ec..a5df82982 100644 --- a/metrics/cgroups/metrics_test.go +++ b/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" - v1 "github.com/containerd/containerd/v2/metrics/cgroups/v1" - v2 "github.com/containerd/containerd/v2/metrics/cgroups/v2" - v1types "github.com/containerd/containerd/v2/metrics/types/v1" - v2types "github.com/containerd/containerd/v2/metrics/types/v2" + "github.com/containerd/containerd/v2/core/metrics/cgroups/common" + v1 "github.com/containerd/containerd/v2/core/metrics/cgroups/v1" + v2 "github.com/containerd/containerd/v2/core/metrics/cgroups/v2" + v1types "github.com/containerd/containerd/v2/core/metrics/types/v1" + v2types "github.com/containerd/containerd/v2/core/metrics/types/v2" "github.com/containerd/containerd/v2/protobuf" "github.com/prometheus/client_golang/prometheus" diff --git a/metrics/cgroups/v1/blkio.go b/core/metrics/cgroups/v1/blkio.go similarity index 98% rename from metrics/cgroups/v1/blkio.go rename to core/metrics/cgroups/v1/blkio.go index 62e2d8201..562539f27 100644 --- a/metrics/cgroups/v1/blkio.go +++ b/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" ) diff --git a/metrics/cgroups/v1/cgroups.go b/core/metrics/cgroups/v1/cgroups.go similarity index 100% rename from metrics/cgroups/v1/cgroups.go rename to core/metrics/cgroups/v1/cgroups.go diff --git a/metrics/cgroups/v1/cpu.go b/core/metrics/cgroups/v1/cpu.go similarity index 97% rename from metrics/cgroups/v1/cpu.go rename to core/metrics/cgroups/v1/cpu.go index c0a7f6b98..a08f9e86e 100644 --- a/metrics/cgroups/v1/cpu.go +++ b/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" ) diff --git a/metrics/cgroups/v1/hugetlb.go b/core/metrics/cgroups/v1/hugetlb.go similarity index 96% rename from metrics/cgroups/v1/hugetlb.go rename to core/metrics/cgroups/v1/hugetlb.go index 9442754bc..36dcc92dc 100644 --- a/metrics/cgroups/v1/hugetlb.go +++ b/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" ) diff --git a/metrics/cgroups/v1/memory.go b/core/metrics/cgroups/v1/memory.go similarity index 99% rename from metrics/cgroups/v1/memory.go rename to core/metrics/cgroups/v1/memory.go index cec3a9163..75dbfb946 100644 --- a/metrics/cgroups/v1/memory.go +++ b/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" ) diff --git a/metrics/cgroups/v1/metric.go b/core/metrics/cgroups/v1/metric.go similarity index 96% rename from metrics/cgroups/v1/metric.go rename to core/metrics/cgroups/v1/metric.go index b5819acd8..8c73918de 100644 --- a/metrics/cgroups/v1/metric.go +++ b/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" ) diff --git a/metrics/cgroups/v1/metrics.go b/core/metrics/cgroups/v1/metrics.go similarity index 96% rename from metrics/cgroups/v1/metrics.go rename to core/metrics/cgroups/v1/metrics.go index 3e9956514..bdc137c79 100644 --- a/metrics/cgroups/v1/metrics.go +++ b/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" - "github.com/containerd/containerd/v2/metrics/cgroups/common" - v1 "github.com/containerd/containerd/v2/metrics/types/v1" + cmetrics "github.com/containerd/containerd/v2/core/metrics" + "github.com/containerd/containerd/v2/core/metrics/cgroups/common" + 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" diff --git a/metrics/cgroups/v1/oom.go b/core/metrics/cgroups/v1/oom.go similarity index 100% rename from metrics/cgroups/v1/oom.go rename to core/metrics/cgroups/v1/oom.go diff --git a/metrics/cgroups/v1/pids.go b/core/metrics/cgroups/v1/pids.go similarity index 95% rename from metrics/cgroups/v1/pids.go rename to core/metrics/cgroups/v1/pids.go index 880db3907..c05b37fdf 100644 --- a/metrics/cgroups/v1/pids.go +++ b/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" ) diff --git a/metrics/cgroups/v2/cgroups.go b/core/metrics/cgroups/v2/cgroups.go similarity index 100% rename from metrics/cgroups/v2/cgroups.go rename to core/metrics/cgroups/v2/cgroups.go diff --git a/metrics/cgroups/v2/cpu.go b/core/metrics/cgroups/v2/cpu.go similarity index 97% rename from metrics/cgroups/v2/cpu.go rename to core/metrics/cgroups/v2/cpu.go index 1350c9920..e8e2dc11c 100644 --- a/metrics/cgroups/v2/cpu.go +++ b/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" ) diff --git a/metrics/cgroups/v2/io.go b/core/metrics/cgroups/v2/io.go similarity index 97% rename from metrics/cgroups/v2/io.go rename to core/metrics/cgroups/v2/io.go index dbd5508fe..756ceabfb 100644 --- a/metrics/cgroups/v2/io.go +++ b/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" ) diff --git a/metrics/cgroups/v2/memory.go b/core/metrics/cgroups/v2/memory.go similarity index 99% rename from metrics/cgroups/v2/memory.go rename to core/metrics/cgroups/v2/memory.go index 6f2c9a486..b75216231 100644 --- a/metrics/cgroups/v2/memory.go +++ b/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" ) diff --git a/metrics/cgroups/v2/metric.go b/core/metrics/cgroups/v2/metric.go similarity index 96% rename from metrics/cgroups/v2/metric.go rename to core/metrics/cgroups/v2/metric.go index c6e0d3753..b730d169c 100644 --- a/metrics/cgroups/v2/metric.go +++ b/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" ) diff --git a/metrics/cgroups/v2/metrics.go b/core/metrics/cgroups/v2/metrics.go similarity index 96% rename from metrics/cgroups/v2/metrics.go rename to core/metrics/cgroups/v2/metrics.go index e02f17b79..a92c235a9 100644 --- a/metrics/cgroups/v2/metrics.go +++ b/core/metrics/cgroups/v2/metrics.go @@ -23,9 +23,9 @@ import ( "fmt" "sync" - cmetrics "github.com/containerd/containerd/v2/metrics" - "github.com/containerd/containerd/v2/metrics/cgroups/common" - v2 "github.com/containerd/containerd/v2/metrics/types/v2" + cmetrics "github.com/containerd/containerd/v2/core/metrics" + "github.com/containerd/containerd/v2/core/metrics/cgroups/common" + 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" diff --git a/metrics/cgroups/v2/pids.go b/core/metrics/cgroups/v2/pids.go similarity index 95% rename from metrics/cgroups/v2/pids.go rename to core/metrics/cgroups/v2/pids.go index 6ae7aa92a..ba2fbe6cb 100644 --- a/metrics/cgroups/v2/pids.go +++ b/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" ) diff --git a/metrics/metrics.go b/core/metrics/metrics.go similarity index 100% rename from metrics/metrics.go rename to core/metrics/metrics.go diff --git a/metrics/types/v1/types.go b/core/metrics/types/v1/types.go similarity index 100% rename from metrics/types/v1/types.go rename to core/metrics/types/v1/types.go diff --git a/metrics/types/v2/types.go b/core/metrics/types/v2/types.go similarity index 100% rename from metrics/types/v2/types.go rename to core/metrics/types/v2/types.go