From 1177a6756ca016ebc2f9c4496ec67f8fd1195f27 Mon Sep 17 00:00:00 2001 From: SungJin1212 Date: Tue, 10 Dec 2024 17:14:47 +0900 Subject: [PATCH] Update thanos version to d0d93dbf3efc (#6410) Signed-off-by: SungJin1212 --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/thanos-io/thanos/pkg/exthttp/hedging.go | 2 +- .../thanos-io/thanos/pkg/store/storepb/inprocess.go | 8 ++++++++ vendor/modules.txt | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 97d96309c2..0c89405290 100644 --- a/go.mod +++ b/go.mod @@ -53,7 +53,7 @@ require ( github.com/stretchr/testify v1.10.0 github.com/thanos-io/objstore v0.0.0-20241111205755-d1dd89d41f97 github.com/thanos-io/promql-engine v0.0.0-20241203103240-2f49f80c7c68 - github.com/thanos-io/thanos v0.37.1 + github.com/thanos-io/thanos v0.37.2-0.20241205123958-d0d93dbf3efc github.com/uber/jaeger-client-go v2.30.0+incompatible github.com/weaveworks/common v0.0.0-20230728070032-dd9e68f319d5 go.etcd.io/etcd/api/v3 v3.5.17 diff --git a/go.sum b/go.sum index 878620d2cb..f9c500b6d6 100644 --- a/go.sum +++ b/go.sum @@ -1665,8 +1665,8 @@ github.com/thanos-io/objstore v0.0.0-20241111205755-d1dd89d41f97 h1:VjG0mwhN1Dkn github.com/thanos-io/objstore v0.0.0-20241111205755-d1dd89d41f97/go.mod h1:vyzFrBXgP+fGNG2FopEGWOO/zrIuoy7zt3LpLeezRsw= github.com/thanos-io/promql-engine v0.0.0-20241203103240-2f49f80c7c68 h1:cChM/FbpXeYmrSmXO1/MmmSlONviLVxWAWCB0/g4JrY= github.com/thanos-io/promql-engine v0.0.0-20241203103240-2f49f80c7c68/go.mod h1:wx0JlRZtsB2S10JYUgeg5GqLfMxw31SzArP+28yyE00= -github.com/thanos-io/thanos v0.37.1 h1:PuTMql3S/i5UWlBT0WbCDwwL6Kc6Jf7DLHt2rdj4ivY= -github.com/thanos-io/thanos v0.37.1/go.mod h1:5Ni7Uc1Bc8UCGOYmZ/2f/LVvDkZKNDdqDJZqjDFG+rI= +github.com/thanos-io/thanos v0.37.2-0.20241205123958-d0d93dbf3efc h1:LMpGIErJWqv+9FmCHAcl9t+6VL8gn6lptIKDgglbNnU= +github.com/thanos-io/thanos v0.37.2-0.20241205123958-d0d93dbf3efc/go.mod h1:5Ni7Uc1Bc8UCGOYmZ/2f/LVvDkZKNDdqDJZqjDFG+rI= github.com/tjhop/slog-gokit v0.1.2 h1:pmQI4SvU9h4gA0vIQsdhJQSqQg4mOmsPykG2/PM3j1I= github.com/tjhop/slog-gokit v0.1.2/go.mod h1:8fhlcp8C8ELbg3GCyKv06tgt4B5sDq2P1r2DQAu1HuM= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= diff --git a/vendor/github.com/thanos-io/thanos/pkg/exthttp/hedging.go b/vendor/github.com/thanos-io/thanos/pkg/exthttp/hedging.go index 09a1b3e8a2..af200bd92e 100644 --- a/vendor/github.com/thanos-io/thanos/pkg/exthttp/hedging.go +++ b/vendor/github.com/thanos-io/thanos/pkg/exthttp/hedging.go @@ -48,11 +48,11 @@ func (hrt *hedgingRoundTripper) RoundTrip(req *http.Request) (*http.Response, er } duration := float64(time.Since(start).Milliseconds()) hrt.mu.Lock() + defer hrt.mu.Unlock() err = hrt.TDigest.Add(duration) if err != nil { return nil, err } - hrt.mu.Unlock() return resp, err } diff --git a/vendor/github.com/thanos-io/thanos/pkg/store/storepb/inprocess.go b/vendor/github.com/thanos-io/thanos/pkg/store/storepb/inprocess.go index 0c3e7641ba..7e960845f3 100644 --- a/vendor/github.com/thanos-io/thanos/pkg/store/storepb/inprocess.go +++ b/vendor/github.com/thanos-io/thanos/pkg/store/storepb/inprocess.go @@ -5,8 +5,10 @@ package storepb import ( "context" + "fmt" "io" "iter" + "runtime/debug" "google.golang.org/grpc" ) @@ -92,6 +94,12 @@ func (s serverAsClient) LabelValues(ctx context.Context, in *LabelValuesRequest, func (s serverAsClient) Series(ctx context.Context, in *SeriesRequest, _ ...grpc.CallOption) (Store_SeriesClient, error) { var srvIter iter.Seq2[*SeriesResponse, error] = func(yield func(*SeriesResponse, error) bool) { + defer func() { + if r := recover(); r != nil { + st := debug.Stack() + panic(fmt.Sprintf("panic %v in server iterator: %s", r, st)) + } + }() srv := newInProcessServer(ctx, yield) err := s.srv.Series(in, srv) if err != nil { diff --git a/vendor/modules.txt b/vendor/modules.txt index 8793246358..590d80fbb5 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -990,7 +990,7 @@ github.com/thanos-io/promql-engine/query github.com/thanos-io/promql-engine/ringbuffer github.com/thanos-io/promql-engine/storage github.com/thanos-io/promql-engine/storage/prometheus -# github.com/thanos-io/thanos v0.37.1 +# github.com/thanos-io/thanos v0.37.2-0.20241205123958-d0d93dbf3efc ## explicit; go 1.23.0 github.com/thanos-io/thanos/pkg/api/query/querypb github.com/thanos-io/thanos/pkg/block