go.d bump github.com/docker/docker v27.0.0+incompatible (#17921)

6 files changed, 9 insertions, 7 deletions

diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/dockerd/dockerd_test.go b/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/dockerd/dockerd_test.go
index 14ad5f9200..d325f99dd4 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/dockerd/dockerd_test.go
+++ b/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/dockerd/dockerd_test.go
@@ -141,7 +141,8 @@ func prepareNginxContainer(name string) types.Container {
 		},
 		Labels: map[string]string{"key1": "value1"},
 		HostConfig: struct {
-			NetworkMode string `json:",omitempty"`
+			NetworkMode string            `json:",omitempty"`
+			Annotations map[string]string `json:",omitempty"`
 		}{
 			NetworkMode: "default",
 		},
diff --git a/src/go/collectors/go.d.plugin/go.mod b/src/go/collectors/go.d.plugin/go.mod
index ff0a985b71..47802583cf 100644
--- a/src/go/collectors/go.d.plugin/go.mod
+++ b/src/go/collectors/go.d.plugin/go.mod
@@ -16,7 +16,7 @@ require (
 	github.com/clbanning/rfile/v2 v2.0.0-20231024120205-ac3fca974b0e
 	github.com/cloudflare/cfssl v1.6.5
 	github.com/coreos/go-systemd/v22 v22.5.0
-	github.com/docker/docker v26.1.4+incompatible
+	github.com/docker/docker v27.0.0+incompatible
 	github.com/facebook/time v0.0.0-20240419201005-e4f24e18edf7
 	github.com/fsnotify/fsnotify v1.7.0
 	github.com/go-redis/redis/v8 v8.11.5
diff --git a/src/go/collectors/go.d.plugin/go.sum b/src/go/collectors/go.d.plugin/go.sum
index 3d3d214a9c..b2eb24d0fe 100644
--- a/src/go/collectors/go.d.plugin/go.sum
+++ b/src/go/collectors/go.d.plugin/go.sum
@@ -54,8 +54,8 @@ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/r
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=
 github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
-github.com/docker/docker v26.1.4+incompatible h1:vuTpXDuoga+Z38m1OZHzl7NKisKWaWlhjQk7IDPSLsU=
-github.com/docker/docker v26.1.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v27.0.0+incompatible h1:JRugTYuelmWlW0M3jakcIadDx2HUoUO6+Tf2C5jVfwA=
+github.com/docker/docker v27.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
diff --git a/src/go/collectors/go.d.plugin/modules/docker/collect.go b/src/go/collectors/go.d.plugin/modules/docker/collect.go
index 7b5af7cabd..f23c58f22e 100644
--- a/src/go/collectors/go.d.plugin/modules/docker/collect.go
+++ b/src/go/collectors/go.d.plugin/modules/docker/collect.go
@@ -10,6 +10,7 @@ import (
 	"github.com/docker/docker/api/types"
 	typesContainer "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"
+	typesImage "github.com/docker/docker/api/types/image"
 )
 
 func (d *Docker) collect() (map[string]int64, error) {
@@ -63,7 +64,7 @@ func (d *Docker) collectImages(mx map[string]int64) error {
 	ctx, cancel := context.WithTimeout(context.Background(), d.Timeout.Duration())
 	defer cancel()
 
-	images, err := d.client.ImageList(ctx, types.ImageListOptions{})
+	images, err := d.client.ImageList(ctx, typesImage.ListOptions{})
 	if err != nil {
 		return err
 	}
diff --git a/src/go/collectors/go.d.plugin/modules/docker/docker.go b/src/go/collectors/go.d.plugin/modules/docker/docker.go
index 4680e620fc..ecf34c6b7e 100644
--- a/src/go/collectors/go.d.plugin/modules/docker/docker.go
+++ b/src/go/collectors/go.d.plugin/modules/docker/docker.go
@@ -68,7 +68,7 @@ type (
 	dockerClient interface {
 		NegotiateAPIVersion(context.Context)
 		Info(context.Context) (typesSystem.Info, error)
-		ImageList(context.Context, types.ImageListOptions) ([]typesImage.Summary, error)
+		ImageList(context.Context, typesImage.ListOptions) ([]typesImage.Summary, error)
 		ContainerList(context.Context, typesContainer.ListOptions) ([]types.Container, error)
 		Close() error
 	}
diff --git a/src/go/collectors/go.d.plugin/modules/docker/docker_test.go b/src/go/collectors/go.d.plugin/modules/docker/docker_test.go
index 934178b9a0..8125cd3c18 100644
--- a/src/go/collectors/go.d.plugin/modules/docker/docker_test.go
+++ b/src/go/collectors/go.d.plugin/modules/docker/docker_test.go
@@ -825,7 +825,7 @@ func (m *mockClient) ContainerList(_ context.Context, opts typesContainer.ListOp
 	return containers, nil
 }
 
-func (m *mockClient) ImageList(_ context.Context, _ types.ImageListOptions) ([]typesImage.Summary, error) {
+func (m *mockClient) ImageList(_ context.Context, _ typesImage.ListOptions) ([]typesImage.Summary, error) {
 	if m.errOnImageList {
 		return nil, errors.New("mockClient.ImageList() error")
 	}