Skip to content

Commit cabb3d2

Browse files
authored
feat: Clean up uploaded blocks in ingesters (#2816)
1 parent ee2b23a commit cabb3d2

File tree

14 files changed

+1158
-990
lines changed

14 files changed

+1158
-990
lines changed

api/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/gorilla/mux v1.8.0
88
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0
99
github.com/prometheus/common v0.44.0
10-
google.golang.org/genproto/googleapis/api v0.0.0-20231012201019-e917dd12ba7a
10+
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17
1111
google.golang.org/grpc v1.59.0
1212
google.golang.org/protobuf v1.31.0
1313
)
@@ -21,9 +21,9 @@ require (
2121
github.com/prometheus/client_golang v1.17.0 // indirect
2222
github.com/prometheus/client_model v0.5.0 // indirect
2323
github.com/prometheus/procfs v0.11.1 // indirect
24-
golang.org/x/net v0.18.0 // indirect
24+
golang.org/x/net v0.19.0 // indirect
2525
golang.org/x/sys v0.15.0 // indirect
2626
golang.org/x/text v0.14.0 // indirect
27-
google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a // indirect
28-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
27+
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
28+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
2929
)

api/go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,20 @@ github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdO
2626
github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY=
2727
github.com/prometheus/procfs v0.11.1 h1:xRC8Iq1yyca5ypa9n1EZnWZkt7dwcoRPQwX/5gwaUuI=
2828
github.com/prometheus/procfs v0.11.1/go.mod h1:eesXgaPo1q7lBpVMoMy0ZOFTth9hBn4W/y0/p/ScXhY=
29-
golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
30-
golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
29+
golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
30+
golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
3131
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
3232
golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
3333
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
3434
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
3535
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
3636
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
37-
google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a h1:fwgW9j3vHirt4ObdHoYNwuO24BEZjSzbh+zPaNWoiY8=
38-
google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:EMfReVxb80Dq1hhioy0sOsY9jCE46YDgHlJ7fWVUWRE=
39-
google.golang.org/genproto/googleapis/api v0.0.0-20231012201019-e917dd12ba7a h1:myvhA4is3vrit1a6NZCWBIwN0kNEnX21DJOJX/NvIfI=
40-
google.golang.org/genproto/googleapis/api v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:SUBoKXbI1Efip18FClrQVGjWcyd0QZd8KkvdP34t7ww=
41-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b h1:ZlWIi1wSK56/8hn4QcBp/j9M7Gt3U/3hZw3mC7vDICo=
42-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:swOH3j0KzcDDgGUWr+SNpyTen5YrXjS3eyPzFYKc6lc=
37+
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 h1:wpZ8pe2x1Q3f2KyT5f8oP/fa9rHAKgFPr/HZdNuS+PQ=
38+
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:J7XzRzVy1+IPwWHZUzoD0IccYZIrXILAQpc+Qy9CMhY=
39+
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 h1:JpwMPBpFN3uKhdaekDpiNlImDdkUAyiJ6ez/uxGaUSo=
40+
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4=
41+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f h1:ultW7fxlIvee4HYrtnaRPon9HpEgFk5zYpmfMgtKB5I=
42+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f/go.mod h1:L9KNLi232K1/xB6f7AlSX692koaRnKaWSR0stBki0Yc=
4343
google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
4444
google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
4545
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=

