Skip to content

Commit c86b2c2

Browse files
authored
Bump golang.org/x/crypto to v0.45.0 (#462)
1 parent 46f5108 commit c86b2c2

File tree

36 files changed

+257
-757
lines changed

36 files changed

+257
-757
lines changed

Makefile

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,12 +229,29 @@ tag-repo: GBOC_TAG = v$(shell go run ./cmd/distrogen query --spec specs/google-b
229229
tag-repo:
230230
bash ./internal/tools/scripts/tag.sh $(GBOC_TAG)
231231

232+
EXCLUDE_INTERNAL_TOOLS = grep -v ".*internal/tools.*"
233+
EXCLUDE_SMOKE_TEST = grep -v ".*integration_test/smoke_test.*"
234+
EXCLUDE_TESTDATA = grep -v ".*testdata.*"
235+
232236
.PHONY: target-all-modules
233237
target-all-modules: go.work
234238
ifndef TARGET
235239
@echo "No TARGET defined."
236240
else
237-
go list -f "{{ .Dir }}" -m | grep -v -e ".*internal/tools.*" -e ".*integration_test/smoke_test.*" |\
241+
go list -f "{{ .Dir }}" -m |\
242+
$(EXCLUDE_INTERNAL_TOOLS) |\
243+
$(EXCLUDE_SMOKE_TEST) |\
244+
$(EXCLUDE_TESTDATA) |\
245+
GOWORK=off xargs -t -I '{}' $(MAKE) -C {} $(TARGET)
246+
endif
247+
248+
.PHONY: target-all-modules-include-internal
249+
target-all-modules-include-internal: go.work
250+
ifndef TARGET
251+
@echo "No TARGET defined."
252+
else
253+
go list -f "{{ .Dir }}" -m |\
254+
$(EXCLUDE_TESTDATA) |\
238255
GOWORK=off xargs -t -I '{}' $(MAKE) -C {} $(TARGET)
239256
endif
240257

@@ -243,5 +260,6 @@ update-go-module-in-all:
243260
ifndef GO_MOD
244261
@echo "must specify a GO_MOD"
245262
else
246-
TARGET=update-go-module $(MAKE) target-all-modules GO_MOD=$(GO_MOD)$(if "$(GO_MOD_VERSION), GO_MOD_VERSION=$(GO_MOD_VERSION),)
263+
TARGET=update-go-module $(MAKE) target-all-modules-include-internal GO_MOD=$(GO_MOD)$(if "$(GO_MOD_VERSION), GO_MOD_VERSION=$(GO_MOD_VERSION),)
264+
TARGET=tidy $(MAKE) target-all-modules-include-internal
247265
endif
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
include ../../../../make/maintenance.mk
2+
include ../../../../make/common.mk

components/google-built-opentelemetry-collector/internal/tools/go.mod

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@ module github.com/GoogleCloudPlatform/opentelemetry-operations-collector/compone
22

33
go 1.24.0
44

5+
require go.opentelemetry.io/collector/cmd/mdatagen v0.141.0
6+
57
require (
6-
github.com/go-logr/logr v1.4.3 // indirect
7-
github.com/go-logr/stdr v1.2.2 // indirect
88
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
99
github.com/gobwas/glob v0.2.3 // indirect
10-
github.com/gogo/protobuf v1.3.2 // indirect
11-
github.com/google/uuid v1.6.0 // indirect
1210
github.com/hashicorp/go-version v1.8.0 // indirect
1311
github.com/inconshreveable/mousetrap v1.1.0 // indirect
1412
github.com/json-iterator/go v1.1.12 // indirect
@@ -19,32 +17,21 @@ require (
1917
github.com/mitchellh/reflectwalk v1.0.2 // indirect
2018
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
2119
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
20+
github.com/rogpeppe/go-internal v1.14.1 // indirect
2221
github.com/spf13/cobra v1.10.1 // indirect
2322
github.com/spf13/pflag v1.0.10 // indirect
24-
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
25-
go.opentelemetry.io/collector/cmd/mdatagen v0.141.0 // indirect
2623
go.opentelemetry.io/collector/component v1.47.0 // indirect
2724
go.opentelemetry.io/collector/confmap v1.47.0 // indirect
2825
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.47.0 // indirect
2926
go.opentelemetry.io/collector/featuregate v1.47.0 // indirect
3027
go.opentelemetry.io/collector/filter v0.141.0 // indirect
31-
go.opentelemetry.io/collector/internal/telemetry v0.138.0 // indirect
3228
go.opentelemetry.io/collector/pdata v1.47.0 // indirect
33-
go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect
3429
go.opentelemetry.io/otel v1.38.0 // indirect
35-
go.opentelemetry.io/otel/log v0.14.0 // indirect
3630
go.opentelemetry.io/otel/metric v1.38.0 // indirect
37-
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
3831
go.opentelemetry.io/otel/trace v1.38.0 // indirect
3932
go.uber.org/multierr v1.11.0 // indirect
4033
go.uber.org/zap v1.27.1 // indirect
4134
go.yaml.in/yaml/v3 v3.0.4 // indirect
42-
golang.org/x/net v0.46.1-0.20251013234738-63d1a5100f82 // indirect
43-
golang.org/x/sys v0.38.0 // indirect
4435
golang.org/x/text v0.31.0 // indirect
45-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8 // indirect
46-
google.golang.org/grpc v1.77.0 // indirect
47-
google.golang.org/protobuf v1.36.10 // indirect
4836
gopkg.in/yaml.v3 v3.0.1 // indirect
49-
sigs.k8s.io/yaml v1.5.0 // indirect
5037
)

components/google-built-opentelemetry-collector/internal/tools/go.sum

Lines changed: 24 additions & 425 deletions
Large diffs are not rendered by default.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
include ../../../../make/maintenance.mk
2+
include ../../../../make/common.mk

components/otelopscol/internal/tools/go.mod

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,10 @@ require (
4040
go.uber.org/multierr v1.11.0 // indirect
4141
go.uber.org/zap v1.27.0 // indirect
4242
go.yaml.in/yaml/v3 v3.0.4 // indirect
43-
golang.org/x/net v0.44.0 // indirect
44-
golang.org/x/sys v0.36.0 // indirect
45-
golang.org/x/text v0.29.0 // indirect
43+
golang.org/x/net v0.47.0 // indirect
44+
golang.org/x/sys v0.38.0 // indirect
45+
golang.org/x/text v0.31.0 // indirect
4646
google.golang.org/genproto/googleapis/rpc v0.0.0-20250922171735-9219d122eba9 // indirect
4747
google.golang.org/grpc v1.75.1 // indirect
4848
google.golang.org/protobuf v1.36.9 // indirect
49-
sigs.k8s.io/yaml v1.4.0 // indirect
5049
)

0 commit comments

Comments
 (0)