Skip to content

Commit b2e63f5

Browse files
dastrobudastrobu
authored
bump dskit to v0.0.0-20241115082728-f2a7eb3aa0e9 to leverage benefits for context causes for DoBatch calls. (#4341)
See grafana/dskit#576 Signed-off-by: Daniel Strobusch <1847260+dastrobu@users.noreply.github.com>
1 parent 3ef3a63 commit b2e63f5

41 files changed

Lines changed: 1132 additions & 336 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
* [FEATURE] TraceQL support for instrumentation scope [#3967](https://github.com/grafana/tempo/pull/3967) (@ie-pham)
2222
* [FEATURE] Export cost attribution usage metrics from distributor [#4162](https://github.com/grafana/tempo/pull/4162) (@mdisibio)
2323
* [FEATURE] TraceQL metrics: avg_over_time [#4073](https://github.com/grafana/tempo/pull/4073) (@javiermolinar)
24+
* [ENHANCEMENT] Update to the latest dskit [#4341](https://github.com/grafana/tempo/pull/4341) (@dastrobu)
2425
* [ENHANCEMENT] Changed log level from INFO to DEBUG for the TempoDB Find operation using traceId to reduce excessive/unwanted logs in log search. [#4179](https://github.com/grafana/tempo/pull/4179) (@Aki0x137)
2526
* [ENHANCEMENT] Pushdown collection of results from generators in the querier [#4119](https://github.com/grafana/tempo/pull/4119) (@electron0zero)
2627
* [ENHANCEMENT] The span multiplier now also sources its value from the resource attributes. [#4210](https://github.com/grafana/tempo/pull/4210)

‎cmd/tempo-serverless/cloud-run/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ require (
5050
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
5151
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
5252
github.com/gorilla/mux v1.8.1 // indirect
53-
github.com/grafana/dskit v0.0.0-20240801171758-736c44c85382 // indirect
53+
github.com/grafana/dskit v0.0.0-20241115082728-f2a7eb3aa0e9 // indirect
5454
github.com/grafana/gomemcache v0.0.0-20240229205252-cd6a66d6fb56 // indirect
5555
github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect
5656
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect

‎cmd/tempo-serverless/cloud-run/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ github.com/googleapis/gax-go/v2 v2.13.0 h1:yitjD5f7jQHhyDsnhKEBU52NdvvdSeGzlAnDP
139139
github.com/googleapis/gax-go/v2 v2.13.0/go.mod h1:Z/fvTZXF8/uw7Xu5GuslPw+bplx6SS338j1Is2S+B7A=
140140
github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
141141
github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
142-
github.com/grafana/dskit v0.0.0-20240801171758-736c44c85382 h1:hcVxOw584ov31MyEAuNNGjrj4vPZX626F39zuOtWQs0=
143-
github.com/grafana/dskit v0.0.0-20240801171758-736c44c85382/go.mod h1:lcjGB6SuaZ2o44A9nD6p/tR4QXSPbzViRY520Gy6pTQ=
142+
github.com/grafana/dskit v0.0.0-20241115082728-f2a7eb3aa0e9 h1:Dx7+6aU/fhwD2vkMr0PUcyxGat1sjUssHAKQKaS7sDM=
143+
github.com/grafana/dskit v0.0.0-20241115082728-f2a7eb3aa0e9/go.mod h1:SPLNCARd4xdjCkue0O6hvuoveuS1dGJjDnfxYe405YQ=
144144
github.com/grafana/gomemcache v0.0.0-20240229205252-cd6a66d6fb56 h1:X8IKQ0wu40wpvYcKfBcc5T4QnhdQjUhtUtB/1CY89lE=
145145
github.com/grafana/gomemcache v0.0.0-20240229205252-cd6a66d6fb56/go.mod h1:PGk3RjYHpxMM8HFPhKKo+vve3DdlPUELZLSDEFehPuU=
146146
github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKtUuKQbJqgAIjlnicKg=

‎cmd/tempo-serverless/lambda/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ require (
5353
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
5454
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
5555
github.com/gorilla/mux v1.8.1 // indirect
56-
github.com/grafana/dskit v0.0.0-20240801171758-736c44c85382 // indirect
56+
github.com/grafana/dskit v0.0.0-20241115082728-f2a7eb3aa0e9 // indirect
5757
github.com/grafana/gomemcache v0.0.0-20240229205252-cd6a66d6fb56 // indirect
5858
github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect
5959
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect

‎cmd/tempo-serverless/lambda/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ github.com/googleapis/gax-go/v2 v2.13.0 h1:yitjD5f7jQHhyDsnhKEBU52NdvvdSeGzlAnDP
143143
github.com/googleapis/gax-go/v2 v2.13.0/go.mod h1:Z/fvTZXF8/uw7Xu5GuslPw+bplx6SS338j1Is2S+B7A=
144144
github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
145145
github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
146-
github.com/grafana/dskit v0.0.0-20240801171758-736c44c85382 h1:hcVxOw584ov31MyEAuNNGjrj4vPZX626F39zuOtWQs0=
147-
github.com/grafana/dskit v0.0.0-20240801171758-736c44c85382/go.mod h1:lcjGB6SuaZ2o44A9nD6p/tR4QXSPbzViRY520Gy6pTQ=
146+
github.com/grafana/dskit v0.0.0-20241115082728-f2a7eb3aa0e9 h1:Dx7+6aU/fhwD2vkMr0PUcyxGat1sjUssHAKQKaS7sDM=
147+
github.com/grafana/dskit v0.0.0-20241115082728-f2a7eb3aa0e9/go.mod h1:SPLNCARd4xdjCkue0O6hvuoveuS1dGJjDnfxYe405YQ=
148148
github.com/grafana/gomemcache v0.0.0-20240229205252-cd6a66d6fb56 h1:X8IKQ0wu40wpvYcKfBcc5T4QnhdQjUhtUtB/1CY89lE=
149149
github.com/grafana/gomemcache v0.0.0-20240229205252-cd6a66d6fb56/go.mod h1:PGk3RjYHpxMM8HFPhKKo+vve3DdlPUELZLSDEFehPuU=
150150
github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKtUuKQbJqgAIjlnicKg=

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ require (
2525
github.com/google/go-cmp v0.6.0
2626
github.com/google/uuid v1.6.0
2727
github.com/gorilla/mux v1.8.1
28-
github.com/grafana/dskit v0.0.0-20240801171758-736c44c85382
28+
github.com/grafana/dskit v0.0.0-20241115082728-f2a7eb3aa0e9
2929
github.com/grafana/e2e v0.1.1
3030
github.com/hashicorp/go-hclog v1.6.3 // indirect
3131
github.com/hashicorp/go-plugin v1.6.0 // indirect

‎go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,8 @@ github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWm
415415
github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
416416
github.com/grafana/dskit v0.0.0-20240801171758-736c44c85382 h1:hcVxOw584ov31MyEAuNNGjrj4vPZX626F39zuOtWQs0=
417417
github.com/grafana/dskit v0.0.0-20240801171758-736c44c85382/go.mod h1:lcjGB6SuaZ2o44A9nD6p/tR4QXSPbzViRY520Gy6pTQ=
418+
github.com/grafana/dskit v0.0.0-20241115082728-f2a7eb3aa0e9 h1:Dx7+6aU/fhwD2vkMr0PUcyxGat1sjUssHAKQKaS7sDM=
419+
github.com/grafana/dskit v0.0.0-20241115082728-f2a7eb3aa0e9/go.mod h1:SPLNCARd4xdjCkue0O6hvuoveuS1dGJjDnfxYe405YQ=
418420
github.com/grafana/e2e v0.1.1 h1:/b6xcv5BtoBnx8cZnCiey9DbjEc8z7gXHO5edoeRYxc=
419421
github.com/grafana/e2e v0.1.1/go.mod h1:RpNLgae5VT+BUHvPE+/zSypmOXKwEu4t+tnEMS1ATaE=
420422
github.com/grafana/gomemcache v0.0.0-20240229205252-cd6a66d6fb56 h1:X8IKQ0wu40wpvYcKfBcc5T4QnhdQjUhtUtB/1CY89lE=

‎modules/distributor/distributor_test.go‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"context"
66
"encoding/hex"
77
"encoding/json"
8+
"errors"
89
"flag"
910
"fmt"
1011
"maps"
@@ -1082,11 +1083,12 @@ func TestLogDiscardedSpansWhenContextCancelled(t *testing.T) {
10821083
}
10831084

10841085
traces := batchesToTraces(t, tc.batches)
1085-
ctx, cancelFunc := context.WithCancel(ctx)
1086-
cancelFunc() // cancel to force all spans to be discarded
1086+
ctx, cancelFunc := context.WithCancelCause(ctx)
1087+
cause := errors.New("test cause")
1088+
cancelFunc(cause) // cancel to force all spans to be discarded
10871089

10881090
_, err := d.PushTraces(ctx, traces)
1089-
assert.ErrorContains(t, err, "context canceled")
1091+
assert.Equal(t, cause, err)
10901092

10911093
assert.ElementsMatch(t, tc.expectedLogsSpan, actualLogSpan(t, buf))
10921094
})
@@ -1664,6 +1666,14 @@ type mockRing struct {
16641666
replicationFactor uint32
16651667
}
16661668

1669+
func (r mockRing) WritableInstancesWithTokensCount() int {
1670+
panic("implement me if required for testing")
1671+
}
1672+
1673+
func (r mockRing) WritableInstancesWithTokensInZoneCount(string) int {
1674+
panic("implement me if required for testing")
1675+
}
1676+
16671677
var _ ring.ReadRing = (*mockRing)(nil)
16681678

16691679
func (r mockRing) Get(key uint32, _ ring.Operation, buf []ring.InstanceDesc, _, _ []string) (ring.ReplicationSet, error) {

‎vendor/github.com/grafana/dskit/concurrency/runner.go‎

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/grafana/dskit/concurrency/worker.go‎

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

0 commit comments

Comments
 (0)