ebpf/go.mod

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ require (
1616
github.com/pkg/errors v0.9.1
1717
github.com/prometheus/client_golang v1.17.0
1818
github.com/prometheus/common v0.44.0
19-
github.com/prometheus/prometheus v0.48.1
2019
github.com/samber/lo v1.38.1
2120
github.com/stretchr/testify v1.8.4
2221
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
@@ -28,20 +27,20 @@ require (
2827
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2928
github.com/go-logfmt/logfmt v0.6.0 // indirect
3029
github.com/golang/protobuf v1.5.3 // indirect
30+
github.com/google/go-cmp v0.6.0 // indirect
3131
github.com/gorilla/mux v1.8.0 // indirect
32-
github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
3332
github.com/jpillora/backoff v1.0.0 // indirect
3433
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
3534
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
3635
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
3736
github.com/prometheus/client_model v0.5.0 // indirect
3837
github.com/prometheus/procfs v0.11.1 // indirect
3938
github.com/rogpeppe/go-internal v1.11.0 // indirect
40-
golang.org/x/net v0.18.0 // indirect
41-
golang.org/x/oauth2 v0.13.0 // indirect
39+
golang.org/x/net v0.19.0 // indirect
40+
golang.org/x/oauth2 v0.15.0 // indirect
4241
golang.org/x/text v0.14.0 // indirect
4342
google.golang.org/appengine v1.6.7 // indirect
44-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
43+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
4544
google.golang.org/grpc v1.59.0 // indirect
4645
google.golang.org/protobuf v1.31.0 // indirect
4746
gopkg.in/yaml.v2 v2.4.0 // indirect

ebpf/go.sum

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
2828
github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
2929
github.com/grafana/pyroscope/api v0.2.0 h1:TzOxL0s6SiaLEy944ZAKgHcx/JDRJXu4O8ObwkqR6p4=
3030
github.com/grafana/pyroscope/api v0.2.0/go.mod h1:nhH+xai9cYFgs6lMy/+L0pKj0d5yCMwji/QAiQFCP+U=
31-
github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd h1:PpuIBO5P3e9hpqBD0O/HjhShYuM6XE0i/lbE6J94kww=
32-
github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd/go.mod h1:M5qHK+eWfAv8VR/265dIuEpL3fNfeC21tXXp9itM24A=
3331
github.com/hashicorp/golang-lru/v2 v2.0.5 h1:wW7h1TG88eUIJ2i69gaE3uNVtEPIagzhGvHgwfx2Vm4=
3432
github.com/hashicorp/golang-lru/v2 v2.0.5/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
3533
github.com/ianlancetaylor/demangle v0.0.0-20230524184225-eabc099b10ab h1:BA4a7pe6ZTd9F8kXETBoijjFJ/ntaa//1wiH9BZu4zU=
@@ -56,8 +54,6 @@ github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdO
5654
github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY=
5755
github.com/prometheus/procfs v0.11.1 h1:xRC8Iq1yyca5ypa9n1EZnWZkt7dwcoRPQwX/5gwaUuI=
5856
github.com/prometheus/procfs v0.11.1/go.mod h1:eesXgaPo1q7lBpVMoMy0ZOFTth9hBn4W/y0/p/ScXhY=
59-
github.com/prometheus/prometheus v0.48.1 h1:CTszphSNTXkuCG6O0IfpKdHcJkvvnAAE1GbELKS+NFk=
60-
github.com/prometheus/prometheus v0.48.1/go.mod h1:SRw624aMAxTfryAcP8rOjg4S/sHHaetx2lyJJ2nM83g=
6157
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
6258
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
6359
github.com/samber/lo v1.38.1 h1:j2XEAqXKb09Am4ebOg31SpvzUTTs6EN3VfgeLUhPdXM=
@@ -68,10 +64,10 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
6864
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ=
6965
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE=
7066
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
71-
golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
72-
golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
73-
golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY=
74-
golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0=
67+
golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
68+
golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
69+
golang.org/x/oauth2 v0.15.0 h1:s8pnnxNVzjWyrvYdFUQq5llS1PX2zhPXmccZv99h7uQ=
70+
golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM=
7571
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
7672
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
7773
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -83,8 +79,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
8379
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
8480
google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
8581
google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
86-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b h1:ZlWIi1wSK56/8hn4QcBp/j9M7Gt3U/3hZw3mC7vDICo=
87-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:swOH3j0KzcDDgGUWr+SNpyTen5YrXjS3eyPzFYKc6lc=
82+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f h1:ultW7fxlIvee4HYrtnaRPon9HpEgFk5zYpmfMgtKB5I=
83+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f/go.mod h1:L9KNLi232K1/xB6f7AlSX692koaRnKaWSR0stBki0Yc=
8884
google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
8985
google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
9086
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=

go.mod

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
github.com/golang/protobuf v1.5.3
2424
github.com/google/go-cmp v0.6.0
2525
github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98
26-
github.com/google/uuid v1.3.1
26+
github.com/google/uuid v1.4.0
2727
github.com/gorilla/mux v1.8.0
2828
github.com/grafana/agent v0.35.4
2929
github.com/grafana/dskit v0.0.0-20231221015914-de83901bf4d6
@@ -54,6 +54,7 @@ require (
5454
github.com/prometheus/prometheus v1.99.0
5555
github.com/samber/lo v1.38.1
5656
github.com/sirupsen/logrus v1.9.3
57+
github.com/spf13/afero v1.11.0
5758
github.com/stretchr/testify v1.8.4
5859
github.com/thanos-io/objstore v0.0.0-20230727115635-d0c43443ecda
5960
github.com/uber/jaeger-client-go v2.30.0+incompatible
@@ -62,12 +63,12 @@ require (
6263
go.uber.org/atomic v1.11.0
6364
go.uber.org/goleak v1.2.1
6465
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
65-
golang.org/x/net v0.18.0
66+
golang.org/x/net v0.19.0
6667
golang.org/x/sync v0.5.0
6768
golang.org/x/sys v0.15.0
6869
golang.org/x/text v0.14.0
69-
golang.org/x/time v0.3.0
70-
google.golang.org/genproto/googleapis/api v0.0.0-20231012201019-e917dd12ba7a
70+
golang.org/x/time v0.5.0
71+
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17
7172
google.golang.org/grpc v1.59.0
7273
google.golang.org/protobuf v1.31.0
7374
gopkg.in/alecthomas/kingpin.v2 v2.2.6
@@ -76,11 +77,11 @@ require (
7677
)
7778

7879
require (
79-
cloud.google.com/go v0.110.8 // indirect
80-
cloud.google.com/go/compute v1.23.0 // indirect
80+
cloud.google.com/go v0.110.10 // indirect
81+
cloud.google.com/go/compute v1.23.3 // indirect
8182
cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect
82-
cloud.google.com/go/iam v1.1.2 // indirect
83-
cloud.google.com/go/storage v1.31.0 // indirect
83+
cloud.google.com/go/iam v1.1.5 // indirect
84+
cloud.google.com/go/storage v1.35.1 // indirect
8485
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.8.0 // indirect
8586
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 // indirect
8687
github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
@@ -134,7 +135,7 @@ require (
134135
github.com/google/btree v1.1.2 // indirect
135136
github.com/google/go-querystring v1.1.0 // indirect
136137
github.com/google/s2a-go v0.1.7 // indirect
137-
github.com/googleapis/enterprise-certificate-proxy v0.3.1 // indirect
138+
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
138139
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
139140
github.com/hashicorp/consul/api v1.25.1 // indirect
140141
github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -202,14 +203,14 @@ require (
202203
go.uber.org/zap v1.24.0 // indirect
203204
golang.org/x/crypto v0.17.0 // indirect
204205
golang.org/x/mod v0.14.0 // indirect
205-
golang.org/x/oauth2 v0.13.0 // indirect
206+
golang.org/x/oauth2 v0.15.0 // indirect
206207
golang.org/x/term v0.15.0 // indirect
207208
golang.org/x/tools v0.15.0 // indirect
208209
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
209-
google.golang.org/api v0.147.0 // indirect
210+
google.golang.org/api v0.152.0 // indirect
210211
google.golang.org/appengine v1.6.7 // indirect
211-
google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a // indirect
212-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
212+
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
213+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
213214
gopkg.in/ini.v1 v1.67.0 // indirect
214215
gopkg.in/yaml.v2 v2.4.0 // indirect
215216
)

0 commit comments

Comments
 (0)