From b9d172a78d8a5e7e12eaf5bc8d67ad353e782e64 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Tue, 11 Nov 2025 10:48:24 +0100 Subject: [PATCH] conntrackfixer: upgrade to github.com/moby/moby v29 There are several changes in this version. --- conntrackfixer/interfaces.go | 5 ++- conntrackfixer/root.go | 34 ++++++++-------- conntrackfixer/root_test.go | 76 +++++++++++++++++++++++------------- go.mod | 16 ++++---- go.sum | 46 +++++++--------------- 5 files changed, 91 insertions(+), 86 deletions(-) diff --git a/conntrackfixer/interfaces.go b/conntrackfixer/interfaces.go index 496f795e..17edce9f 100644 --- a/conntrackfixer/interfaces.go +++ b/conntrackfixer/interfaces.go @@ -6,7 +6,9 @@ package conntrackfixer import ( - "github.com/docker/docker/client" + "context" + + "github.com/moby/moby/client" "github.com/ti-mo/conntrack" ) @@ -21,5 +23,6 @@ type ConntrackConn interface { type DockerClient interface { client.ContainerAPIClient client.SystemAPIClient + ServerVersion(ctx context.Context, options client.ServerVersionOptions) (client.ServerVersionResult, error) Close() error } diff --git a/conntrackfixer/root.go b/conntrackfixer/root.go index 68025f57..e3c05612 100644 --- a/conntrackfixer/root.go +++ b/conntrackfixer/root.go @@ -17,10 +17,7 @@ import ( "akvorado/common/httpserver" "akvorado/common/reporter" - "github.com/docker/docker/api/types/container" - "github.com/docker/docker/api/types/events" - "github.com/docker/docker/api/types/filters" - "github.com/docker/docker/client" + "github.com/moby/moby/client" "github.com/ti-mo/conntrack" "gopkg.in/tomb.v2" ) @@ -52,11 +49,13 @@ type Dependencies struct { // New creates a new component func New(r *reporter.Reporter, dependencies Dependencies) (*Component, error) { - cli, err := client.NewClientWithOpts(client.FromEnv) + cli, err := client.New( + client.FromEnv, + client.WithAPIVersionNegotiation(), + ) if err != nil { return nil, fmt.Errorf("unable to initialize Docker client: %w", err) } - cli.NegotiateAPIVersion(context.Background()) chl, err := conntrack.Dial(nil) if err != nil { cli.Close() @@ -116,19 +115,19 @@ func (c *Component) Start() error { // Goroutine to watch for changes ready := make(chan bool) c.t.Go(func() error { - filter := filters.NewArgs() + filter := client.Filters{} filter.Add("event", "start") filter.Add("label", "akvorado.conntrack.fix=true") - msgs, errs := c.dockerClient.Events(c.t.Context(nil), events.ListOptions{Filters: filter}) + events := c.dockerClient.Events(c.t.Context(nil), client.EventsListOptions{Filters: filter}) close(ready) for { t := time.NewTimer(5 * time.Minute) select { case <-c.t.Dying(): return nil - case err := <-errs: + case err := <-events.Err: return fmt.Errorf("error while watching for Docker events: %w", err) - case msg := <-msgs: + case msg := <-events.Messages: c.r.Info(). Str("id", msg.Actor.ID). Str("from", msg.Actor.Attributes["image"]). @@ -145,7 +144,7 @@ func (c *Component) Start() error { // Goroutine to react to changes c.t.Go(func() error { - filter := filters.NewArgs() + filter := client.Filters{} filter.Add("label", "akvorado.conntrack.fix=true") for { select { @@ -154,7 +153,7 @@ func (c *Component) Start() error { case cb, ok := <-c.healthy: if ok { ctx, cancel := context.WithTimeout(c.t.Context(nil), time.Second) - if _, err := c.dockerClient.Ping(ctx); err == nil { + if _, err := c.dockerClient.ServerVersion(ctx, client.ServerVersionOptions{}); err == nil { cb(reporter.HealthcheckOK, "docker client alive") } else { cb(reporter.HealthcheckWarning, "docker client unavailable") @@ -163,7 +162,7 @@ func (c *Component) Start() error { } case <-c.changes: containers, err := c.dockerClient.ContainerList(c.t.Context(nil), - container.ListOptions{ + client.ContainerListOptions{ Filters: filter, }) if err != nil { @@ -171,15 +170,16 @@ func (c *Component) Start() error { c.metrics.errors.WithLabelValues("cannot list containers").Inc() continue } - for _, container := range containers { - details, err := c.dockerClient.ContainerInspect(c.t.Context(nil), container.ID) + for _, container := range containers.Items { + details, err := c.dockerClient.ContainerInspect(c.t.Context(nil), container.ID, + client.ContainerInspectOptions{}) if err != nil { c.r.Err(err).Msg("cannot get details on container") c.metrics.errors.WithLabelValues("cannot get details on container").Inc() continue } - for rport, bindings := range details.NetworkSettings.Ports { - if !strings.HasSuffix(string(rport), "/udp") { + for rport, bindings := range details.Container.NetworkSettings.Ports { + if !strings.HasSuffix(rport.String(), "/udp") { continue } ports := map[string]struct{}{} diff --git a/conntrackfixer/root_test.go b/conntrackfixer/root_test.go index e7c5ab59..daf17d2b 100644 --- a/conntrackfixer/root_test.go +++ b/conntrackfixer/root_test.go @@ -8,13 +8,14 @@ package conntrackfixer import ( "context" "errors" + "net/netip" "testing" "time" - "github.com/docker/docker/api/types" - "github.com/docker/docker/api/types/container" - "github.com/docker/docker/api/types/events" - "github.com/docker/go-connections/nat" + "github.com/moby/moby/api/types/container" + "github.com/moby/moby/api/types/events" + "github.com/moby/moby/api/types/network" + "github.com/moby/moby/client" _ "github.com/opencontainers/image-spec/specs-go/v1" // used by mock "github.com/ti-mo/conntrack" "go.uber.org/mock/gomock" @@ -51,29 +52,36 @@ func TestRoot(t *testing.T) { Close(). Return(nil) - dockerEvents := make(chan events.Message) - dockerErrors := make(chan error) + dockerEventMessages := make(chan events.Message) + dockerEvents := client.EventsResult{ + Messages: dockerEventMessages, + Err: nil, + } dockerClientMock.EXPECT(). Events(gomock.Any(), gomock.Any()). - Return(dockerEvents, dockerErrors) + Return(dockerEvents) // Initial trigger networkSettings := &container.NetworkSettings{} - networkSettings.Ports = map[nat.Port][]nat.PortBinding{ - "2055/udp": { - nat.PortBinding{ - HostIP: "127.0.0.1", + networkSettings.Ports = network.PortMap{ + network.MustParsePort("2055/udp"): { + network.PortBinding{ + HostIP: netip.MustParseAddr("127.0.0.1"), HostPort: "6776", }, }, } dockerClientMock.EXPECT(). ContainerList(gomock.Any(), gomock.Any()). - Return([]container.Summary{{ID: "initial"}}, nil) + Return(client.ContainerListResult{ + Items: []container.Summary{{ID: "initial"}}, + }, nil) dockerClientMock.EXPECT(). - ContainerInspect(gomock.Any(), "initial"). - Return(container.InspectResponse{ - NetworkSettings: networkSettings, + ContainerInspect(gomock.Any(), "initial", gomock.Any()). + Return(client.ContainerInspectResult{ + Container: container.InspectResponse{ + NetworkSettings: networkSettings, + }, }, nil) conntrackConnMock.EXPECT(). Dump(nil). @@ -111,7 +119,8 @@ func TestRoot(t *testing.T) { // Healthcheck test t.Run("healthcheck", func(t *testing.T) { - dockerClientMock.EXPECT().Ping(gomock.Any()).Return(types.Ping{}, nil) + dockerClientMock.EXPECT().ServerVersion(gomock.Any(), gomock.Any()). + Return(client.ServerVersionResult{}, nil) got := r.RunHealthchecks(context.Background()) if diff := helpers.Diff(got.Details["conntrack-fixer"], reporter.HealthcheckResult{ Status: reporter.HealthcheckOK, @@ -119,7 +128,8 @@ func TestRoot(t *testing.T) { }); diff != "" { t.Fatalf("runHealthcheck() (-got, +want):\n%s", diff) } - dockerClientMock.EXPECT().Ping(gomock.Any()).Return(types.Ping{}, errors.New("unexpected")) + dockerClientMock.EXPECT().ServerVersion(gomock.Any(), gomock.Any()). + Return(client.ServerVersionResult{}, errors.New("unexpected")) got = r.RunHealthchecks(context.Background()) if diff := helpers.Diff(got.Details["conntrack-fixer"], reporter.HealthcheckResult{ Status: reporter.HealthcheckWarning, @@ -132,21 +142,25 @@ func TestRoot(t *testing.T) { // New container t.Run("new container", func(_ *testing.T) { networkSettings := &container.NetworkSettings{} - networkSettings.Ports = map[nat.Port][]nat.PortBinding{ - "2055/udp": { - nat.PortBinding{ - HostIP: "127.0.0.1", + networkSettings.Ports = network.PortMap{ + network.MustParsePort("2055/udp"): { + network.PortBinding{ + HostIP: netip.MustParseAddr("127.0.0.1"), HostPort: "6777", }, }, } dockerClientMock.EXPECT(). ContainerList(gomock.Any(), gomock.Any()). - Return([]container.Summary{{ID: "new one"}}, nil) + Return(client.ContainerListResult{ + Items: []container.Summary{{ID: "new one"}}, + }, nil) dockerClientMock.EXPECT(). - ContainerInspect(gomock.Any(), "new one"). - Return(container.InspectResponse{ - NetworkSettings: networkSettings, + ContainerInspect(gomock.Any(), "new one", gomock.Any()). + Return(client.ContainerInspectResult{ + Container: container.InspectResponse{ + NetworkSettings: networkSettings, + }, }, nil) conntrackConnMock.EXPECT(). Dump(nil). @@ -199,9 +213,15 @@ func TestRoot(t *testing.T) { }, }). Return(nil) - dockerEvents <- events.Message{ - ID: "new one", - From: "some image", + dockerEventMessages <- events.Message{ + Type: events.ContainerEventType, + Action: events.ActionCreate, + Actor: events.Actor{ + ID: "something", + Attributes: map[string]string{ + "image": "some/image:v17", + }, + }, } time.Sleep(20 * time.Millisecond) }) diff --git a/go.mod b/go.mod index f3a04979..9900dfa0 100644 --- a/go.mod +++ b/go.mod @@ -14,8 +14,6 @@ require ( github.com/cenkalti/backoff/v4 v4.3.0 github.com/chenyahui/gin-cache v1.10.0 github.com/cilium/ebpf v0.20.0 - github.com/docker/docker v28.4.0+incompatible - github.com/docker/go-connections v0.6.0 github.com/eapache/go-resiliency v1.7.0 github.com/expr-lang/expr v1.17.6 github.com/fsnotify/fsnotify v1.9.0 @@ -32,12 +30,15 @@ require ( github.com/hashicorp/go-version v1.7.0 github.com/itchyny/gojq v0.12.17 github.com/mattn/go-isatty v0.0.20 + github.com/moby/moby/api v1.52.0 + github.com/moby/moby/client v0.1.0 github.com/netsampler/goflow2/v2 v2.2.3 github.com/openconfig/gnmi v0.14.0 github.com/openconfig/gnmic/pkg/api v0.1.9 github.com/opencontainers/image-spec v1.1.1 github.com/oschwald/maxminddb-golang/v2 v2.1.0 github.com/osrg/gobgp/v4 v4.0.0 + github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 github.com/prometheus/client_golang v1.23.2 github.com/rs/zerolog v1.34.0 github.com/scrapli/scrapligo v1.3.3 @@ -84,13 +85,14 @@ require ( github.com/cloudwego/base64x v0.1.6 // indirect github.com/containerd/errdefs v1.0.0 // indirect github.com/containerd/errdefs/pkg v0.3.0 // indirect - github.com/creack/pty v1.1.23 // indirect + github.com/creack/pty v1.1.24 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/distribution/reference v0.6.0 // indirect github.com/dlclark/regexp2 v1.11.5 // indirect github.com/dmarkham/enumer v1.6.1 // indirect github.com/dnephin/pflag v1.0.7 // indirect + github.com/docker/go-connections v0.6.0 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/emicklei/dot v0.15.0 // indirect @@ -113,6 +115,7 @@ require ( github.com/goccy/go-yaml v1.18.0 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/licensecheck v0.3.1 // indirect + github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/google/uuid v1.6.0 // indirect github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect @@ -140,7 +143,6 @@ require ( github.com/mgechev/revive v1.12.0 // indirect github.com/mna/pigeon v1.3.0 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect - github.com/moby/sys/atomicwriter v0.1.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect @@ -151,7 +153,6 @@ require ( github.com/pelletier/go-toml/v2 v2.2.4 // indirect github.com/pierrec/lz4/v4 v4.1.22 // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/client_model v0.6.2 // indirect @@ -176,10 +177,10 @@ require ( github.com/ugorji/go/codec v1.3.0 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect go.opentelemetry.io/otel/trace v1.38.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect @@ -193,7 +194,6 @@ require ( golang.org/x/term v0.36.0 // indirect golang.org/x/tools v0.38.0 // indirect golang.org/x/tools/go/expect v0.1.1-deprecated // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20251007200510-49b9836ed3ff // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20251007200510-49b9836ed3ff // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 610b99c0..ce36bdd4 100644 --- a/go.sum +++ b/go.sum @@ -6,8 +6,6 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/AlekSi/pointer v1.2.0 h1:glcy/gc4h8HnG2Z3ZECSzZ1IX1x2JxRVuDzaJwQE0+w= github.com/AlekSi/pointer v1.2.0/go.mod h1:gZGfd3dpW4vEc/UlyfKKi1roIqcCgwOIvb0tSNSBle0= -github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= -github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg= github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= @@ -63,14 +61,12 @@ github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M= github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE= github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk= -github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= -github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/creack/pty v1.1.23 h1:4M6+isWdcStXEf15G/RbrMPOQj1dZ7HPZCGwE4kOeP0= -github.com/creack/pty v1.1.23/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE= +github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s= +github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= @@ -87,8 +83,6 @@ github.com/dmarkham/enumer v1.6.1 h1:aSc9awYtZL07TUueWs40QcHtxTvHTAwG0EqrNsK45w4 github.com/dmarkham/enumer v1.6.1/go.mod h1:yixql+kDDQRYqcuBM2n9Vlt7NoT9ixgXhaXry8vmRg8= github.com/dnephin/pflag v1.0.7 h1:oxONGlWxhmUct0YzKTgrpQv9AUA1wtPBn7zuSjJqptk= github.com/dnephin/pflag v1.0.7/go.mod h1:uxE91IoWURlOiTUIA8Mq5ZZkAv3dPUfZNaT80Zm7OQE= -github.com/docker/docker v28.4.0+incompatible h1:KVC7bz5zJY/4AZe/78BIvCnPsLaC9T/zh72xnlrTTOk= -github.com/docker/docker v28.4.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.6.0 h1:LlMG9azAe1TqfR7sO+NJttz1gy6KO7VJBh+pMmjSD94= github.com/docker/go-connections v0.6.0/go.mod h1:AahvXYshr6JgfUJGdDCs2b5EZG/vmaMAntpSFH5BFKE= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= @@ -197,8 +191,8 @@ github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo github.com/google/licensecheck v0.3.1 h1:QoxgoDkaeC4nFrtGN1jV7IPmDCHFNIVh54e5hSt6sPs= github.com/google/licensecheck v0.3.1/go.mod h1:ORkR35t/JjW+emNKtfJDII0zlciG9JgbT7SmsohlHmY= github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ= -github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo= +github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 h1:BHT72Gu3keYf3ZEu2J0b1vyeLSOYI8bm5wbJM/8yDe8= +github.com/google/pprof v0.0.0-20250403155104-27863c87afa6/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= @@ -210,8 +204,6 @@ github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 h1:QGLs github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0/go.mod h1:hM2alZsMUni80N33RBe6J0e423LB+odMj7d3EMP9l20= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 h1:pRhl55Yx1eC7BZ1N+BBWwnKaMyD8uC+34TLdndZMAKk= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0/go.mod h1:XKMd7iuf/RGPSMJ/U4HP0zS2Z9Fh8Ps9a+6X26m/tmI= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg= github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= @@ -290,12 +282,10 @@ github.com/mna/pigeon v1.3.0 h1:/3fzVrl1C2RK3x04tyL+ribn+3S3VSEFFbCFLmRPAoc= github.com/mna/pigeon v1.3.0/go.mod h1:SKQNHonx2q9U2QSSoPtMigExj+vQ1mOpL7UVFQF/IA0= github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo= -github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw= -github.com/moby/sys/atomicwriter v0.1.0/go.mod h1:Ul8oqv2ZMNHOceF643P6FKPXeCmYtlQMvpizfsSoaWs= -github.com/moby/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU= -github.com/moby/sys/sequential v0.6.0/go.mod h1:uyv8EUTrca5PnDsdMGXhZe6CCe8U/UiTWd+lL+7b/Ko= -github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= -github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= +github.com/moby/moby/api v1.52.0 h1:00BtlJY4MXkkt84WhUZPRqt5TvPbgig2FZvTbe3igYg= +github.com/moby/moby/api v1.52.0/go.mod h1:8mb+ReTlisw4pS6BRzCMts5M49W5M7bKt1cJy/YbAqc= +github.com/moby/moby/client v0.1.0 h1:nt+hn6O9cyJQqq5UWnFGqsZRTS/JirUqzPjEl0Bdc/8= +github.com/moby/moby/client v0.1.0/go.mod h1:O+/tw5d4a1Ha/ZA/tPxIZJapJRUS6LNZ1wiVRxYHyUE= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -303,8 +293,6 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= -github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= -github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/netsampler/goflow2/v2 v2.2.3 h1:uItOl69jDHuNJR+LGZ1JFs4/9qzBgbm95SP0QTMzGwo= @@ -473,24 +461,18 @@ github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQ go.mongodb.org/mongo-driver v1.11.4/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 h1:TT4fX+nBOA/+LUkobKGW1ydGcn+G3vRw9+g5HwCphpk= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0/go.mod h1:L7UH0GbB0p47T4Rri3uHjbpCFYrVrwc1I25QhNPiGK8= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 h1:9M3+rhx7kZCIQQhQRYaZCdNu1V73tm4TvXs2ntl98C4= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0/go.mod h1:noq80iT8rrHP1SfybmPiRGc9dc5M8RPmGvtwo7Oo7tc= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 h1:FyjCyI9jVEfqhUh2MoSkmolPjfh5fp2hnV0b0irxH4Q= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0/go.mod h1:hYwym2nDEeZfG/motx0p7L7J1N1vyzIThemQsb4g2qY= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg= -go.opentelemetry.io/otel/sdk/metric v1.37.0 h1:90lI228XrB9jCMuSdA0673aubgRobVZFhbjxHHspCPc= -go.opentelemetry.io/otel/sdk/metric v1.37.0/go.mod h1:cNen4ZWfiD37l5NhS+Keb5RXVWZWpRE+9WyVCpbo5ps= +go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM= +go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA= go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs= -go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= -go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= @@ -632,8 +614,6 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk= gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E= -google.golang.org/genproto/googleapis/api v0.0.0-20251007200510-49b9836ed3ff h1:8Zg5TdmcbU8A7CXGjGXF1Slqu/nIFCRaR3S5gT2plIA= -google.golang.org/genproto/googleapis/api v0.0.0-20251007200510-49b9836ed3ff/go.mod h1:dbWfpVPvW/RqafStmRWBUpMN14puDezDMHxNYiRfQu0= google.golang.org/genproto/googleapis/rpc v0.0.0-20251007200510-49b9836ed3ff h1:A90eA31Wq6HOMIQlLfzFwzqGKBTuaVztYu/g8sn+8Zc= google.golang.org/genproto/googleapis/rpc v0.0.0-20251007200510-49b9836ed3ff/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk= google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A= @@ -689,3 +669,5 @@ modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds= modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU= modernc.org/sqlite v1.23.1 h1:nrSBg4aRQQwq59JpvGEQ15tNxoO5pX/kUjcRNwSAGQM= modernc.org/sqlite v1.23.1/go.mod h1:OrDj17Mggn6MhE+iPbBNf7RGKODDE9NFT0f3EwDzJqk= +pgregory.net/rapid v1.2.0 h1:keKAYRcjm+e1F0oAuU5F5+YPAWcyxNNRK2wud503Gnk= +pgregory.net/rapid v1.2.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=