Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

👋 So long vParquet1, and thanks for all the fish! #3663

Merged
merged 2 commits into from
May 9, 2024
Merged

👋 So long vParquet1, and thanks for all the fish! #3663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebe7925
good bye vParquet!
mdisibio May 9, 2024
854616c
changelog
mdisibio May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@
`metrics-generator` statefulsets may need to be `chown`'d in order to start
properly. A jsonnet example of an init container is included with the PR.
This impacts impacts all users of the `grafana/tempo` Docker image.
* [CHANGE] Remove vParquet encoding [#3663](https://github.com/grafana/tempo/pull/3663) (@mdisibio)
**BREAKING CHANGE** In the last release vParquet (the first version) was deprecated and blocked from writes. Now it is
removed entirely. It will no longer be recognized as a valid encoding and cannot read any remaining vParquet blocks. Installations
running with historical defaults should not require any changes as the default has been migrated for several releases. Installations
with storage settings pinned to vParquet must run a previous release configured for vParquet2 or higher until all existing vParquet (1) blocks
have expired and been deleted from the backend, or else will encounter read errors after upgrading to this release.
* [CHANGE] Return a less confusing error message to the client when refusing spans due to ingestion rates. [#3485](https://github.com/grafana/tempo/pull/3485) (@ie-pham)
* [CHANGE] Clean Metrics Generator's Prometheus wal before creating instance [#3548](https://github.com/grafana/tempo/pull/3548) (@ie-pham)
* [CHANGE] Update docker examples for permissions, deprecations, and clean-up [#3603](https://github.com/grafana/tempo/pull/3603) (@zalegrala)
Expand Down
21 changes: 0 additions & 21 deletions cmd/tempo-cli/cmd-analyse-block.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
pq "github.com/grafana/tempo/pkg/parquetquery"
"github.com/stoewer/parquet-cli/pkg/inspect"

"github.com/grafana/tempo/tempodb/encoding/vparquet"
"github.com/grafana/tempo/tempodb/encoding/vparquet2"
"github.com/grafana/tempo/tempodb/encoding/vparquet3"

Expand All @@ -27,20 +26,6 @@ import (
)

var (
vparquetSpanAttrs = []string{
vparquet.FieldSpanAttrVal,
// TODO: Dedicated columns only support 'string' values. We need to add support for other types
// vparquet.FieldSpanAttrValInt,
// vparquet.FieldSpanAttrValDouble,
// vparquet.FieldSpanAttrValBool,
}
vparquetResourceAttrs = []string{
vparquet.FieldResourceAttrVal,
// TODO: Dedicated columns only support 'string' values. We need to add support for other types
// vparquet.FieldResourceAttrValInt,
// vparquet.FieldResourceAttrValDouble,
// vparquet.FieldResourceAttrValBool,
}
vparquet2SpanAttrs = []string{
vparquet2.FieldSpanAttrVal,
}
Expand All @@ -57,8 +42,6 @@ var (

func spanPathsForVersion(v string) (string, []string) {
switch v {
case vparquet.VersionString:
return vparquet.FieldSpanAttrKey, vparquetSpanAttrs
case vparquet2.VersionString:
return vparquet2.FieldSpanAttrKey, vparquet2SpanAttrs
case vparquet3.VersionString:
Expand All @@ -69,8 +52,6 @@ func spanPathsForVersion(v string) (string, []string) {

func resourcePathsForVersion(v string) (string, []string) {
switch v {
case vparquet.VersionString:
return vparquet.FieldResourceAttrKey, vparquetResourceAttrs
case vparquet2.VersionString:
return vparquet2.FieldResourceAttrKey, vparquet2ResourceAttrs
case vparquet3.VersionString:
Expand Down Expand Up @@ -138,8 +119,6 @@ func processBlock(r backend.Reader, tenantID, blockID string, maxStartTime, minS

var reader io.ReaderAt
switch meta.Version {
case vparquet.VersionString:
reader = vparquet.NewBackendReaderAt(context.Background(), r, vparquet.DataFileName, meta)
case vparquet2.VersionString:
reader = vparquet2.NewBackendReaderAt(context.Background(), r, vparquet2.DataFileName, meta)
case vparquet3.VersionString:
Expand Down
62 changes: 0 additions & 62 deletions cmd/tempo-cli/cmd-convert-block.go
View file
Open in desktop

This file was deleted.

228 changes: 0 additions & 228 deletions cmd/tempo-cli/cmd-convert-parquet-1to2.go
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions cmd/tempo-cli/cmd-list-column.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/parquet-go/parquet-go"

pq "github.com/grafana/tempo/pkg/parquetquery"
"github.com/grafana/tempo/tempodb/encoding/vparquet"
"github.com/grafana/tempo/tempodb/encoding/vparquet3"
)

type listColumnCmd struct {
Expand All @@ -32,7 +32,7 @@ func (cmd *listColumnCmd) Run(ctx *globalOptions) error {
return err
}

rr := vparquet.NewBackendReaderAt(context.Background(), r, vparquet.DataFileName, meta)
rr := vparquet3.NewBackendReaderAt(context.Background(), r, vparquet3.DataFileName, meta)
pf, err := parquet.OpenFile(rr, int64(meta.Size))
if err != nil {
return err
Expand Down
4 changes: 2 additions & 2 deletions cmd/tempo-cli/cmd-view-pq-schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"sort"

"github.com/google/uuid"
"github.com/grafana/tempo/tempodb/encoding/vparquet"
"github.com/grafana/tempo/tempodb/encoding/vparquet3"
"github.com/parquet-go/parquet-go"
)

Expand Down Expand Up @@ -36,7 +36,7 @@ func (cmd *viewSchemaCmd) Run(ctx *globalOptions) error {
fmt.Printf("\n*************** block meta *********************\n\n\n")
fmt.Printf("%+v\n", meta)

rr := vparquet.NewBackendReaderAt(context.Background(), r, vparquet.DataFileName, meta)
rr := vparquet3.NewBackendReaderAt(context.Background(), r, vparquet3.DataFileName, meta)
pf, err := parquet.OpenFile(rr, int64(meta.Size))
if err != nil {
return err
Expand Down
Loading
Loading