Move stats/v1 to cgroup1/stats

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>

Author: kzys

Makefile

@@ -23,4 +23,4 @@ cgutil:
 proto:
 	protobuild --quiet ${PACKAGES}
 	# Keep them Go-idiomatic and backward-compatible with the gogo/protobuf era.
-	go-fix-acronym -w -a '(Cpu|Tcp|Rss)' $(shell find stats/v1/ cgroup2/stats/ -name '*.pb.go')
+	go-fix-acronym -w -a '(Cpu|Tcp|Rss)' $(shell find cgroup1/stats/ cgroup2/stats/ -name '*.pb.go')

Protobuild.toml

@@ -15,8 +15,8 @@ generators = ["go"]
 
 # Aggregrate the API descriptors to lock down API changes.
 [[descriptors]]
-prefix = "github.com/containerd/cgroups/stats/v1"
-target = "stats/v1/metrics.pb.txt"
+prefix = "github.com/containerd/cgroups/cgroup1/stats"
+target = "cgroup1/stats/metrics.pb.txt"
 ignore_files = [
 	"google/protobuf/descriptor.proto",
 ]

cgroup1/blkio.go

@@ -25,7 +25,8 @@ import (
 	"strconv"
 	"strings"
 
-	v1 "github.com/containerd/cgroups/v2/stats/v1"
+	v1 "github.com/containerd/cgroups/v2/cgroup1/stats"
+
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 )
 

cgroup1/blkio_test.go

@@ -21,7 +21,7 @@ import (
 	"strings"
 	"testing"
 
-	v1 "github.com/containerd/cgroups/v2/stats/v1"
+	v1 "github.com/containerd/cgroups/v2/cgroup1/stats"
 )
 
 const data = `major minor  #blocks  name

cgroup1/cgroup.go

@@ -28,7 +28,7 @@ import (
 	"syscall"
 	"time"
 
-	v1 "github.com/containerd/cgroups/v2/stats/v1"
+	v1 "github.com/containerd/cgroups/v2/cgroup1/stats"
 
 	"github.com/opencontainers/runtime-spec/specs-go"
 )

cgroup1/control.go

@@ -19,7 +19,7 @@ package cgroup1
 import (
 	"os"
 
-	v1 "github.com/containerd/cgroups/v2/stats/v1"
+	v1 "github.com/containerd/cgroups/v2/cgroup1/stats"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 )
 

cgroup1/cpu.go

@@ -22,7 +22,7 @@ import (
 	"path/filepath"
 	"strconv"
 
-	v1 "github.com/containerd/cgroups/v2/stats/v1"
+	v1 "github.com/containerd/cgroups/v2/cgroup1/stats"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 )
 

cgroup1/cpuacct.go

@@ -24,7 +24,7 @@ import (
 	"strconv"
 	"strings"
 
-	v1 "github.com/containerd/cgroups/v2/stats/v1"
+	v1 "github.com/containerd/cgroups/v2/cgroup1/stats"
 )
 
 const nanosecondsInSecond = 1000000000

cgroup1/hugetlb.go

@@ -22,7 +22,7 @@ import (
 	"strconv"
 	"strings"
 
-	v1 "github.com/containerd/cgroups/v2/stats/v1"
+	v1 "github.com/containerd/cgroups/v2/cgroup1/stats"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 )
 

cgroup1/memory.go

@@ -25,7 +25,7 @@ import (
 	"strconv"
 	"strings"
 
-	v1 "github.com/containerd/cgroups/v2/stats/v1"
+	v1 "github.com/containerd/cgroups/v2/cgroup1/stats"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"golang.org/x/sys/unix"
 )

cgroup1/memory_test.go

@@ -23,7 +23,7 @@ import (
 	"strings"
 	"testing"
 
-	v1 "github.com/containerd/cgroups/v2/stats/v1"
+	v1 "github.com/containerd/cgroups/v2/cgroup1/stats"
 )
 
 const memoryData = `cache 1

cgroup1/pids.go

@@ -22,7 +22,7 @@ import (
 	"strconv"
 	"strings"
 
-	v1 "github.com/containerd/cgroups/v2/stats/v1"
+	v1 "github.com/containerd/cgroups/v2/cgroup1/stats"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 )
 

cgroup1/pids_test.go

@@ -23,7 +23,7 @@ import (
 	"strconv"
 	"testing"
 
-	v1 "github.com/containerd/cgroups/v2/stats/v1"
+	v1 "github.com/containerd/cgroups/v2/cgroup1/stats"
 	"github.com/opencontainers/runtime-spec/specs-go"
 )
 

cgroup1/rdma.go

@@ -23,7 +23,7 @@ import (
 	"strconv"
 	"strings"
 
-	v1 "github.com/containerd/cgroups/v2/stats/v1"
+	v1 "github.com/containerd/cgroups/v2/cgroup1/stats"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 )
 

stats/v1/doc.go cgroup1/stats/doc.go

@@ -14,4 +14,4 @@
    limitations under the License.
 */
 
-package v1
+package stats