diff --git a/src/runtime/containerd-shim-v2/metrics_test.go b/src/runtime/containerd-shim-v2/metrics_test.go index a2ff047d9a..d40ba6347e 100644 --- a/src/runtime/containerd-shim-v2/metrics_test.go +++ b/src/runtime/containerd-shim-v2/metrics_test.go @@ -7,6 +7,7 @@ package containerdshim import ( + "context" "testing" "github.com/containerd/cgroups" @@ -50,7 +51,7 @@ func TestStatNetworkMetric(t *testing.T) { sandbox.StatsContainerFunc = nil }() - resp, err := sandbox.StatsContainer(testContainerID) + resp, err := sandbox.StatsContainer(context.Background(), testContainerID) assert.NoError(err) metrics := statsToMetrics(&resp) diff --git a/src/runtime/containerd-shim-v2/shim_metrics_test.go b/src/runtime/containerd-shim-v2/shim_metrics_test.go index 03b09ee991..1808f66e37 100644 --- a/src/runtime/containerd-shim-v2/shim_metrics_test.go +++ b/src/runtime/containerd-shim-v2/shim_metrics_test.go @@ -6,6 +6,7 @@ package containerdshim import ( + "context" "testing" vc "github.com/kata-containers/kata-containers/src/runtime/virtcontainers" @@ -83,7 +84,7 @@ func TestStatsSandbox(t *testing.T) { containers: make(map[string]*container), } - initialSandboxStats, initialContainerStats, err := s.statsSandbox() + initialSandboxStats, initialContainerStats, err := s.statsSandbox(context.Background()) assert.Nil(err) assert.Equal(uint64(1000*1e9), initialSandboxStats.CgroupStats.CPUStats.CPUUsage.TotalUsage) assert.Equal(2, len(initialContainerStats)) @@ -96,7 +97,7 @@ func TestStatsSandbox(t *testing.T) { sandbox.StatsFunc = getSandboxCPUFunc(2000, 110000) sandbox.StatsContainerFunc = getStatsContainerCPUFunc(200, 400, 20000, 40000) - finishSandboxStats, finishContainersStats, err := s.statsSandbox() + finishSandboxStats, finishContainersStats, err := s.statsSandbox(context.Background()) // calc overhead mem, cpu := calcOverhead(initialSandboxStats, finishSandboxStats, initialContainerStats, finishContainersStats, 1e9) diff --git a/src/runtime/virtcontainers/pkg/vcmock/sandbox.go b/src/runtime/virtcontainers/pkg/vcmock/sandbox.go index 168bb51e33..0eee87ef15 100644 --- a/src/runtime/virtcontainers/pkg/vcmock/sandbox.go +++ b/src/runtime/virtcontainers/pkg/vcmock/sandbox.go @@ -71,12 +71,12 @@ func (s *Sandbox) Release(ctx context.Context) error { } // Start implements the VCSandbox function of the same name. -func (s *Sandbox) Start() error { +func (s *Sandbox) Start(ctx context.Context) error { return nil } // Stop implements the VCSandbox function of the same name. -func (s *Sandbox) Stop(force bool) error { +func (s *Sandbox) Stop(ctx context.Context, force bool) error { return nil } @@ -114,7 +114,7 @@ func (s *Sandbox) StartContainer(ctx context.Context, contID string) (vc.VCConta } // StopContainer implements the VCSandbox function of the same name. -func (s *Sandbox) StopContainer(contID string, force bool) (vc.VCContainer, error) { +func (s *Sandbox) StopContainer(ctx context.Context, contID string, force bool) (vc.VCContainer, error) { return &Container{}, nil }