Skip to content

Commit 8fb7b48

Browse files
paul1rpaul1r
authored
chore(deps): update dskit 20240819 (#13924)
1 parent 1ba4bff commit 8fb7b48

36 files changed

+899
-288
lines changed

‎docs/sources/shared/configuration.md

+8
Original file line numberDiff line numberDiff line change
@@ -4181,6 +4181,14 @@ When a memberlist config with atleast 1 join_members is defined, kvstore of type
41814181
# CLI flag: -memberlist.leave-timeout
41824182
[leave_timeout: <duration> | default = 20s]
41834183
4184+
# Timeout for broadcasting all remaining locally-generated updates to other
4185+
# nodes when shutting down. Only used if there are nodes left in the memberlist
4186+
# cluster, and only applies to locally-generated updates, not to broadcast
4187+
# messages that are result of incoming gossip updates. 0 = no timeout, wait
4188+
# until all locally-generated updates are sent.
4189+
# CLI flag: -memberlist.broadcast-timeout-for-local-updates-on-shutdown
4190+
[broadcast_timeout_for_local_updates_on_shutdown: <duration> | default = 10s]
4191+
41844192
# How much space to use for keeping received and sent messages in memory for
41854193
# troubleshooting (two buffers). 0 to disable.
41864194
# CLI flag: -memberlist.message-history-buffer-bytes

‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ require (
5050
github.com/gorilla/mux v1.8.1
5151
github.com/gorilla/websocket v1.5.0
5252
github.com/grafana/cloudflare-go v0.0.0-20230110200409-c627cf6792f2
53-
github.com/grafana/dskit v0.0.0-20240626184720-35810fdf1c6d
53+
github.com/grafana/dskit v0.0.0-20240819131358-463219e80ea0
5454
github.com/grafana/go-gelf/v2 v2.0.1
5555
github.com/grafana/gomemcache v0.0.0-20240229205252-cd6a66d6fb56
5656
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc
@@ -271,7 +271,7 @@ require (
271271
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
272272
github.com/googleapis/gax-go/v2 v2.12.5 // indirect
273273
github.com/gophercloud/gophercloud v1.13.0 // indirect
274-
github.com/grafana/pyroscope-go/godeltaprof v0.1.6 // indirect
274+
github.com/grafana/pyroscope-go/godeltaprof v0.1.7 // indirect
275275
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
276276
github.com/hashicorp/errwrap v1.1.0 // indirect
277277
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect

‎go.sum

+5-6
Original file line numberDiff line numberDiff line change
@@ -274,9 +274,8 @@ github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb0
274274
github.com/NYTimes/gziphandler v1.0.1/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
275275
github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
276276
github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
277+
github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE=
277278
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
278-
github.com/OneOfOne/xxhash v1.2.6 h1:U68crOE3y3MPttCMQGywZOLrTeF5HHJ3/vDBCJn9/bA=
279-
github.com/OneOfOne/xxhash v1.2.6/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q=
280279
github.com/OpenDNS/vegadns2client v0.0.0-20180418235048-a3fa4a771d87/go.mod h1:iGLljf5n9GjT6kc0HBvyI1nOKnGQbNB66VzSNbK5iks=
281280
github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
282281
github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
@@ -1044,8 +1043,8 @@ github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWm
10441043
github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
10451044
github.com/grafana/cloudflare-go v0.0.0-20230110200409-c627cf6792f2 h1:qhugDMdQ4Vp68H0tp/0iN17DM2ehRo1rLEdOFe/gB8I=
10461045
github.com/grafana/cloudflare-go v0.0.0-20230110200409-c627cf6792f2/go.mod h1:w/aiO1POVIeXUQyl0VQSZjl5OAGDTL5aX+4v0RA1tcw=
1047-
github.com/grafana/dskit v0.0.0-20240626184720-35810fdf1c6d h1:CD8PWWX+9lYdgeMquSofmLErvCtk7jb+3/W/SH6oo/k=
1048-
github.com/grafana/dskit v0.0.0-20240626184720-35810fdf1c6d/go.mod h1:HvSf3uf8Ps2vPpzHeAFyZTdUcbVr+Rxpq1xcx7J/muc=
1046+
github.com/grafana/dskit v0.0.0-20240819131358-463219e80ea0 h1:iMShjkEYATnBMbEa2wV4QiK5PU2trw24FOCON3v7+K4=
1047+
github.com/grafana/dskit v0.0.0-20240819131358-463219e80ea0/go.mod h1:c4ASJAo1QFmXGydDzNed2o0+Fncx+x4YmQ1r9HfYU3c=
10491048
github.com/grafana/go-gelf/v2 v2.0.1 h1:BOChP0h/jLeD+7F9mL7tq10xVkDG15he3T1zHuQaWak=
10501049
github.com/grafana/go-gelf/v2 v2.0.1/go.mod h1:lexHie0xzYGwCgiRGcvZ723bSNyNI8ZRD4s0CLobh90=
10511050
github.com/grafana/gocql v0.0.0-20200605141915-ba5dc39ece85 h1:xLuzPoOzdfNb/RF/IENCw+oLVdZB4G21VPhkHBgwSHY=
@@ -1056,8 +1055,8 @@ github.com/grafana/jsonparser v0.0.0-20240425183733-ea80629e1a32 h1:NznuPwItog+r
10561055
github.com/grafana/jsonparser v0.0.0-20240425183733-ea80629e1a32/go.mod h1:796sq+UcONnSlzA3RtlBZ+b/hrerkZXiEmO8oMjyRwY=
10571056
github.com/grafana/memberlist v0.3.1-0.20220714140823-09ffed8adbbe h1:yIXAAbLswn7VNWBIvM71O2QsgfgW9fRXZNR0DXe6pDU=
10581057
github.com/grafana/memberlist v0.3.1-0.20220714140823-09ffed8adbbe/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
1059-
github.com/grafana/pyroscope-go/godeltaprof v0.1.6 h1:nEdZ8louGAplSvIJi1HVp7kWvFvdiiYg3COLlTwJiFo=
1060-
github.com/grafana/pyroscope-go/godeltaprof v0.1.6/go.mod h1:Tk376Nbldo4Cha9RgiU7ik8WKFkNpfds98aUzS8omLE=
1058+
github.com/grafana/pyroscope-go/godeltaprof v0.1.7 h1:C11j63y7gymiW8VugJ9ZW0pWfxTZugdSJyC48olk5KY=
1059+
github.com/grafana/pyroscope-go/godeltaprof v0.1.7/go.mod h1:Tk376Nbldo4Cha9RgiU7ik8WKFkNpfds98aUzS8omLE=
10611060
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc h1:GN2Lv3MGO7AS6PrRoT6yV5+wkrOpcszoIsO4+4ds248=
10621061
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc/go.mod h1:+JKpmjMGhpgPL+rXZ5nsZieVzvarn86asRlBg4uNGnk=
10631062
github.com/grafana/tail v0.0.0-20230510142333-77b18831edf0 h1:bjh0PVYSVVFxzINqPFYJmAmJNrWPgnVjuSdYJGHmtFU=

‎pkg/distributor/instance_count_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func TestInstanceCountDelegate_CorrectlyInvokesOtherDelegates(t *testing.T) {
111111
require.NoError(t, err)
112112

113113
ingesters := ring.NewDesc()
114-
ingesters.AddIngester("ingester-0", "ingester-0:3100", "zone-a", []uint32{1}, ring.ACTIVE, time.Now())
114+
ingesters.AddIngester("ingester-0", "ingester-0:3100", "zone-a", []uint32{1}, ring.ACTIVE, time.Now(), false, time.Now())
115115

116116
// initial state.
117117
require.Equal(t, 0, sentry1["Heartbeat"])

‎pkg/ingester/ingester_test.go

+10
Original file line numberDiff line numberDiff line change
@@ -1609,6 +1609,16 @@ func (r *readRingMock) GetTokenRangesForInstance(instance string) (ring.TokenRan
16091609
return tr, nil
16101610
}
16111611

1612+
// WritableInstancesWithTokensCount returns the number of writable instances in the ring that have tokens.
1613+
func (r *readRingMock) WritableInstancesWithTokensCount() int {
1614+
return len(r.replicationSet.Instances)
1615+
}
1616+
1617+
// WritableInstancesWithTokensInZoneCount returns the number of writable instances in the ring that are registered in given zone and have tokens.
1618+
func (r *readRingMock) WritableInstancesWithTokensInZoneCount(_ string) int {
1619+
return len(r.replicationSet.Instances)
1620+
}
1621+
16121622
func mockReadRingWithOneActiveIngester() *readRingMock {
16131623
return newReadRingMock([]ring.InstanceDesc{
16141624
{Addr: "test", Timestamp: time.Now().UnixNano(), State: ring.ACTIVE, Tokens: []uint32{1, 2, 3}},

‎pkg/pattern/flush_test.go

+13-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ func (f *fakeRingClient) State() services.State {
144144
panic("not implemented")
145145
}
146146

147-
func (f *fakeRingClient) AddListener(_ services.Listener) {
147+
func (f *fakeRingClient) AddListener(_ services.Listener) func() {
148148
panic("not implemented")
149149
}
150150

@@ -184,6 +184,18 @@ func (f *fakeRing) ZonesCount() int {
184184
return args.Int(0)
185185
}
186186

187+
// WritableInstancesWithTokensCount returns the number of writable instances in the ring that have tokens.
188+
func (f *fakeRing) WritableInstancesWithTokensCount() int {
189+
args := f.Called()
190+
return args.Int(0)
191+
}
192+
193+
// WritableInstancesWithTokensInZoneCount returns the number of writable instances in the ring that are registered in given zone and have tokens.
194+
func (f *fakeRing) WritableInstancesWithTokensInZoneCount(zone string) int {
195+
args := f.Called(zone)
196+
return args.Int(0)
197+
}
198+
187199
func (f *fakeRing) Get(
188200
key uint32,
189201
op ring.Operation,

‎pkg/pattern/ring_client.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ func (r *ringClient) State() services.State {
110110
return r.ring.State()
111111
}
112112

113-
func (r *ringClient) AddListener(listener services.Listener) {
114-
r.ring.AddListener(listener)
113+
func (r *ringClient) AddListener(listener services.Listener) func() {
114+
return r.ring.AddListener(listener)
115115
}
116116

117117
func (r *ringClient) GetClientFor(addr string) (ring_client.PoolClient, error) {

‎pkg/querier/querier_mock_test.go

+10
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,16 @@ func (r *readRingMock) GetTokenRangesForInstance(_ string) (ring.TokenRanges, er
496496
return tr, nil
497497
}
498498

499+
// WritableInstancesWithTokensCount returns the number of writable instances in the ring that have tokens.
500+
func (r *readRingMock) WritableInstancesWithTokensCount() int {
501+
return len(r.replicationSet.Instances)
502+
}
503+
504+
// WritableInstancesWithTokensInZoneCount returns the number of writable instances in the ring that are registered in given zone and have tokens.
505+
func (r *readRingMock) WritableInstancesWithTokensInZoneCount(_ string) int {
506+
return len(r.replicationSet.Instances)
507+
}
508+
499509
func mockReadRingWithOneActiveIngester() *readRingMock {
500510
return newReadRingMock([]ring.InstanceDesc{
501511
{Addr: "test", Timestamp: time.Now().UnixNano(), State: ring.ACTIVE, Tokens: []uint32{1, 2, 3}},

‎pkg/ruler/base/lifecycle_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func TestRuler_RingLifecyclerShouldAutoForgetUnhealthyInstances(t *testing.T) {
7979
require.NoError(t, ringStore.CAS(ctx, ringKey, func(in interface{}) (interface{}, bool, error) {
8080
ringDesc := ring.GetOrCreateRingDesc(in)
8181

82-
instance := ringDesc.AddIngester(unhealthyInstanceID, "1.1.1.1", "", generateSortedTokens(config.Ring.NumTokens), ring.ACTIVE, time.Now())
82+
instance := ringDesc.AddIngester(unhealthyInstanceID, "1.1.1.1", "", generateSortedTokens(config.Ring.NumTokens), ring.ACTIVE, time.Now(), false, time.Now())
8383
instance.Timestamp = time.Now().Add(-(ringAutoForgetUnhealthyPeriods + 1) * heartbeatTimeout).Unix()
8484
ringDesc.Ingesters[unhealthyInstanceID] = instance
8585

0 commit comments

Comments
 (0)