Skip to content

Commit baf955c

Browse files
committed
Merge branch 'refs/heads/main' into avilevy-collector-e2e-poc
# Conflicts: # go.mod # go.sum
2 parents b4ac41b + e149ed7 commit baf955c

File tree

2 files changed

+71
-71
lines changed

2 files changed

+71
-71
lines changed

go.mod

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,9 @@ require (
2626
github.com/docker/go-connections v0.5.0
2727
github.com/sethvargo/go-retry v0.1.0
2828
github.com/stretchr/testify v1.9.0
29-
golang.org/x/sync v0.9.0
30-
google.golang.org/api v0.203.0
31-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697
32-
google.golang.org/protobuf v1.35.2
29+
golang.org/x/sync v0.10.0
30+
google.golang.org/api v0.196.0
31+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1
3332
)
3433

3534
require (
@@ -69,18 +68,19 @@ require (
6968
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 // indirect
7069
go.opentelemetry.io/otel v1.32.0 // indirect
7170
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.29.0 // indirect
72-
go.opentelemetry.io/otel/metric v1.32.0 // indirect
73-
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
74-
go.opentelemetry.io/otel/trace v1.32.0 // indirect
75-
golang.org/x/crypto v0.28.0 // indirect
76-
golang.org/x/net v0.30.0 // indirect
71+
go.opentelemetry.io/otel/metric v1.29.0 // indirect
72+
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
73+
go.opentelemetry.io/otel/trace v1.29.0 // indirect
74+
golang.org/x/crypto v0.31.0 // indirect
75+
golang.org/x/net v0.33.0 // indirect
7776
golang.org/x/oauth2 v0.23.0 // indirect
78-
golang.org/x/sys v0.27.0 // indirect
79-
golang.org/x/text v0.20.0 // indirect
80-
golang.org/x/time v0.7.0 // indirect
81-
google.golang.org/genproto v0.0.0-20241015192408-796eee8c2d53 // indirect
82-
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
83-
google.golang.org/grpc v1.67.1 // indirect
77+
golang.org/x/sys v0.28.0 // indirect
78+
golang.org/x/text v0.21.0 // indirect
79+
golang.org/x/time v0.6.0 // indirect
80+
google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect
81+
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
82+
google.golang.org/grpc v1.66.0 // indirect
83+
google.golang.org/protobuf v1.34.2 // indirect
8484
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
8585
gopkg.in/yaml.v3 v3.0.1 // indirect
8686
gotest.tools/v3 v3.5.1 // indirect

0 commit comments

Comments
 (0)