Bump github.com/docker/docker from 27.3.1+incompatible to 27.4.1+incompatible in /internal/signalfx-agent (#5747)

dependabot[bot] · crobert-1 · web-flow · commit d09c35874025 · 2025-03-18T12:43:38.000-07:00
* Bump github.com/docker/docker in /internal/signalfx-agent Bumps [github.com/docker/docker](https://github.com/docker/docker) from 27.3.1+incompatible to 27.4.1+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](moby/moby@v27.3.1...v27.4.1) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * make tidy, make fmt, handle deprecations - dtypes.ContainerJSON is deprecated: use [container.InspectResponse] - dtypes.ContainerJSONBase is deprecated: use [container.InspectResponse] or [container.ContainerJSONBase] * dtypes.ContainerJSON is deprecated: use [container.InspectResponse] --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Curtis Robert <crobert@splunk.com>
diff --git a/go.mod b/go.mod
@@ -481,7 +481,7 @@ require (
 	github.com/danieljoos/wincred v1.2.1 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/devigned/tab v0.1.1 // indirect
-	github.com/docker/docker v27.5.1+incompatible // indirect
+	github.com/docker/docker v28.0.1+incompatible // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/dvsekhvalnov/jose2go v1.6.0 // indirect
diff --git a/go.sum b/go.sum
@@ -437,8 +437,8 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
 github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
-github.com/docker/docker v27.5.1+incompatible h1:4PYU5dnBYqRQi0294d1FBECqT9ECWeQAIfE8q4YnPY8=
-github.com/docker/docker v27.5.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v28.0.1+incompatible h1:FCHjSRdXhNRFjlHMTv4jUNlIBbTeRjrWfeFuJp7jpo0=
+github.com/docker/docker v28.0.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
 github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
diff --git a/internal/signalfx-agent/go.mod b/internal/signalfx-agent/go.mod
@@ -16,7 +16,7 @@ require (
 	github.com/beevik/ntp v1.4.3
 	github.com/cloudfoundry-incubator/uaago v0.0.0-20190307164349-8136b7bbe76e
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
-	github.com/docker/docker v27.3.1+incompatible
+	github.com/docker/docker v28.0.1+incompatible
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/go-playground/locales v0.14.1
 	github.com/go-playground/universal-translator v0.18.1
diff --git a/internal/signalfx-agent/go.sum b/internal/signalfx-agent/go.sum
@@ -120,8 +120,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
-github.com/docker/docker v27.3.1+incompatible h1:KttF0XoteNTicmUtBO0L2tP+J7FGRFTjaEF4k6WdhfI=
-github.com/docker/docker v27.3.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v28.0.1+incompatible h1:FCHjSRdXhNRFjlHMTv4jUNlIBbTeRjrWfeFuJp7jpo0=
+github.com/docker/docker v28.0.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
 github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
diff --git a/internal/signalfx-agent/pkg/core/common/docker/containerlist.go b/internal/signalfx-agent/pkg/core/common/docker/containerlist.go
@@ -5,7 +5,6 @@ import (
 	"sync"
 	"time"
 
-	dtypes "github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/events"
 	"github.com/docker/docker/api/types/filters"
@@ -19,12 +18,12 @@ import (
 // initially recognized or changed in some way.  oldState will be the previous state,
 // or nil if no previous state is known.  newState is the new state, or nil if the
 // container is being destroyed.
-type ContainerChangeHandler func(oldState *dtypes.ContainerJSON, newState *dtypes.ContainerJSON)
+type ContainerChangeHandler func(oldState *container.InspectResponse, newState *container.InspectResponse)
 
 // ListAndWatchContainers accepts a changeHandler that gets called as containers come and go.
 func ListAndWatchContainers(ctx context.Context, client *docker.Client, changeHandler ContainerChangeHandler, imageFilter filter.StringFilter, logger log.FieldLogger, syncTime time.Duration) {
 	lock := sync.Mutex{}
-	containers := make(map[string]*dtypes.ContainerJSON)
+	containers := make(map[string]*container.InspectResponse)
 
 	// Make sure you hold the lock before calling this
 	updateContainer := func(id string) bool {
diff --git a/internal/signalfx-agent/pkg/monitors/docker/conversion.go b/internal/signalfx-agent/pkg/monitors/docker/conversion.go
@@ -5,7 +5,6 @@ import (
 	"strings"
 	"time"
 
-	dtypes "github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/signalfx/golib/v3/datapoint"
 	"github.com/signalfx/golib/v3/sfxclient"
@@ -28,7 +27,7 @@ var basicBlockIOMetrics = map[string]bool{
 }
 
 // ConvertStatsToMetrics converts a docker container stats object into an array of datapoints
-func ConvertStatsToMetrics(container *dtypes.ContainerJSON, parsed *container.StatsResponse, enhancedMetricsConfig EnhancedMetricsConfig) ([]*datapoint.Datapoint, error) {
+func ConvertStatsToMetrics(container *container.InspectResponse, parsed *container.StatsResponse, enhancedMetricsConfig EnhancedMetricsConfig) ([]*datapoint.Datapoint, error) {
 	var dps []*datapoint.Datapoint
 	dps = append(dps, convertBlkioStats(&parsed.BlkioStats, enhancedMetricsConfig.EnableExtraBlockIOMetrics)...)
 	dps = append(dps, convertCPUStats(&parsed.CPUStats, &parsed.PreCPUStats, enhancedMetricsConfig.EnableExtraCPUMetrics)...)
diff --git a/internal/signalfx-agent/pkg/monitors/docker/docker.go b/internal/signalfx-agent/pkg/monitors/docker/docker.go
@@ -115,7 +115,7 @@ func (m *Monitor) Configure(conf *Config) error {
 	containers := map[string]dockerContainer{}
 	isRegistered := false
 
-	changeHandler := func(oldState *dtypes.ContainerJSON, newState *dtypes.ContainerJSON) {
+	changeHandler := func(oldState *dcontainer.InspectResponse, newState *dcontainer.InspectResponse) {
 		if oldState == nil && newState == nil {
 			return
 		}
diff --git a/internal/signalfx-agent/pkg/monitors/ecs/ecs.go b/internal/signalfx-agent/pkg/monitors/ecs/ecs.go
@@ -12,7 +12,6 @@ import (
 	"strings"
 	"time"
 
-	dtypes "github.com/docker/docker/api/types"
 	dcontainer "github.com/docker/docker/api/types/container"
 	"github.com/signalfx/golib/v3/datapoint"
 	"github.com/signalfx/golib/v3/sfxclient"
@@ -188,8 +187,8 @@ func (m *Monitor) fetchStatsForAll(enhancedMetricsConfig dmonitor.EnhancedMetric
 			m.containers[dockerID] = container
 		}
 
-		containerJSON := &dtypes.ContainerJSON{
-			ContainerJSONBase: &dtypes.ContainerJSONBase{
+		containerJSON := &dcontainer.InspectResponse{
+			ContainerJSONBase: &dcontainer.ContainerJSONBase{
 				ID:   dockerID,
 				Name: container.Name,
 			},
diff --git a/pkg/receiver/smartagentreceiver/go.mod b/pkg/receiver/smartagentreceiver/go.mod
@@ -73,7 +73,7 @@ require (
 	github.com/danieljoos/wincred v1.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/distribution/reference v0.6.0 // indirect
-	github.com/docker/docker v27.3.1+incompatible // indirect
+	github.com/docker/docker v28.0.1+incompatible // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/dvsekhvalnov/jose2go v1.6.0 // indirect
diff --git a/pkg/receiver/smartagentreceiver/go.sum b/pkg/receiver/smartagentreceiver/go.sum
@@ -155,8 +155,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
-github.com/docker/docker v27.3.1+incompatible h1:KttF0XoteNTicmUtBO0L2tP+J7FGRFTjaEF4k6WdhfI=
-github.com/docker/docker v27.3.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v28.0.1+incompatible h1:FCHjSRdXhNRFjlHMTv4jUNlIBbTeRjrWfeFuJp7jpo0=
+github.com/docker/docker v28.0.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
 github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=

-Original file line number
+Diff line change
 	github.com/danieljoos/wincred v1.2.1 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/devigned/tab v0.1.1 // indirect
 -	github.com/docker/docker v27.5.1+incompatible // indirect
 +	github.com/docker/docker v28.0.1+incompatible // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/dvsekhvalnov/jose2go v1.6.0 // indirect
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ func (m Monitor) Configure(conf Config) error {`
`115`	`115`	`containers := map[string]dockerContainer{}`
`116`	`116`	`isRegistered := false`
`117`	`117`
`118`		`- changeHandler := func(oldState dtypes.ContainerJSON, newState dtypes.ContainerJSON) {`
	`118`	`+ changeHandler := func(oldState dcontainer.InspectResponse, newState dcontainer.InspectResponse) {`
`119`	`119`	`if oldState == nil && newState == nil {`
`120`	`120`	`return`
`121`	`121`	`}`