Skip to content

Commit

Permalink
Merge branch '2091-iss-panic' into 'dev'
Browse files Browse the repository at this point in the history 
fix: fix timeout panic

See merge request cloudcare-tools/datakit!3206
  • Loading branch information
谭彪 committed Sep 19, 2024
2 parents 8d17788 + 0a72c47 commit 99ff806
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/GuanceCloud/confd v0.1.101
github.com/GuanceCloud/grok v1.1.4
github.com/GuanceCloud/platypus v0.2.10-0.20240815092339-21f3924850ee
github.com/GuanceCloud/timeout v0.0.0-20230216045952-48442c6fb747
github.com/GuanceCloud/timeout v1.9.1
github.com/IBM/sarama v1.41.2
github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible
github.com/antchfx/xmlquery v1.3.18 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@ github.com/GuanceCloud/pyroscope v0.36.3 h1:3ni9asu1zsxzT/Y8WdoqcTN3LiAuFbCqAUk4
github.com/GuanceCloud/pyroscope v0.36.3/go.mod h1:jy3PTkLqODnkZMqlPfXcGPYoxqGGUKVKWPL+HFVhWzo=
github.com/GuanceCloud/service v1.2.4 h1:5sQSj0S8IRidG+DFOMyMcEQeF1v/jyUez/YOfAZssWs=
github.com/GuanceCloud/service v1.2.4/go.mod h1:CIMRFEJVL+0DS1a3Nx06NaMn4Dz63Ng6O7dl0qH0zVM=
github.com/GuanceCloud/timeout v0.0.0-20230216045952-48442c6fb747 h1:YqwjFsmNo7txn4caeD74aJTD8b7mk3EzEVnJDZUfDPM=
github.com/GuanceCloud/timeout v0.0.0-20230216045952-48442c6fb747/go.mod h1:euv8CBpLJ81TJK8u4MHaiVVSHmbWBmj//c8xsTAwNNw=
github.com/GuanceCloud/timeout v1.9.1 h1:8e70bQqsybH5FSgqahBPQ7HQ9g9U6E6DNJBDmqD9Huo=
github.com/GuanceCloud/timeout v1.9.1/go.mod h1:euv8CBpLJ81TJK8u4MHaiVVSHmbWBmj//c8xsTAwNNw=
github.com/GuanceCloud/toml v1.2.5 h1:jBWfqFSVortEY0C4RYqFPvhDKcGxIosKzcQqTPtZMfg=
github.com/GuanceCloud/toml v1.2.5/go.mod h1:D7S1XowYqOvMQdtsp2+lg2rKmO6RVuyekXJL+MzkD5Y=
github.com/GuanceCloud/tracing-protos v0.0.0-20230619071516-54c8cff1b6b3 h1:+b+MkQrj/eJcODklzCSObp19TBycmfuooqCBD+89qmU=
Expand Down
6 changes: 3 additions & 3 deletions vendor/github.com/GuanceCloud/timeout/timeout.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ github.com/GuanceCloud/platypus/pkg/engine/runtime
github.com/GuanceCloud/platypus/pkg/errchain
github.com/GuanceCloud/platypus/pkg/parser
github.com/GuanceCloud/platypus/pkg/token
# github.com/GuanceCloud/timeout v0.0.0-20230216045952-48442c6fb747
# github.com/GuanceCloud/timeout v1.9.1
## explicit; go 1.15
github.com/GuanceCloud/timeout
# github.com/GuanceCloud/toml v1.2.5
Expand Down

0 comments on commit 99ff806

Please sign in to comment.