Skip to content

Commit a6e33dc

Browse files
ptnapoleonptnapoleon
authored
Fix go.mod by upgrading otlptracehttp (#943)
* Fix go.mod by upgrading otlptracehttp * Upgrade dd-trace-go.v1 * Replace deprecated function calls with suggested replacements
1 parent 3dc5593 commit a6e33dc

File tree

1,531 files changed

+188573
-38043
lines changed

Some content is hidden

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

1,531 files changed

+188573
-38043
lines changed

‎LICENSE-3rdparty.csv

Lines changed: 114 additions & 26 deletions
Large diffs are not rendered by default.

‎dogfood/client/dogfood_client.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
pb "github.com/DataDog/chaos-controller/dogfood/chaosdogfood"
1717
"google.golang.org/grpc"
1818
"google.golang.org/grpc/credentials/insecure"
19-
emptypb "google.golang.org/protobuf/types/known/emptypb"
19+
"google.golang.org/protobuf/types/known/emptypb"
2020
)
2121

2222
var serverAddr string
@@ -111,9 +111,8 @@ func main() {
111111

112112
var opts []grpc.DialOption
113113
opts = append(opts, grpc.WithTransportCredentials(insecure.NewCredentials()))
114-
opts = append(opts, grpc.WithBlock())
115114

116-
conn, err := grpc.Dial(serverAddr, opts...)
115+
conn, err := grpc.NewClient(serverAddr, opts...)
117116
if err != nil {
118117
log.Fatalf("fail to dial: %v", err)
119118
}

‎go.mod

Lines changed: 80 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ require (
1414
github.com/coreos/go-iptables v0.6.0
1515
github.com/docker/docker v26.1.5+incompatible
1616
github.com/fsnotify/fsnotify v1.7.0
17-
github.com/go-logr/logr v1.4.1
17+
github.com/go-logr/logr v1.4.2
1818
github.com/go-logr/zapr v1.3.0
1919
github.com/google/uuid v1.6.0
2020
github.com/hashicorp/go-multierror v1.1.1
21-
github.com/miekg/dns v1.1.54
21+
github.com/miekg/dns v1.1.55
2222
github.com/mitchellh/go-homedir v1.1.0
2323
github.com/onsi/ginkgo/v2 v2.14.0
2424
github.com/onsi/gomega v1.30.0
@@ -28,16 +28,16 @@ require (
2828
github.com/spf13/pflag v1.0.5
2929
github.com/spf13/viper v1.15.0
3030
github.com/stretchr/testify v1.9.0
31-
github.com/tidwall/gjson v1.12.1
31+
github.com/tidwall/gjson v1.16.0
3232
github.com/vishvananda/netlink v1.2.1-beta.2.0.20230420174744-55c8b9515a01
3333
github.com/vishvananda/netns v0.0.5-0.20230405050519-16c2fa0b2f57
34-
go.opentelemetry.io/otel v1.19.0
35-
go.opentelemetry.io/otel/trace v1.19.0
36-
go.uber.org/zap v1.26.0
37-
golang.org/x/sys v0.19.0
38-
google.golang.org/grpc v1.58.3
39-
google.golang.org/protobuf v1.33.0
40-
gopkg.in/DataDog/dd-trace-go.v1 v1.52.0
34+
go.opentelemetry.io/otel v1.29.0
35+
go.opentelemetry.io/otel/trace v1.29.0
36+
go.uber.org/zap v1.27.0
37+
golang.org/x/sys v0.24.0
38+
google.golang.org/grpc v1.65.0
39+
google.golang.org/protobuf v1.34.2
40+
gopkg.in/DataDog/dd-trace-go.v1 v1.70.1
4141
gopkg.in/yaml.v3 v3.0.1
4242
k8s.io/api v0.29.3
4343
k8s.io/apimachinery v0.29.3
@@ -50,33 +50,62 @@ require (
5050
)
5151

5252
require (
53+
github.com/DataDog/datadog-agent/pkg/proto v0.58.0 // indirect
54+
github.com/DataDog/datadog-agent/pkg/trace v0.58.0 // indirect
55+
github.com/DataDog/datadog-agent/pkg/util/log v0.58.0 // indirect
56+
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.58.0 // indirect
57+
github.com/DataDog/go-libddwaf/v3 v3.5.1 // indirect
58+
github.com/DataDog/go-runtime-metrics-internal v0.0.0-20241106155157-194426bbbd59 // indirect
59+
github.com/DataDog/go-sqllexer v0.0.14 // indirect
60+
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.20.0 // indirect
61+
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
5362
github.com/containerd/log v0.1.0 // indirect
5463
github.com/distribution/reference v0.6.0 // indirect
55-
github.com/felixge/httpsnoop v1.0.3 // indirect
64+
github.com/eapache/queue/v2 v2.0.0-20230407133247-75960ed334e4 // indirect
65+
github.com/ebitengine/purego v0.6.0-alpha.5 // indirect
66+
github.com/felixge/httpsnoop v1.0.4 // indirect
67+
github.com/go-ole/go-ole v1.2.6 // indirect
5668
github.com/google/gnostic-models v0.6.8 // indirect
69+
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.7 // indirect
70+
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
71+
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
72+
github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect
5773
github.com/moby/docker-image-spec v1.3.1 // indirect
5874
github.com/moby/sys/signal v0.6.0 // indirect
5975
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
76+
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
77+
github.com/rogpeppe/go-internal v1.12.0 // indirect
78+
github.com/ryanuber/go-glob v1.0.0 // indirect
79+
github.com/shirou/gopsutil/v3 v3.24.4 // indirect
80+
github.com/shoenig/go-m1cpu v0.1.6 // indirect
6081
github.com/tidwall/match v1.1.1 // indirect
61-
github.com/tidwall/pretty v1.2.0 // indirect
62-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
82+
github.com/tidwall/pretty v1.2.1 // indirect
83+
github.com/tklauser/go-sysconf v0.3.12 // indirect
84+
github.com/tklauser/numcpus v0.6.1 // indirect
85+
github.com/yusufpapurcu/wmi v1.2.4 // indirect
86+
go.opentelemetry.io/collector/component v0.104.0 // indirect
87+
go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect
88+
go.opentelemetry.io/collector/pdata v1.11.0 // indirect
89+
go.opentelemetry.io/collector/semconv v0.104.0 // indirect
90+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
91+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.29.0 // indirect
92+
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
6393
golang.org/x/exp v0.0.0-20240318143956-a85f2c67cd81 // indirect
64-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
94+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240822170219-fc7c04adadcd // indirect
6595
)
6696

6797
require (
68-
github.com/DataDog/appsec-internal-go v1.0.0 // indirect
69-
github.com/DataDog/datadog-agent/pkg/obfuscate v0.45.0-rc.1 // indirect
70-
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.45.0 // indirect
71-
github.com/DataDog/datadog-go/v5 v5.1.1 // indirect
72-
github.com/DataDog/go-libddwaf v1.2.0 // indirect
73-
github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork // indirect
74-
github.com/DataDog/gostackparse v0.5.0 // indirect
75-
github.com/DataDog/sketches-go v1.2.1 // indirect
98+
github.com/DataDog/appsec-internal-go v1.9.0 // indirect
99+
github.com/DataDog/datadog-agent/pkg/obfuscate v0.58.0 // indirect
100+
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.58.0 // indirect
101+
github.com/DataDog/datadog-go/v5 v5.5.0 // indirect
102+
github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect
103+
github.com/DataDog/gostackparse v0.7.0 // indirect
104+
github.com/DataDog/sketches-go v1.4.5 // indirect
76105
github.com/Microsoft/go-winio v0.6.1 // indirect
77106
github.com/Microsoft/hcsshim v0.9.10 // indirect
78107
github.com/beorn7/perks v1.0.1 // indirect
79-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
108+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
80109
github.com/cilium/ebpf v0.9.1 // indirect
81110
github.com/containerd/cgroups v1.1.0 // indirect
82111
github.com/containerd/continuity v0.3.0 // indirect
@@ -85,7 +114,7 @@ require (
85114
github.com/containerd/typeurl v1.0.2 // indirect
86115
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
87116
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
88-
github.com/davecgh/go-spew v1.1.1 // indirect
117+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
89118
github.com/docker/go-connections v0.4.0 // indirect
90119
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
91120
github.com/docker/go-units v0.5.0 // indirect
@@ -105,23 +134,23 @@ require (
105134
github.com/golang/protobuf v1.5.4 // indirect
106135
github.com/google/go-cmp v0.6.0 // indirect
107136
github.com/google/gofuzz v1.2.0 // indirect
108-
github.com/google/pprof v0.0.0-20230509042627-b1315fad0c5a // indirect
137+
github.com/google/pprof v0.0.0-20230817174616-7a8ec2ada47b // indirect
109138
github.com/gorilla/websocket v1.5.0 // indirect
110139
github.com/hashicorp/errwrap v1.1.0 // indirect
111-
github.com/hashicorp/hcl v1.0.0 // indirect
140+
github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
112141
github.com/imdario/mergo v0.3.16 // indirect
113142
github.com/inconshreveable/mousetrap v1.1.0 // indirect
114143
github.com/josharian/intern v1.0.0 // indirect
115144
github.com/json-iterator/go v1.1.12 // indirect
116145
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
117-
github.com/klauspost/compress v1.16.0 // indirect
146+
github.com/klauspost/compress v1.17.1 // indirect
118147
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
119148
github.com/magiconair/properties v1.8.7 // indirect
120149
github.com/mailru/easyjson v0.7.7 // indirect
121150
github.com/mattn/go-colorable v0.1.13 // indirect
122151
github.com/mattn/go-isatty v0.0.20 // indirect
123152
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
124-
github.com/mitchellh/mapstructure v1.5.0 // indirect
153+
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
125154
github.com/moby/locker v1.0.1 // indirect
126155
github.com/moby/spdystream v0.2.0 // indirect
127156
github.com/moby/sys/mountinfo v0.6.2 // indirect
@@ -130,49 +159,45 @@ require (
130159
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
131160
github.com/opencontainers/go-digest v1.0.0 // indirect
132161
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b // indirect
133-
github.com/opencontainers/runtime-spec v1.1.0-rc.1 // indirect
162+
github.com/opencontainers/runtime-spec v1.1.0-rc.3 // indirect
134163
github.com/opencontainers/selinux v1.11.0 // indirect
135-
github.com/outcaste-io/ristretto v0.2.1 // indirect
136-
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
137-
github.com/philhofer/fwd v1.1.1 // indirect
164+
github.com/outcaste-io/ristretto v0.2.3 // indirect
165+
github.com/pelletier/go-toml/v2 v2.0.9 // indirect
166+
github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 // indirect
138167
github.com/pkg/errors v0.9.1 // indirect
139-
github.com/pmezard/go-difflib v1.0.0 // indirect
140-
github.com/prometheus/client_golang v1.19.0 // indirect
141-
github.com/prometheus/client_model v0.6.0 // indirect
142-
github.com/prometheus/common v0.50.0 // indirect
143-
github.com/prometheus/procfs v0.13.0 // indirect
144-
github.com/richardartoul/molecule v1.0.1-0.20221107223329-32cfee06a052 // indirect
168+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
169+
github.com/prometheus/client_golang v1.19.1 // indirect
170+
github.com/prometheus/client_model v0.6.1 // indirect
171+
github.com/prometheus/common v0.54.0 // indirect
172+
github.com/prometheus/procfs v0.15.0 // indirect
173+
github.com/richardartoul/molecule v1.0.1-0.20240531184615-7ca0df43c0b3 // indirect
145174
github.com/robfig/cron v1.2.0
146-
github.com/secure-systems-lab/go-securesystemslib v0.6.0 // indirect
175+
github.com/secure-systems-lab/go-securesystemslib v0.7.0 // indirect
147176
github.com/sirupsen/logrus v1.9.3 // indirect
148177
github.com/spaolacci/murmur3 v1.1.0 // indirect
149178
github.com/spf13/afero v1.9.3 // indirect
150179
github.com/spf13/cast v1.5.0 // indirect
151180
github.com/spf13/jwalterweatherman v1.1.0 // indirect
152181
github.com/stretchr/objx v0.5.2 // indirect
153182
github.com/subosito/gotenv v1.4.2 // indirect
154-
github.com/tinylib/msgp v1.1.6 // indirect
183+
github.com/tinylib/msgp v1.2.1 // indirect
155184
go.opencensus.io v0.24.0 // indirect
156-
go.opentelemetry.io/otel/metric v1.19.0 // indirect
157-
go.uber.org/atomic v1.10.0 // indirect
185+
go.opentelemetry.io/otel/metric v1.29.0 // indirect
186+
go.uber.org/atomic v1.11.0 // indirect
158187
go.uber.org/multierr v1.11.0 // indirect
159-
go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect
160-
go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect
161-
golang.org/x/mod v0.16.0 // indirect
162-
golang.org/x/net v0.24.0 // indirect
163-
golang.org/x/oauth2 v0.18.0 // indirect
164-
golang.org/x/sync v0.6.0 // indirect
165-
golang.org/x/term v0.19.0 // indirect
166-
golang.org/x/text v0.14.0 // indirect
167-
golang.org/x/time v0.5.0 // indirect
168-
golang.org/x/tools v0.19.0 // indirect
169-
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
188+
golang.org/x/mod v0.20.0 // indirect
189+
golang.org/x/net v0.28.0 // indirect
190+
golang.org/x/oauth2 v0.22.0 // indirect
191+
golang.org/x/sync v0.8.0 // indirect
192+
golang.org/x/term v0.23.0 // indirect
193+
golang.org/x/text v0.17.0 // indirect
194+
golang.org/x/time v0.6.0 // indirect
195+
golang.org/x/tools v0.24.0 // indirect
196+
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
170197
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
171-
google.golang.org/appengine v1.6.8 // indirect
172198
gopkg.in/inf.v0 v0.9.1 // indirect
173199
gopkg.in/ini.v1 v1.67.0 // indirect
174200
gopkg.in/yaml.v2 v2.4.0 // indirect
175-
inet.af/netaddr v0.0.0-20220811202034-502d2d690317 // indirect
176201
k8s.io/apiextensions-apiserver v0.29.3 // indirect
177202
k8s.io/component-base v0.29.3 // indirect
178203
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect

0 commit comments

Comments
 (0)