Skip to content

Commit bedecd2

Browse files
joe-elliottstoewer
joe-elliott
and
stoewer
authored
Update parquet-go dependency (#3068) (#3076)
* Update parquet-go dependency Among other changes the parquet-go update contains a fix that avoids blocks with overflows in the uncompressed page size * Update CHANGELOG.md (cherry picked from commit 419288d) Co-authored-by: A. Stoewer <[email protected]>
1 parent c7aad36 commit bedecd2

File tree

15 files changed

+95
-16
lines changed

15 files changed

+95
-16
lines changed

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ defaults:
8888
* [BUGFIX] Fix issue where ingester doesn't stop query after timeout [#3031](https://github.com/grafana/tempo/pull/3031) (@mdisibio)
8989
* [BUGFIX] Fix cases where empty filter {} wouldn't return expected results [#2498](https://github.com/grafana/tempo/issues/2498) (@mdisibio)
9090
* [BUGFIX] Reorder S3 credential chain and upgrade minio-go. `native_aws_auth_enabled` is deprecated [#3006](https://github.com/grafana/tempo/pull/3006) (@ekristen, @mapno)
91+
* [BUGFIX] Update parquet-go dependency including a bugfix that prevents corrupted blocks from being written [#3068](https://github.com/grafana/tempo/pull/3068) (@stoewer)
9192

9293
# v2.2.3 / 2023-09-13
9394

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ require (
9494
github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e // indirect
9595
github.com/opentracing-contrib/go-stdlib v1.0.0 // indirect
9696
github.com/opentracing/opentracing-go v1.2.0 // indirect
97-
github.com/parquet-go/parquet-go v0.18.1-0.20231002172823-4b0ea5ed3565 // indirect
97+
github.com/parquet-go/parquet-go v0.18.1-0.20231023162157-1748e4b3ff04 // indirect
9898
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
9999
github.com/pierrec/lz4/v4 v4.1.18 // indirect
100100
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -763,8 +763,8 @@ github.com/opentracing-contrib/go-stdlib v1.0.0/go.mod h1:qtI1ogk+2JhVPIXVc6q+NH
763763
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
764764
github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
765765
github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
766-
github.com/parquet-go/parquet-go v0.18.1-0.20231002172823-4b0ea5ed3565 h1:F0rZ3iHuqpF/IVbGvnMulL+H9Yy6OjB/zbvIwOCdtx8=
767-
github.com/parquet-go/parquet-go v0.18.1-0.20231002172823-4b0ea5ed3565/go.mod h1:6pu/Ca02WRyWyF6jbY1KceESGBZMsRMSijjLbajXaG8=
766+
github.com/parquet-go/parquet-go v0.18.1-0.20231023162157-1748e4b3ff04 h1:v5xe/XduDhXXcsbidemHvFrfkdDUt5gi5JzsC04lZ2w=
767+
github.com/parquet-go/parquet-go v0.18.1-0.20231023162157-1748e4b3ff04/go.mod h1:6pu/Ca02WRyWyF6jbY1KceESGBZMsRMSijjLbajXaG8=
768768
github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ=
769769
github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4=
770770
github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ=

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ require (
9797
github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e // indirect
9898
github.com/opentracing-contrib/go-stdlib v1.0.0 // indirect
9999
github.com/opentracing/opentracing-go v1.2.0 // indirect
100-
github.com/parquet-go/parquet-go v0.18.1-0.20231002172823-4b0ea5ed3565 // indirect
100+
github.com/parquet-go/parquet-go v0.18.1-0.20231023162157-1748e4b3ff04 // indirect
101101
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
102102
github.com/pierrec/lz4/v4 v4.1.18 // indirect
103103
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -767,8 +767,8 @@ github.com/opentracing-contrib/go-stdlib v1.0.0/go.mod h1:qtI1ogk+2JhVPIXVc6q+NH
767767
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
768768
github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
769769
github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
770-
github.com/parquet-go/parquet-go v0.18.1-0.20231002172823-4b0ea5ed3565 h1:F0rZ3iHuqpF/IVbGvnMulL+H9Yy6OjB/zbvIwOCdtx8=
771-
github.com/parquet-go/parquet-go v0.18.1-0.20231002172823-4b0ea5ed3565/go.mod h1:6pu/Ca02WRyWyF6jbY1KceESGBZMsRMSijjLbajXaG8=
770+
github.com/parquet-go/parquet-go v0.18.1-0.20231023162157-1748e4b3ff04 h1:v5xe/XduDhXXcsbidemHvFrfkdDUt5gi5JzsC04lZ2w=
771+
github.com/parquet-go/parquet-go v0.18.1-0.20231023162157-1748e4b3ff04/go.mod h1:6pu/Ca02WRyWyF6jbY1KceESGBZMsRMSijjLbajXaG8=
772772
github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ=
773773
github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4=
774774
github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ=

‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ require (
109109
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
110110
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.74.0
111111
github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.74.0
112-
github.com/parquet-go/parquet-go v0.18.1-0.20231002172823-4b0ea5ed3565
112+
github.com/parquet-go/parquet-go v0.18.1-0.20231023162157-1748e4b3ff04
113113
github.com/stoewer/parquet-cli v0.0.5
114114
go.opentelemetry.io/collector/config/configgrpc v0.86.0
115115
go.opentelemetry.io/collector/config/confighttp v0.86.0
@@ -121,6 +121,7 @@ require (
121121
go.opentelemetry.io/collector/receiver v0.86.0
122122
golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1
123123
golang.org/x/oauth2 v0.12.0
124+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230717213848-3f92550aa753
124125
)
125126

126127
require (
@@ -316,7 +317,6 @@ require (
316317
google.golang.org/appengine v1.6.7 // indirect
317318
google.golang.org/genproto v0.0.0-20230717213848-3f92550aa753 // indirect
318319
google.golang.org/genproto/googleapis/api v0.0.0-20230717213848-3f92550aa753 // indirect
319-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230717213848-3f92550aa753 // indirect
320320
gopkg.in/ini.v1 v1.67.0 // indirect
321321
)
322322

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1593,8 +1593,8 @@ github.com/openzipkin/zipkin-go v0.4.2 h1:zjqfqHjUpPmB3c1GlCvvgsM1G4LkvqQbBDueDO
15931593
github.com/openzipkin/zipkin-go v0.4.2/go.mod h1:ZeVkFjuuBiSy13y8vpSDCjMi9GoI3hPpCJSBx/EYFhY=
15941594
github.com/ovh/go-ovh v1.4.1 h1:VBGa5wMyQtTP7Zb+w97zRCh9sLtM/2YKRyy+MEJmWaM=
15951595
github.com/ovh/go-ovh v1.4.1/go.mod h1:6bL6pPyUT7tBfI0pqOegJgRjgjuO+mOo+MyXd1EEC0M=
1596-
github.com/parquet-go/parquet-go v0.18.1-0.20231002172823-4b0ea5ed3565 h1:F0rZ3iHuqpF/IVbGvnMulL+H9Yy6OjB/zbvIwOCdtx8=
1597-
github.com/parquet-go/parquet-go v0.18.1-0.20231002172823-4b0ea5ed3565/go.mod h1:6pu/Ca02WRyWyF6jbY1KceESGBZMsRMSijjLbajXaG8=
1596+
github.com/parquet-go/parquet-go v0.18.1-0.20231023162157-1748e4b3ff04 h1:v5xe/XduDhXXcsbidemHvFrfkdDUt5gi5JzsC04lZ2w=
1597+
github.com/parquet-go/parquet-go v0.18.1-0.20231023162157-1748e4b3ff04/go.mod h1:6pu/Ca02WRyWyF6jbY1KceESGBZMsRMSijjLbajXaG8=
15981598
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
15991599
github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
16001600
github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=

‎vendor/github.com/parquet-go/parquet-go/README.md

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/parquet-go/parquet-go/column.go

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/parquet-go/parquet-go/merge.go

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/parquet-go/parquet-go/node.go

+20
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/parquet-go/parquet-go/print.go

+10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/parquet-go/parquet-go/schema.go

+31-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/parquet-go/parquet-go/writer.go

+14-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -951,7 +951,7 @@ github.com/opentracing/opentracing-go/log
951951
github.com/openzipkin/zipkin-go/model
952952
github.com/openzipkin/zipkin-go/proto/zipkin_proto3
953953
github.com/openzipkin/zipkin-go/reporter
954-
# github.com/parquet-go/parquet-go v0.18.1-0.20231002172823-4b0ea5ed3565
954+
# github.com/parquet-go/parquet-go v0.18.1-0.20231023162157-1748e4b3ff04
955955
## explicit; go 1.20
956956
github.com/parquet-go/parquet-go
957957
github.com/parquet-go/parquet-go/bloom

0 commit comments

Comments
 (0)