Moved common protobuf code to new cortexpb package and introduced `di…

…stributor.Distributor` service name. (grafana#3798) * Moved common protobuf code to new cortexpb package. Created distributorpb package, and moved cortex.IngesterOnlyPush to distributor.Distributor. Signed-off-by: Peter Štibraný <[email protected]> * Comment every deprecated element individually to get warnings for all of them. Signed-off-by: Peter Štibraný <[email protected]> * Ignore lint warnings from deprecated.go. Signed-off-by: Peter Štibraný <[email protected]> * Fix lint warnings. Signed-off-by: Peter Štibraný <[email protected]> * Verify that type alias for cortexpb.Sample uses correct functions for json marshalling. Signed-off-by: Peter Štibraný <[email protected]>
cyriltovena · Feb 15, 2021 · 348d6d3 · 348d6d3
1 parent 84c0916
commit 348d6d3
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 37 deletions.
diff --git a/purger/delete_plan.pb.go b/purger/delete_plan.pb.go
diff --git a/purger/delete_plan.proto b/purger/delete_plan.proto
@@ -5,7 +5,7 @@ package purgeplan;
 option go_package = "purger";
 
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";
-import "github.com/cortexproject/cortex/pkg/ingester/client/cortex.proto";
+import "github.com/cortexproject/cortex/pkg/cortexpb/cortex.proto";
 
 option (gogoproto.marshaler_all) = true;
 option (gogoproto.unmarshaler_all) = true;
@@ -19,7 +19,7 @@ message DeletePlan {
 
 // ChunksGroup holds ChunkDetails and Labels for a group of chunks which have same series ID
 message ChunksGroup {
-  repeated cortex.LabelPair labels = 1 [(gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cortexproject/cortex/pkg/ingester/client.LabelAdapter"];
+  repeated cortexpb.LabelPair labels = 1 [(gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cortexproject/cortex/pkg/cortexpb.LabelAdapter"];
   repeated ChunkDetails chunks = 2 [(gogoproto.nullable) = false];
 }