Remove Thanos ZLabel type in favour of identical LabelAdapter type #3345
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 tasks
colega
reviewed
Oct 31, 2022
| @@ -31,7 +31,7 @@ message Chunk { | |||
| } | |||
|
|
|||
| message Series { | |||
| repeated Label labels = 1 [(gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/grafana/mimir/pkg/storegateway/labelpb.ZLabel"]; | |||
| repeated cortexpb.LabelPair labels = 1 [(gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/grafana/mimir/pkg/mimirpb.LabelAdapter"]; | |||
There was a problem hiding this comment.
Why do we need the change here to cortexpb.LabelPair?
There was a problem hiding this comment.
Because I deleted Label.
There was a problem hiding this comment.
Oh it was in types.proto. Sorry I missed that one.
There was a problem hiding this comment.
So the proto will unmarshal even if the type name is different? In that case, should we create a task to rename cortexpb to mimirpb?
There was a problem hiding this comment.
I added more info to the PR description.
colega
approved these changes
Oct 31, 2022
The implementations are identical.
Avoid having two names for the same thing.
So everything compiles and lint errors go away.
masonmei
pushed a commit
to udmire/mimir
that referenced
this pull request
Nov 4, 2022
…rafana#3345) * labelpb: remove unused LabelSet type * Replace ZLabel with alias to LabelAdapter The implementations are identical. * Remove unused storegateway/prompb * storegateway: convert uses of ZLabel to LabelAdapter Avoid having two names for the same thing. * go mod tidy: xxhash dependency is now indirect * Make imports of gogo.proto consistent So everything compiles and lint errors go away.
masonmei
pushed a commit
to udmire/mimir
that referenced
this pull request
Nov 4, 2022
…rafana#3345) * labelpb: remove unused LabelSet type * Replace ZLabel with alias to LabelAdapter The implementations are identical. * Remove unused storegateway/prompb * storegateway: convert uses of ZLabel to LabelAdapter Avoid having two names for the same thing. * go mod tidy: xxhash dependency is now indirect * Make imports of gogo.proto consistent So everything compiles and lint errors go away.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This code was brought in with #3222, but exactly duplicated code we already had, except for the name.
(
LabelAdapterisn't a hugely descriptive name, but it was widely used already)All the types in
storegateway/labelpbwere removed:Label,LabelSetandZLabelSet; the last two were entirely unused in Mimir.Labelwas equivalent toLabelPairin Mimir, albeit usingstringinstead ofbytestype. According to here these are identical on the wire, butstringshould only contain valid UTF-8 data. (This is not checked in Go).Checklist
CHANGELOG.mdupdated - not user-facing