Skip to content

Commit abdf98c

Browse files
jackgopack4jackgopack4
committed
update gomod and gitlab build image
1 parent 07681bd commit abdf98c

File tree

3 files changed

+78
-434
lines changed

3 files changed

+78
-434
lines changed

‎.gitlab-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ variables:
1313
# and check the job creating the image to make sure you have the right SHA prefix
1414
TEST_INFRA_DEFINITIONS_BUILDIMAGES_SUFFIX: ""
1515
# Make sure to update test-infra-definitions version in go.mod as well
16-
TEST_INFRA_DEFINITIONS_BUILDIMAGES: d610d4c9aa4b
16+
TEST_INFRA_DEFINITIONS_BUILDIMAGES: 2a6d59a9b3f3
1717

1818

1919
# BUILD STAGES

‎e2etests/go.mod‎

Lines changed: 6 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ module github.com/DataDog/opentelemetry-collector-contrib/e2etests
22

33
go 1.24.0
44

5-
replace k8s.io/api => k8s.io/api v0.31.7
6-
7-
replace k8s.io/apimachinery => k8s.io/apimachinery v0.31.7
8-
95
require (
106
github.com/DataDog/datadog-agent/test/fakeintake v0.71.2
117
github.com/DataDog/datadog-agent/test/new-e2e v0.71.2
@@ -21,36 +17,21 @@ require (
2117
dario.cat/mergo v1.0.1 // indirect
2218
github.com/BurntSushi/toml v1.5.0 // indirect
2319
github.com/DataDog/agent-payload/v5 v5.0.164 // indirect
24-
github.com/DataDog/appsec-internal-go v1.14.0 // indirect
2520
github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.71.2 // indirect
2621
github.com/DataDog/datadog-agent/comp/netflow/payload v0.71.2 // indirect
2722
github.com/DataDog/datadog-agent/pkg/metrics v0.71.2 // indirect
2823
github.com/DataDog/datadog-agent/pkg/network/payload v0.71.2 // indirect
2924
github.com/DataDog/datadog-agent/pkg/networkpath/payload v0.71.2 // indirect
30-
github.com/DataDog/datadog-agent/pkg/obfuscate v0.71.2 // indirect
31-
github.com/DataDog/datadog-agent/pkg/opentelemetry-mapping-go/otlp/attributes v0.71.2 // indirect
3225
github.com/DataDog/datadog-agent/pkg/proto v0.71.2 // indirect
33-
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.71.2 // indirect
3426
github.com/DataDog/datadog-agent/pkg/tagger/types v0.71.2 // indirect
35-
github.com/DataDog/datadog-agent/pkg/trace v0.71.2 // indirect
36-
github.com/DataDog/datadog-agent/pkg/util/log v0.71.2 // indirect
3727
github.com/DataDog/datadog-agent/pkg/util/option v0.71.2 // indirect
3828
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.71.2 // indirect
3929
github.com/DataDog/datadog-agent/pkg/version v0.71.2 // indirect
4030
github.com/DataDog/datadog-api-client-go/v2 v2.44.0 // indirect
41-
github.com/DataDog/datadog-go/v5 v5.6.0 // indirect
42-
github.com/DataDog/dd-trace-go/v2 v2.2.0 // indirect
43-
github.com/DataDog/go-libddwaf/v4 v4.3.0 // indirect
44-
github.com/DataDog/go-runtime-metrics-internal v0.0.4-0.20250721125240-fdf1ef85b633 // indirect
45-
github.com/DataDog/go-sqllexer v0.1.8 // indirect
46-
github.com/DataDog/go-tuf v1.1.1-0.5.2 // indirect
4731
github.com/DataDog/mmh3 v0.0.0-20210722141835-012dc69a9e49 // indirect
48-
github.com/DataDog/orchestrion v1.5.0 // indirect
49-
github.com/DataDog/sketches-go v1.4.7 // indirect
5032
github.com/DataDog/zstd v1.5.6 // indirect
5133
github.com/DataDog/zstd_0 v0.0.0-20210310093942-586c1286621f // indirect
5234
github.com/Masterminds/semver v1.5.0 // indirect
53-
github.com/Masterminds/semver/v3 v3.4.0 // indirect
5435
github.com/Microsoft/go-winio v0.6.2 // indirect
5536
github.com/ProtonMail/go-crypto v1.1.6 // indirect
5637
github.com/agext/levenshtein v1.2.3 // indirect
@@ -81,11 +62,9 @@ require (
8162
github.com/aws/session-manager-plugin v0.0.0-20241119210807-82dc72922492 // indirect
8263
github.com/aws/smithy-go v1.23.0 // indirect
8364
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
84-
github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb // indirect
8565
github.com/blang/semver v3.5.1+incompatible // indirect
8666
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
8767
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
88-
github.com/cespare/xxhash/v2 v2.3.0 // indirect
8968
github.com/charmbracelet/bubbles v0.20.0 // indirect
9069
github.com/charmbracelet/bubbletea v1.2.4 // indirect
9170
github.com/charmbracelet/colorprofile v0.3.1 // indirect
@@ -96,19 +75,16 @@ require (
9675
github.com/cheggaaa/pb v1.0.29 // indirect
9776
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
9877
github.com/cloudflare/circl v1.6.1 // indirect
99-
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
78+
github.com/containerd/errdefs v1.0.0 // indirect
79+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
10080
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
101-
github.com/dave/dst v0.27.3 // indirect
10281
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
10382
github.com/distribution/reference v0.6.0 // indirect
10483
github.com/djherbis/times v1.6.0 // indirect
10584
github.com/docker/cli v27.5.0+incompatible // indirect
10685
github.com/docker/docker v28.3.3+incompatible // indirect
10786
github.com/docker/go-connections v0.6.0 // indirect
10887
github.com/docker/go-units v0.5.0 // indirect
109-
github.com/dustin/go-humanize v1.0.1 // indirect
110-
github.com/eapache/queue/v2 v2.0.0-20230407133247-75960ed334e4 // indirect
111-
github.com/ebitengine/purego v0.8.4 // indirect
11288
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
11389
github.com/emirpasic/gods v1.18.1 // indirect
11490
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
@@ -120,68 +96,53 @@ require (
12096
github.com/go-git/go-git/v5 v5.13.2 // indirect
12197
github.com/go-logr/logr v1.4.3 // indirect
12298
github.com/go-logr/stdr v1.2.2 // indirect
123-
github.com/go-ole/go-ole v1.3.0 // indirect
12499
github.com/go-openapi/jsonpointer v0.21.0 // indirect
125100
github.com/go-openapi/jsonreference v0.21.0 // indirect
126101
github.com/go-openapi/swag v0.23.0 // indirect
127-
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
128102
github.com/goccy/go-json v0.10.5 // indirect
129-
github.com/goccy/go-yaml v1.18.0 // indirect
130103
github.com/gogo/protobuf v1.3.2 // indirect
131104
github.com/golang/glog v1.2.5 // indirect
132105
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
133106
github.com/golang/protobuf v1.5.4 // indirect
134107
github.com/google/gnostic-models v0.6.9 // indirect
135108
github.com/google/go-cmp v0.7.0 // indirect
136-
github.com/google/go-tpm v0.9.5 // indirect
137109
github.com/google/gofuzz v1.2.0 // indirect
138110
github.com/google/uuid v1.6.0 // indirect
139111
github.com/gorilla/websocket v1.5.3 // indirect
140112
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
141113
github.com/hashicorp/errwrap v1.1.0 // indirect
142114
github.com/hashicorp/go-multierror v1.1.1 // indirect
143-
github.com/hashicorp/go-version v1.7.0 // indirect
144115
github.com/hashicorp/hcl/v2 v2.23.0 // indirect
145-
github.com/imdario/mergo v0.3.16 // indirect
146116
github.com/inconshreveable/mousetrap v1.1.0 // indirect
147117
github.com/iwdgo/sigintwindows v0.2.2 // indirect
148118
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
149119
github.com/jmespath/go-jmespath v0.4.0 // indirect
150120
github.com/josharian/intern v1.0.0 // indirect
151121
github.com/json-iterator/go v1.1.12 // indirect
152122
github.com/kevinburke/ssh_config v1.2.0 // indirect
153-
github.com/klauspost/compress v1.18.0 // indirect
154123
github.com/kr/fs v0.1.0 // indirect
155124
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
156-
github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35 // indirect
157125
github.com/mailru/easyjson v0.9.0 // indirect
158-
github.com/mattn/go-colorable v0.1.14 // indirect
159126
github.com/mattn/go-isatty v0.0.20 // indirect
160127
github.com/mattn/go-localereader v0.0.1 // indirect
161128
github.com/mattn/go-runewidth v0.0.16 // indirect
162-
github.com/minio/highwayhash v1.0.3 // indirect
163129
github.com/mitchellh/go-ps v1.0.0 // indirect
164130
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
165131
github.com/moby/docker-image-spec v1.3.1 // indirect
166132
github.com/moby/spdystream v0.5.0 // indirect
133+
github.com/moby/sys/sequential v0.6.0 // indirect
167134
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
168135
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
169136
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
170137
github.com/muesli/cancelreader v0.2.2 // indirect
171138
github.com/muesli/termenv v0.16.0 // indirect
172139
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
173140
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
174-
github.com/nats-io/jwt/v2 v2.7.4 // indirect
175-
github.com/nats-io/nats-server/v2 v2.11.6 // indirect
176-
github.com/nats-io/nats.go v1.43.0 // indirect
177-
github.com/nats-io/nkeys v0.4.11 // indirect
178-
github.com/nats-io/nuid v1.0.1 // indirect
179141
github.com/nxadm/tail v1.4.11 // indirect
180142
github.com/opencontainers/go-digest v1.0.0 // indirect
181143
github.com/opencontainers/image-spec v1.1.1 // indirect
182144
github.com/opentracing/basictracer-go v1.1.0 // indirect
183145
github.com/opentracing/opentracing-go v1.2.0 // indirect
184-
github.com/outcaste-io/ristretto v0.2.3 // indirect
185146
github.com/pgavlin/fx v0.1.6 // indirect
186147
github.com/philhofer/fwd v1.2.0 // indirect
187148
github.com/pjbgf/sha1cd v0.3.2 // indirect
@@ -190,7 +151,6 @@ require (
190151
github.com/pkg/term v1.1.0 // indirect
191152
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
192153
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
193-
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
194154
github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 // indirect
195155
github.com/pulumi/esc v0.13.0 // indirect
196156
github.com/pulumi/pulumi-aws/sdk/v6 v6.66.2 // indirect
@@ -203,17 +163,12 @@ require (
203163
github.com/pulumi/pulumi-random/sdk/v4 v4.16.8 // indirect
204164
github.com/pulumi/pulumi-tls/sdk/v4 v4.11.1 // indirect
205165
github.com/pulumiverse/pulumi-time/sdk v0.1.0 // indirect
206-
github.com/puzpuzpuz/xsync/v3 v3.5.1 // indirect
207166
github.com/rivo/uniseg v0.4.7 // indirect
208167
github.com/rogpeppe/go-internal v1.14.1 // indirect
209-
github.com/rs/zerolog v1.34.0 // indirect
210-
github.com/russross/blackfriday/v2 v2.1.0 // indirect
211168
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect
212169
github.com/samber/lo v1.51.0 // indirect
213170
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
214-
github.com/secure-systems-lab/go-securesystemslib v0.9.0 // indirect
215171
github.com/sergi/go-diff v1.4.0 // indirect
216-
github.com/shirou/gopsutil/v4 v4.25.8-0.20250809033336-ffcdc2b7662f // indirect
217172
github.com/sirupsen/logrus v1.9.3 // indirect
218173
github.com/skeema/knownhosts v1.3.0 // indirect
219174
github.com/spf13/cast v1.9.2 // indirect
@@ -222,38 +177,22 @@ require (
222177
github.com/stretchr/objx v0.5.2 // indirect
223178
github.com/texttheater/golang-levenshtein v1.0.1 // indirect
224179
github.com/tinylib/msgp v1.3.0 // indirect
225-
github.com/tklauser/go-sysconf v0.3.15 // indirect
226-
github.com/tklauser/numcpus v0.10.0 // indirect
227180
github.com/twinj/uuid v0.0.0-20151029044442-89173bcdda19 // indirect
228181
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
229182
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
230-
github.com/urfave/cli/v2 v2.27.7 // indirect
231183
github.com/x448/float16 v0.8.4 // indirect
232184
github.com/xanzy/ssh-agent v0.3.3 // indirect
233-
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
234-
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
235-
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
236185
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
237-
github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342 // indirect
238-
github.com/yusufpapurcu/wmi v1.2.4 // indirect
239186
github.com/zclconf/go-cty v1.15.1 // indirect
240187
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
241-
go.opentelemetry.io/collector/component v1.39.0 // indirect
242-
go.opentelemetry.io/collector/featuregate v1.39.0 // indirect
243-
go.opentelemetry.io/collector/internal/telemetry v0.133.0 // indirect
244-
go.opentelemetry.io/collector/pdata v1.39.0 // indirect
245-
go.opentelemetry.io/contrib/bridges/otelzap v0.12.0 // indirect
246188
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
247189
go.opentelemetry.io/otel v1.37.0 // indirect
248190
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
249-
go.opentelemetry.io/otel/log v0.13.0 // indirect
250191
go.opentelemetry.io/otel/metric v1.37.0 // indirect
251-
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
252192
go.opentelemetry.io/otel/trace v1.37.0 // indirect
253193
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
254194
go.uber.org/atomic v1.11.0 // indirect
255-
go.uber.org/multierr v1.11.0 // indirect
256-
go.uber.org/zap v1.27.0 // indirect
195+
go.yaml.in/yaml/v2 v2.4.2 // indirect
257196
golang.org/x/crypto v0.41.0 // indirect
258197
golang.org/x/exp v0.0.0-20250808145144-a408d31f581a // indirect
259198
golang.org/x/mod v0.27.0 // indirect
@@ -265,17 +204,17 @@ require (
265204
golang.org/x/text v0.28.0 // indirect
266205
golang.org/x/time v0.12.0 // indirect
267206
golang.org/x/tools v0.36.0 // indirect
268-
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
269207
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
270208
google.golang.org/grpc v1.75.0 // indirect
271209
google.golang.org/protobuf v1.36.7 // indirect
210+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
272211
gopkg.in/inf.v0 v0.9.1 // indirect
273-
gopkg.in/ini.v1 v1.67.0 // indirect
274212
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
275213
gopkg.in/warnings.v0 v0.1.2 // indirect
276214
gopkg.in/yaml.v2 v2.4.0 // indirect
277215
gopkg.in/yaml.v3 v3.0.1 // indirect
278216
gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 // indirect
217+
gotest.tools/v3 v3.5.2 // indirect
279218
k8s.io/client-go v0.32.3 // indirect
280219
k8s.io/klog/v2 v2.130.1 // indirect
281220
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect

0 commit comments

Comments
 (0)