Merge branch 'main' into PRODUCT-2836-upgrade-glouton-to-prometheus-3.0

Author: PierreF

facts/container-runtime/containerd/containerd.go

@@ -35,16 +35,17 @@ import (
 	containerTypes "github.com/bleemeo/glouton/facts/container-runtime/types"
 	"github.com/bleemeo/glouton/logger"
 	"github.com/bleemeo/glouton/types"
+
 	v1 "github.com/containerd/cgroups/v3/cgroup1/stats"
 	v2 "github.com/containerd/cgroups/v3/cgroup2/stats"
-	"github.com/containerd/containerd"
 	pbEvents "github.com/containerd/containerd/api/events"
 	"github.com/containerd/containerd/api/services/tasks/v1"
-	"github.com/containerd/containerd/cio"
-	"github.com/containerd/containerd/containers"
-	"github.com/containerd/containerd/events"
-	"github.com/containerd/containerd/namespaces"
-	"github.com/containerd/containerd/oci"
+	"github.com/containerd/containerd/v2/client"
+	"github.com/containerd/containerd/v2/core/containers"
+	"github.com/containerd/containerd/v2/core/events"
+	"github.com/containerd/containerd/v2/pkg/cio"
+	"github.com/containerd/containerd/v2/pkg/namespaces"
+	"github.com/containerd/containerd/v2/pkg/oci"
 	"github.com/containerd/errdefs"
 	"github.com/containerd/typeurl/v2"
 	"github.com/mitchellh/copystructure"
@@ -129,10 +130,10 @@ func (c *Containerd) DiagnosticArchive(_ context.Context, archive types.ArchiveW
 		IsIgnored bool
 	}
 
-	containers := make([]containerInfo, 0, len(c.containers))
+	ctrs := make([]containerInfo, 0, len(c.containers))
 
 	for _, row := range c.containers {
-		containers = append(containers, containerInfo{
+		ctrs = append(ctrs, containerInfo{
 			ID:        row.ID(),
 			Name:      row.ContainerName(),
 			IsIgnored: c.ignoredID[row.ID()],
@@ -147,7 +148,7 @@ func (c *Containerd) DiagnosticArchive(_ context.Context, archive types.ArchiveW
 		PastMetricValues  []metricValue
 	}{
 		WorkedOnce:        c.workedOnce,
-		Containers:        containers,
+		Containers:        ctrs,
 		LastDestroyedName: c.lastDestroyedName,
 		LastUpdate:        c.lastUpdate,
 		PastMetricValues:  c.pastMetricValues,
@@ -477,21 +478,21 @@ func (c *Containerd) Exec(ctx context.Context, containerID string, cmd []string)
 		cio.WithStreams(nil, buffer, buffer),
 	)
 
-	process, err := task.Exec(ctx, "glouton-exec-id", &pspec, ioCreator)
+	proc, err := task.Exec(ctx, "glouton-exec-id", &pspec, ioCreator)
 	if err != nil {
 		return nil, err
 	}
 
-	statusC, err := process.Wait(ctx)
+	statusC, err := proc.Wait(ctx)
 	if err != nil {
 		return nil, err
 	}
 
-	if err := process.Start(ctx); err != nil {
+	if err := proc.Start(ctx); err != nil {
 		return nil, err
 	}
 
-	var status containerd.ExitStatus
+	var status client.ExitStatus
 
 	select {
 	case status = <-statusC:
@@ -763,7 +764,7 @@ func (c *Containerd) updateContainers(ctx context.Context) error {
 		return fmt.Errorf("listing namespaces failed: %w", err)
 	}
 
-	containers := make(map[string]containerObject)
+	ctrs := make(map[string]containerObject)
 	ignoredID := make(map[string]bool)
 
 	for _, ns := range nsList {
@@ -773,7 +774,7 @@ func (c *Containerd) updateContainers(ctx context.Context) error {
 
 		ctx := namespaces.WithNamespace(ctx, ns)
 
-		err := c.addContainersInfo(ctx, containers, cl, ns, ignoredID)
+		err := c.addContainersInfo(ctx, ctrs, cl, ns, ignoredID)
 		if err != nil {
 			return err
 		}
@@ -782,7 +783,7 @@ func (c *Containerd) updateContainers(ctx context.Context) error {
 	var deletedContainerID []string
 
 	for k := range c.containers {
-		if _, ok := containers[k]; !ok {
+		if _, ok := ctrs[k]; !ok {
 			deletedContainerID = append(deletedContainerID, k)
 		}
 	}
@@ -796,20 +797,20 @@ func (c *Containerd) updateContainers(ctx context.Context) error {
 			"ContainerD runtime request to delete %d containers (previous container count was %d, new containers count is %d)",
 			len(deletedContainerID),
 			len(c.containers),
-			len(containers),
+			len(ctrs),
 		)
 		c.DeletedContainersCallback(deletedContainerID)
 	}
 
 	c.lastUpdate = time.Now()
-	c.containers = containers
+	c.containers = ctrs
 	c.ignoredID = ignoredID
 
 	return nil
 }
 
-func convertToContainerObject(ctx context.Context, ns string, cont containerd.Container) (containerObject, error) {
-	info, err := cont.Info(ctx, containerd.WithoutRefreshedMetadata)
+func convertToContainerObject(ctx context.Context, ns string, cont client.Container) (containerObject, error) {
+	info, err := cont.Info(ctx, client.WithoutRefreshedMetadata)
 	if err != nil {
 		return containerObject{}, fmt.Errorf("Info() on %s/%s failed: %w", ns, cont.ID(), err)
 	}
@@ -840,7 +841,7 @@ func convertToContainerObject(ctx context.Context, ns string, cont containerd.Co
 			Container: info,
 			Spec:      &spec,
 		},
-		state:   string(containerd.Unknown),
+		state:   string(client.Unknown),
 		imageID: imgDigest,
 	}
 
@@ -931,11 +932,13 @@ func (c *Containerd) getClient(ctx context.Context) (containerdClient, error) {
 			_, err = cl.Version(ctx)
 			if err != nil {
 				if firstErr == nil {
-					logger.V(2).Printf("ContainerD openConnection on %s failed: %v", addr, err)
+					logger.V(2).Printf("ContainerD interaction on %s failed: %v", addr, err)
 
 					firstErr = err
 				}
 
+				_ = cl.Close()
+
 				continue
 			}
 
@@ -955,9 +958,9 @@ func (c *Containerd) getClient(ctx context.Context) (containerdClient, error) {
 }
 
 type containerdClient interface {
-	LoadContainer(ctx context.Context, id string) (containerd.Container, error)
-	Containers(ctx context.Context) ([]containerd.Container, error)
-	Version(ctx context.Context) (containerd.Version, error)
+	LoadContainer(ctx context.Context, id string) (client.Container, error)
+	Containers(ctx context.Context) ([]client.Container, error)
+	Version(ctx context.Context) (client.Version, error)
 	Namespaces(ctx context.Context) ([]string, error)
 	Events(ctx context.Context) (ch <-chan *events.Envelope, errs <-chan error)
 	Metrics(ctx context.Context, filters []string) (*tasks.MetricsResponse, error)
@@ -972,27 +975,27 @@ func openConnection(_ context.Context, address string) (containerdClient, error)
 		}
 	}
 
-	client, err := containerd.New(address)
+	cl, err := client.New(address)
 	if err != nil {
 		return nil, fmt.Errorf("failed to connect to containerd at address %s: %w", address, err)
 	}
 
-	return realClient{client: client}, nil
+	return realClient{client: cl}, nil
 }
 
 type realClient struct {
-	client *containerd.Client
+	client *client.Client
 }
 
-func (cl realClient) Containers(ctx context.Context) ([]containerd.Container, error) {
+func (cl realClient) Containers(ctx context.Context) ([]client.Container, error) {
 	return cl.client.Containers(ctx)
 }
 
-func (cl realClient) LoadContainer(ctx context.Context, id string) (containerd.Container, error) {
+func (cl realClient) LoadContainer(ctx context.Context, id string) (client.Container, error) {
 	return cl.client.LoadContainer(ctx, id)
 }
 
-func (cl realClient) Version(ctx context.Context) (containerd.Version, error) {
+func (cl realClient) Version(ctx context.Context) (client.Version, error) {
 	return cl.client.Version(ctx)
 }
 
@@ -1153,18 +1156,18 @@ func (c containerObject) StartedAt() time.Time {
 }
 
 func (c containerObject) State() facts.ContainerState {
-	switch containerd.ProcessStatus(c.state) {
-	case containerd.Created:
+	switch client.ProcessStatus(c.state) {
+	case client.Created:
 		return facts.ContainerCreated
-	case containerd.Paused:
+	case client.Paused:
 		return facts.ContainerRunning
-	case containerd.Pausing:
+	case client.Pausing:
 		return facts.ContainerRunning
-	case containerd.Running:
+	case client.Running:
 		return facts.ContainerRunning
-	case containerd.Stopped:
+	case client.Stopped:
 		return facts.ContainerStopped
-	case containerd.Unknown:
+	case client.Unknown:
 		return facts.ContainerUnknown
 	default:
 		return facts.ContainerUnknown
@@ -1205,7 +1208,7 @@ var cgroupRE = regexp.MustCompile(
 
 type namespaceContainer struct {
 	namespace string
-	container containerd.Container
+	container client.Container
 }
 
 type containerdProcessQuerier struct {