chore: Update dependencies pt2 (#4567)

oleg-kozlyuk-grafana · web-flow · commit 15bc95664041 · 2025-10-28T12:38:22.000+01:00
* chore: Update dependencies pt2

* Update sony/gobreaker

* Update github.com/samber/lo

* Update go version and gnostic

* Remove GO_MOD_VERSION to reduce maintenance burden
diff --git a/Makefile b/Makefile
@@ -10,7 +10,6 @@ BIN := $(CURDIR)/.tmp/bin
 COPYRIGHT_YEARS := 2021-2022
 LICENSE_IGNORE := -e /testdata/
 GO_TEST_FLAGS ?= -v -race -cover
-GO_MOD_VERSION := 1.24.0
 
 GOOS ?= $(shell go env GOOS)
 GOARCH ?= $(shell go env GOARCH)
@@ -197,12 +196,12 @@ go/mod_tidy_root:
 	# doesn't work for go workspace
 	# GO111MODULE=on go mod verify
 	go work sync
-	GO111MODULE=on go mod tidy -go $(GO_MOD_VERSION)
+	GO111MODULE=on go mod tidy
 
 .PHONY: go/mod_tidy/%
 go/mod_tidy/%: go/mod_tidy_root
 	cd "$*" && GO111MODULE=on go mod download
-	cd "$*" && GO111MODULE=on go mod tidy -go $(GO_MOD_VERSION)
+	cd "$*" && GO111MODULE=on go mod tidy
 
 .PHONY: fmt
 fmt: $(BIN)/golangci-lint $(BIN)/buf $(BIN)/tk ## Automatically fix some lint errors
diff --git a/api/go.mod b/api/go.mod
@@ -1,12 +1,12 @@
 module github.com/grafana/pyroscope/api
 
-go 1.24.0
+go 1.24.6
 
 toolchain go1.24.8
 
 require (
 	connectrpc.com/connect v1.19.1
-	github.com/google/gnostic v0.7.0
+	github.com/google/gnostic v0.7.1
 	github.com/gorilla/mux v1.8.1
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3
 	github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10
@@ -19,10 +19,11 @@ require (
 
 require (
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
+	github.com/google/gnostic-models v0.7.0 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/rogpeppe/go-internal v1.13.1 // indirect
 	go.opentelemetry.io/otel v1.38.0 // indirect
+	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	golang.org/x/net v0.46.0 // indirect
 	golang.org/x/sys v0.37.0 // indirect
 	golang.org/x/text v0.30.0 // indirect
diff --git a/api/go.sum b/api/go.sum
diff --git a/examples/golang-pgo/go.mod b/examples/golang-pgo/go.mod
@@ -1,6 +1,6 @@
 module rideshare
 
-go 1.24.0
+go 1.24.6
 
 toolchain go1.24.8
 
diff --git a/examples/golang-pgo/go.work b/examples/golang-pgo/go.work
@@ -1,4 +1,4 @@
-go 1.24.0
+go 1.24.6
 
 
 use .
diff --git a/examples/language-sdk-instrumentation/golang-push/rideshare-alloy/go.mod b/examples/language-sdk-instrumentation/golang-push/rideshare-alloy/go.mod
@@ -1,6 +1,6 @@
 module rideshare
 
-go 1.24.0
+go 1.24.6
 
 toolchain go1.24.8
 
diff --git a/examples/language-sdk-instrumentation/golang-push/rideshare-alloy/go.work b/examples/language-sdk-instrumentation/golang-push/rideshare-alloy/go.work
@@ -1,4 +1,4 @@
-go 1.24.0
+go 1.24.6
 
 
 use .
diff --git a/examples/language-sdk-instrumentation/golang-push/rideshare-k6/go.mod b/examples/language-sdk-instrumentation/golang-push/rideshare-k6/go.mod
@@ -1,6 +1,6 @@
 module rideshare
 
-go 1.24.0
+go 1.24.6
 
 toolchain go1.24.8
 
diff --git a/examples/language-sdk-instrumentation/golang-push/rideshare-k6/go.work b/examples/language-sdk-instrumentation/golang-push/rideshare-k6/go.work
@@ -1,4 +1,4 @@
-go 1.24.0
+go 1.24.6
 
 
 use .
diff --git a/examples/language-sdk-instrumentation/golang-push/rideshare/go.mod b/examples/language-sdk-instrumentation/golang-push/rideshare/go.mod
@@ -1,6 +1,6 @@
 module rideshare
 
-go 1.24.0
+go 1.24.6
 
 toolchain go1.24.8
 
diff --git a/examples/language-sdk-instrumentation/golang-push/rideshare/go.work b/examples/language-sdk-instrumentation/golang-push/rideshare/go.work
@@ -1,3 +1,3 @@
-go 1.24.0
+go 1.24.6
 
 use .
diff --git a/examples/language-sdk-instrumentation/golang-push/simple/go.mod b/examples/language-sdk-instrumentation/golang-push/simple/go.mod
@@ -1,6 +1,6 @@
 module pushsimple
 
-go 1.24.0
+go 1.24.6
 
 toolchain go1.24.8
 
diff --git a/examples/language-sdk-instrumentation/golang-push/simple/go.work b/examples/language-sdk-instrumentation/golang-push/simple/go.work
@@ -1,3 +1,3 @@
-go 1.24.0
+go 1.24.6
 
 use .
diff --git a/examples/tracing/golang-push/go.mod b/examples/tracing/golang-push/go.mod
@@ -1,6 +1,6 @@
 module rideshare
 
-go 1.24.0
+go 1.24.6
 
 toolchain go1.24.8
 
diff --git a/examples/tracing/golang-push/go.work b/examples/tracing/golang-push/go.work
@@ -1,4 +1,4 @@
-go 1.24.0
+go 1.24.6
 
 
 use .
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/pyroscope
 
-go 1.24.0
+go 1.24.6
 
 toolchain go1.24.8
 
@@ -39,7 +39,7 @@ require (
 	github.com/grafana/pyroscope-go/x/k6 v0.0.0-20241003203156-a917cea171d3
 	github.com/grafana/pyroscope/api v0.4.0
 	github.com/grafana/pyroscope/lidia v0.0.0-20250416154336-a5c33510d5ff
-	github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc
+	github.com/grafana/regexp v0.0.0-20250905093917-f7b3be9d1853
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3
 	github.com/hashicorp/go-multierror v1.1.1
@@ -68,10 +68,10 @@ require (
 	github.com/prometheus/client_model v0.6.2
 	github.com/prometheus/common v0.66.1
 	github.com/prometheus/prometheus v0.306.0
-	github.com/samber/lo v1.51.0
+	github.com/samber/lo v1.52.0
 	github.com/simonswine/tempopb v0.2.0
 	github.com/sirupsen/logrus v1.9.3
-	github.com/sony/gobreaker/v2 v2.2.1
+	github.com/sony/gobreaker/v2 v2.3.0
 	github.com/spf13/afero v1.15.0
 	github.com/stretchr/testify v1.11.1
 	github.com/thanos-io/objstore v0.0.0-20250813080715-4e5fd4289b50
@@ -197,8 +197,8 @@ require (
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/golang/snappy v1.0.0 // indirect
 	github.com/google/btree v1.1.3 // indirect
-	github.com/google/gnostic v0.7.0 // indirect
-	github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
+	github.com/google/gnostic v0.7.1 // indirect
+	github.com/google/gnostic-models v0.7.0 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/s2a-go v0.1.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
diff --git a/go.sum b/go.sum
diff --git a/go.work b/go.work
@@ -1,4 +1,4 @@
-go 1.24.0
+go 1.24.6
 
 toolchain go1.24.8
 
diff --git a/go.work.sum b/go.work.sum
diff --git a/lidia/go.mod b/lidia/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/pyroscope/lidia
 
-go 1.24.0
+go 1.24.6
 
 toolchain go1.24.8
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-go 1.24.0`
	`1`	`+go 1.24.6`
`2`	`2`
`3`	`3`
`4`	`4`	`use .`