Skip to content

Commit 7af7451

Browse files
dependabot[bot]mstrandboge
dependabot[bot]
and
mstrandboge
authored
chore(deps): Bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible (#17097)
Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Maya Strandboge <[email protected]>
1 parent 8d845bc commit 7af7451

File tree

7 files changed

+35
-29
lines changed

7 files changed

+35
-29
lines changed

‎docs/LICENSE_OF_DEPENDENCIES.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ following works:
112112
- github.com/cloudevents/sdk-go [Apache License 2.0](https://github.com/cloudevents/sdk-go/blob/main/LICENSE)
113113
- github.com/cncf/xds/go [Apache License 2.0](https://github.com/cncf/xds/blob/main/LICENSE)
114114
- github.com/compose-spec/compose-go [Apache License 2.0](https://github.com/compose-spec/compose-go/blob/master/LICENSE)
115+
- github.com/containerd/errdefs [Apache License 2.0](https://github.com/containerd/errdefs/blob/main/LICENSE)
116+
- github.com/containerd/errdefs/pkg [Apache License 2.0](https://github.com/containerd/errdefs/blob/main/LICENSE)
115117
- github.com/containerd/log [Apache License 2.0](https://github.com/containerd/log/blob/main/LICENSE)
116118
- github.com/containerd/platforms [Apache License 2.0](https://github.com/containerd/platforms/blob/main/LICENSE)
117119
- github.com/coocood/freecache [MIT License](https://github.com/coocood/freecache/blob/master/LICENSE)

‎go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ require (
8080
github.com/digitalocean/go-libvirt v0.0.0-20250417173424-a6a66ef779d6
8181
github.com/dimchansky/utfbom v1.1.1
8282
github.com/djherbis/times v1.6.0
83-
github.com/docker/docker v28.1.1+incompatible
83+
github.com/docker/docker v28.2.2+incompatible
8484
github.com/docker/go-connections v0.5.0
8585
github.com/dustin/go-humanize v1.0.1
8686
github.com/dynatrace-oss/dynatrace-metric-utils-go v0.5.0
@@ -322,6 +322,8 @@ require (
322322
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
323323
github.com/cespare/xxhash/v2 v2.3.0 // indirect
324324
github.com/cncf/xds/go v0.0.0-20250326154945-ae57f3c0d45f // indirect
325+
github.com/containerd/errdefs v1.0.0 // indirect
326+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
325327
github.com/containerd/log v0.1.0 // indirect
326328
github.com/containerd/platforms v0.2.1 // indirect
327329
github.com/couchbase/gomemcached v0.1.3 // indirect

‎go.sum

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,6 +1068,10 @@ github.com/colinmarc/hdfs/v2 v2.4.0 h1:v6R8oBx/Wu9fHpdPoJJjpGSUxo8NhHIwrwsfhFvU9
10681068
github.com/colinmarc/hdfs/v2 v2.4.0/go.mod h1:0NAO+/3knbMx6+5pCv+Hcbaz4xn/Zzbn9+WIib2rKVI=
10691069
github.com/compose-spec/compose-go v1.20.2 h1:u/yfZHn4EaHGdidrZycWpxXgFffjYULlTbRfJ51ykjQ=
10701070
github.com/compose-spec/compose-go v1.20.2/go.mod h1:+MdqXV4RA7wdFsahh/Kb8U0pAJqkg7mr4PM9tFKU8RM=
1071+
github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
1072+
github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
1073+
github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE=
1074+
github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk=
10711075
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
10721076
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
10731077
github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A=
@@ -1134,8 +1138,8 @@ github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
11341138
github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
11351139
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
11361140
github.com/docker/docker v24.0.6+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
1137-
github.com/docker/docker v28.1.1+incompatible h1:49M11BFLsVO1gxY9UX9p/zwkE/rswggs8AdFmXQw51I=
1138-
github.com/docker/docker v28.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
1141+
github.com/docker/docker v28.2.2+incompatible h1:CjwRSksz8Yo4+RmQ339Dp/D2tGO5JxwYeqtMOEe0LDw=
1142+
github.com/docker/docker v28.2.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
11391143
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
11401144
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
11411145
github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=

‎plugins/inputs/docker/client.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ type dockerClient interface {
2626
// ContainerInspect retrieves detailed information about a specific container.
2727
ContainerInspect(ctx context.Context, containerID string) (container.InspectResponse, error)
2828
// ServiceList retrieves a list of services based on the specified options.
29-
ServiceList(ctx context.Context, options types.ServiceListOptions) ([]swarm.Service, error)
29+
ServiceList(ctx context.Context, options swarm.ServiceListOptions) ([]swarm.Service, error)
3030
// TaskList retrieves a list of tasks based on the specified options.
31-
TaskList(ctx context.Context, options types.TaskListOptions) ([]swarm.Task, error)
31+
TaskList(ctx context.Context, options swarm.TaskListOptions) ([]swarm.Task, error)
3232
// NodeList retrieves a list of nodes based on the specified options.
33-
NodeList(ctx context.Context, options types.NodeListOptions) ([]swarm.Node, error)
33+
NodeList(ctx context.Context, options swarm.NodeListOptions) ([]swarm.Node, error)
3434
// DiskUsage retrieves disk usage information.
3535
DiskUsage(ctx context.Context, options types.DiskUsageOptions) (types.DiskUsage, error)
3636
// ClientVersion retrieves the version of the Docker client.
@@ -90,17 +90,17 @@ func (c *socketClient) ContainerInspect(ctx context.Context, containerID string)
9090
}
9191

9292
// ServiceList retrieves a list of services based on the specified options.
93-
func (c *socketClient) ServiceList(ctx context.Context, options types.ServiceListOptions) ([]swarm.Service, error) {
93+
func (c *socketClient) ServiceList(ctx context.Context, options swarm.ServiceListOptions) ([]swarm.Service, error) {
9494
return c.client.ServiceList(ctx, options)
9595
}
9696

9797
// TaskList retrieves a list of tasks based on the specified options.
98-
func (c *socketClient) TaskList(ctx context.Context, options types.TaskListOptions) ([]swarm.Task, error) {
98+
func (c *socketClient) TaskList(ctx context.Context, options swarm.TaskListOptions) ([]swarm.Task, error) {
9999
return c.client.TaskList(ctx, options)
100100
}
101101

102102
// NodeList retrieves a list of nodes based on the specified options.
103-
func (c *socketClient) NodeList(ctx context.Context, options types.NodeListOptions) ([]swarm.Node, error) {
103+
func (c *socketClient) NodeList(ctx context.Context, options swarm.NodeListOptions) ([]swarm.Node, error) {
104104
return c.client.NodeList(ctx, options)
105105
}
106106

‎plugins/inputs/docker/docker.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ func (d *Docker) gatherSwarmInfo(acc telegraf.Accumulator) error {
256256
ctx, cancel := context.WithTimeout(context.Background(), time.Duration(d.Timeout))
257257
defer cancel()
258258

259-
services, err := d.client.ServiceList(ctx, types.ServiceListOptions{})
259+
services, err := d.client.ServiceList(ctx, swarm.ServiceListOptions{})
260260
if errors.Is(err, context.DeadlineExceeded) {
261261
return errServiceTimeout
262262
}
@@ -265,12 +265,12 @@ func (d *Docker) gatherSwarmInfo(acc telegraf.Accumulator) error {
265265
}
266266

267267
if len(services) > 0 {
268-
tasks, err := d.client.TaskList(ctx, types.TaskListOptions{})
268+
tasks, err := d.client.TaskList(ctx, swarm.TaskListOptions{})
269269
if err != nil {
270270
return err
271271
}
272272

273-
nodes, err := d.client.NodeList(ctx, types.NodeListOptions{})
273+
nodes, err := d.client.NodeList(ctx, swarm.NodeListOptions{})
274274
if err != nil {
275275
return err
276276
}

‎plugins/inputs/docker/docker_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@ func (c *mockClient) ContainerInspect(context.Context, string) (container.Inspec
5050
return c.ContainerInspectF()
5151
}
5252

53-
func (c *mockClient) ServiceList(context.Context, types.ServiceListOptions) ([]swarm.Service, error) {
53+
func (c *mockClient) ServiceList(context.Context, swarm.ServiceListOptions) ([]swarm.Service, error) {
5454
return c.ServiceListF()
5555
}
5656

57-
func (c *mockClient) TaskList(context.Context, types.TaskListOptions) ([]swarm.Task, error) {
57+
func (c *mockClient) TaskList(context.Context, swarm.TaskListOptions) ([]swarm.Task, error) {
5858
return c.TaskListF()
5959
}
6060

61-
func (c *mockClient) NodeList(context.Context, types.NodeListOptions) ([]swarm.Node, error) {
61+
func (c *mockClient) NodeList(context.Context, swarm.NodeListOptions) ([]swarm.Node, error) {
6262
return c.NodeListF()
6363
}
6464

‎plugins/inputs/docker/docker_testdata.go

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,10 @@ var info = system.Info{
4545
Secure: true,
4646
},
4747
}, InsecureRegistryCIDRs: []*registry.NetIPNet{{IP: []byte{127, 0, 0, 0}, Mask: []byte{255, 0, 0, 0}}}, Mirrors: make([]string, 0)},
48-
OperatingSystem: "Linux Mint LMDE (containerized)",
49-
BridgeNfIptables: true,
50-
HTTPSProxy: "",
51-
Labels: make([]string, 0),
52-
MemoryLimit: false,
48+
OperatingSystem: "Linux Mint LMDE (containerized)",
49+
HTTPSProxy: "",
50+
Labels: make([]string, 0),
51+
MemoryLimit: false,
5352
DriverStatus: [][2]string{
5453
{"Pool Name", "docker-8:1-1182287-pool"},
5554
{"Base Device Size", "10.74 GB"},
@@ -70,15 +69,14 @@ var info = system.Info{
7069
{"Library Version", "1.02.115 (2016-01-25)"},
7170
{"Thin Pool Minimum Free Space", "10.74GB"},
7271
},
73-
NFd: 19,
74-
HTTPProxy: "",
75-
Driver: "devicemapper",
76-
NGoroutines: 39,
77-
NCPU: 4,
78-
DockerRootDir: "/var/lib/docker",
79-
NoProxy: "",
80-
BridgeNfIP6tables: true,
81-
ServerVersion: "17.09.0-ce",
72+
NFd: 19,
73+
HTTPProxy: "",
74+
Driver: "devicemapper",
75+
NGoroutines: 39,
76+
NCPU: 4,
77+
DockerRootDir: "/var/lib/docker",
78+
NoProxy: "",
79+
ServerVersion: "17.09.0-ce",
8280
}
8381

8482
var containerList = []container.Summary{

0 commit comments

Comments
 (0)