Skip to content

Commit

Permalink
Move metrics to core/metrics
Browse files Browse the repository at this point in the history 
Signed-off-by: Derek McGowan <derek@mcg.dev>
  • Loading branch information
@dmcgowan
dmcgowan committed Jan 17, 2024
1 parent 19e7635 commit df9b0a0
Show file tree
Hide file tree
Showing 26 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion Vagrantfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions cmd/containerd/builtins/builtins_linux.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/containerd/command/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions contrib/fuzz/builtins_linux.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions metrics/cgroups/cgroups.go → core/metrics/cgroups/cgroups.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 metrics/cgroups/common/type.go → core/metrics/cgroups/common/type.go
View file
File renamed without changes.
10 changes: 5 additions & 5 deletions metrics/cgroups/metrics_test.go → core/metrics/cgroups/metrics_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion metrics/cgroups/v1/blkio.go → core/metrics/cgroups/v1/blkio.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
0 metrics/cgroups/v1/cgroups.go → core/metrics/cgroups/v1/cgroups.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion metrics/cgroups/v1/cpu.go → core/metrics/cgroups/v1/cpu.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion metrics/cgroups/v1/hugetlb.go → core/metrics/cgroups/v1/hugetlb.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion metrics/cgroups/v1/memory.go → core/metrics/cgroups/v1/memory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion metrics/cgroups/v1/metric.go → core/metrics/cgroups/v1/metric.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
6 changes: 3 additions & 3 deletions metrics/cgroups/v1/metrics.go → core/metrics/cgroups/v1/metrics.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 metrics/cgroups/v1/oom.go → core/metrics/cgroups/v1/oom.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion metrics/cgroups/v1/pids.go → core/metrics/cgroups/v1/pids.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
0 metrics/cgroups/v2/cgroups.go → core/metrics/cgroups/v2/cgroups.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion metrics/cgroups/v2/cpu.go → core/metrics/cgroups/v2/cpu.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion metrics/cgroups/v2/io.go → core/metrics/cgroups/v2/io.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion metrics/cgroups/v2/memory.go → core/metrics/cgroups/v2/memory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion metrics/cgroups/v2/metric.go → core/metrics/cgroups/v2/metric.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
6 changes: 3 additions & 3 deletions metrics/cgroups/v2/metrics.go → core/metrics/cgroups/v2/metrics.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion metrics/cgroups/v2/pids.go → core/metrics/cgroups/v2/pids.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
0 metrics/metrics.go → core/metrics/metrics.go
View file
File renamed without changes.
0 metrics/types/v1/types.go → core/metrics/types/v1/types.go
View file
File renamed without changes.
0 metrics/types/v2/types.go → core/metrics/types/v2/types.go
View file
File renamed without changes.

0 comments on commit df9b0a0

Please sign in to comment.