Skip to content

Commit 1909545

Browse files
authored
Bump go-deadlock version to fix crash with go 1.23 in debug mode (#4248)
- **PR Description** This PR solves #4002, and perhaps #3880 (if they are indeed duplicates), and the error message preventing debugging in #3973. The problem is that our version of `go-deadlock` transitively depends on a version of `goid` that predates their changes to support go `1.23`, which results in every goid being the number `2` for some reason. Bumping the version of `go-deadlock` to include the updated transitive dependency means that the goids are now correct, and `go-deadlock` does not confused why goroutine 2 is trying to lock so many things. I know very little about go vendored dependencies, so all I have done is edit the `go.mod` entry for `go-deadlock` to be v0.3.5, and then run a `go mod tidy` and `go mod vendor`. If there is a more correct way to bump a vendored dependency, feel free to close this PR and just do that!
2 parents a5698b8 + f117eed commit 1909545

21 files changed

+201
-124
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ require (
3030
github.com/sahilm/fuzzy v0.1.0
3131
github.com/samber/lo v1.31.0
3232
github.com/sanity-io/litter v1.5.2
33-
github.com/sasha-s/go-deadlock v0.3.1
33+
github.com/sasha-s/go-deadlock v0.3.5
3434
github.com/sirupsen/logrus v1.4.2
3535
github.com/spf13/afero v1.9.5
3636
github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad
@@ -66,7 +66,7 @@ require (
6666
github.com/mitchellh/go-homedir v1.1.0 // indirect
6767
github.com/onsi/ginkgo v1.10.3 // indirect
6868
github.com/onsi/gomega v1.7.1 // indirect
69-
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
69+
github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect
7070
github.com/pmezard/go-difflib v1.0.0 // indirect
7171
github.com/rivo/uniseg v0.4.7 // indirect
7272
github.com/sergi/go-diff v1.1.0 // indirect

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,8 @@ github.com/onsi/ginkgo v1.10.3 h1:OoxbjfXVZyod1fmWYhI7SEyaD8B00ynP3T+D5GiyHOY=
250250
github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
251251
github.com/onsi/gomega v1.7.1 h1:K0jcRCwNQM3vFGh1ppMtDh/+7ApJrjldlX8fA0jDTLQ=
252252
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
253-
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 h1:q2e307iGHPdTGp0hoxKjt1H5pDo6utceo3dQVK3I5XQ=
254-
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o=
253+
github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 h1:Dx7Ovyv/SFnMFw3fD4oEoeorXc6saIiQ23LrGLth0Gw=
254+
github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4=
255255
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
256256
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
257257
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -271,8 +271,8 @@ github.com/samber/lo v1.31.0 h1:Sfa+/064Tdo4SvlohQUQzBhgSer9v/coGvKQI/XLWAM=
271271
github.com/samber/lo v1.31.0/go.mod h1:HLeWcJRRyLKp3+/XBJvOrerCQn9mhdKMHyd7IRlgeQ8=
272272
github.com/sanity-io/litter v1.5.2 h1:AnC8s9BMORWH5a4atZ4D6FPVvKGzHcnc5/IVTa87myw=
273273
github.com/sanity-io/litter v1.5.2/go.mod h1:5Z71SvaYy5kcGtyglXOC9rrUi3c1E8CamFWjQsazTh0=
274-
github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0=
275-
github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM=
274+
github.com/sasha-s/go-deadlock v0.3.5 h1:tNCOEEDG6tBqrNDOX35j/7hL5FcFViG6awUGROb2NsU=
275+
github.com/sasha-s/go-deadlock v0.3.5/go.mod h1:bugP6EGbdGYObIlx7pUZtWqlvo8k9H6vCBBsiChJQ5U=
276276
github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
277277
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
278278
github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=

vendor/github.com/petermattis/goid/README.md

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/petermattis/goid/goid_gccgo.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/petermattis/goid/goid_go1.3.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/petermattis/goid/goid_go1.4.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/petermattis/goid/goid_go1.5_arm.go renamed to vendor/github.com/petermattis/goid/goid_go1.5.go

Lines changed: 6 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/petermattis/goid/goid_go1.5_arm.s renamed to vendor/github.com/petermattis/goid/goid_go1.5.s

Lines changed: 21 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/petermattis/goid/goid_go1.5_amd64.go

Lines changed: 0 additions & 21 deletions
This file was deleted.

vendor/github.com/petermattis/goid/goid_go1.5_amd64.s

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)