Skip to content

Commit 6877fa0

Browse files
hughesjjhughesjj
authored
[chore] Updates docker api to version v25 from v24, testcontainers-go from v0.20.0 to v0.29.1 (#31632)
**Description:** I don't have permissions to directly add commits to the update PR so running it here - [PR](#31345) - [Issue](#31087)
1 parent fe5ed92 commit 6877fa0

File tree

99 files changed

+1340
-872
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+1340
-872
lines changed

‎cmd/configschema/go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ require (
309309
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
310310
github.com/digitalocean/godo v1.104.1 // indirect
311311
github.com/distribution/reference v0.5.0 // indirect
312-
github.com/docker/docker v25.0.4+incompatible // indirect
312+
github.com/docker/docker v25.0.5+incompatible // indirect
313313
github.com/docker/go-connections v0.5.0 // indirect
314314
github.com/docker/go-units v0.5.0 // indirect
315315
github.com/dustin/go-humanize v1.0.1 // indirect
@@ -536,7 +536,7 @@ require (
536536
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/wavefrontreceiver v0.96.0 // indirect
537537
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/webhookeventreceiver v0.96.0 // indirect
538538
github.com/opencontainers/go-digest v1.0.0 // indirect
539-
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
539+
github.com/opencontainers/image-spec v1.1.0 // indirect
540540
github.com/opencontainers/runc v1.1.12 // indirect
541541
github.com/opencontainers/runtime-spec v1.1.0-rc.3 // indirect
542542
github.com/opencontainers/selinux v1.11.0 // indirect
@@ -694,8 +694,8 @@ require (
694694
google.golang.org/api v0.170.0 // indirect
695695
google.golang.org/appengine v1.6.8 // indirect
696696
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
697-
google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect
698-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 // indirect
697+
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
698+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
699699
google.golang.org/grpc v1.62.1 // indirect
700700
google.golang.org/protobuf v1.33.0 // indirect
701701
gopkg.in/inf.v0 v0.9.1 // indirect

‎cmd/configschema/go.sum

+10-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/otelcontribcol/go.mod

+5-5
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ require (
360360
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
361361
github.com/digitalocean/godo v1.104.1 // indirect
362362
github.com/distribution/reference v0.5.0 // indirect
363-
github.com/docker/docker v25.0.3+incompatible // indirect
363+
github.com/docker/docker v25.0.5+incompatible // indirect
364364
github.com/docker/go-connections v0.5.0 // indirect
365365
github.com/docker/go-units v0.5.0 // indirect
366366
github.com/dustin/go-humanize v1.0.1 // indirect
@@ -569,7 +569,7 @@ require (
569569
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.96.0 // indirect
570570
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.96.0 // indirect
571571
github.com/opencontainers/go-digest v1.0.0 // indirect
572-
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
572+
github.com/opencontainers/image-spec v1.1.0 // indirect
573573
github.com/opencontainers/runc v1.1.12 // indirect
574574
github.com/opencontainers/runtime-spec v1.1.0-rc.3 // indirect
575575
github.com/opencontainers/selinux v1.10.0 // indirect
@@ -698,7 +698,7 @@ require (
698698
go.uber.org/zap v1.27.0 // indirect
699699
golang.org/x/crypto v0.21.0 // indirect
700700
golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 // indirect
701-
golang.org/x/mod v0.14.0 // indirect
701+
golang.org/x/mod v0.16.0 // indirect
702702
golang.org/x/net v0.22.0 // indirect
703703
golang.org/x/oauth2 v0.18.0 // indirect
704704
golang.org/x/sync v0.6.0 // indirect
@@ -711,8 +711,8 @@ require (
711711
google.golang.org/api v0.170.0 // indirect
712712
google.golang.org/appengine v1.6.8 // indirect
713713
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
714-
google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect
715-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 // indirect
714+
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
715+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
716716
google.golang.org/grpc v1.62.1 // indirect
717717
google.golang.org/protobuf v1.33.0 // indirect
718718
gopkg.in/inf.v0 v0.9.1 // indirect

‎cmd/otelcontribcol/go.sum

+12-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/oteltestbedcol/go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ require (
7575
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
7676
github.com/dennwc/varint v1.0.0 // indirect
7777
github.com/digitalocean/godo v1.104.1 // indirect
78-
github.com/docker/distribution v2.8.2+incompatible // indirect
79-
github.com/docker/docker v24.0.7+incompatible // indirect
78+
github.com/distribution/reference v0.5.0 // indirect
79+
github.com/docker/docker v25.0.5+incompatible // indirect
8080
github.com/docker/go-connections v0.5.0 // indirect
8181
github.com/docker/go-units v0.5.0 // indirect
8282
github.com/elastic/go-structform v0.0.10 // indirect
@@ -183,7 +183,7 @@ require (
183183
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.96.0 // indirect
184184
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.96.0 // indirect
185185
github.com/opencontainers/go-digest v1.0.0 // indirect
186-
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
186+
github.com/opencontainers/image-spec v1.1.0 // indirect
187187
github.com/opensearch-project/opensearch-go/v2 v2.3.0 // indirect
188188
github.com/openzipkin/zipkin-go v0.4.2 // indirect
189189
github.com/ovh/go-ovh v1.4.3 // indirect
@@ -264,7 +264,7 @@ require (
264264
go.uber.org/zap v1.27.0 // indirect
265265
golang.org/x/crypto v0.21.0 // indirect
266266
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
267-
golang.org/x/mod v0.14.0 // indirect
267+
golang.org/x/mod v0.16.0 // indirect
268268
golang.org/x/net v0.22.0 // indirect
269269
golang.org/x/oauth2 v0.18.0 // indirect
270270
golang.org/x/term v0.18.0 // indirect

0 commit comments

Comments
 (0)