update all usages of LabelPair:LabelAdapater

grafana · Dec 27, 2024 · 1363c18 · 1363c18
1 parent 7ce5867
commit 1363c18
Show file tree

Hide file tree

Showing 18 changed files with 666 additions and 520 deletions.
diff --git a/pkg/distributor/distributorpb/distributor.pb.go b/pkg/distributor/distributorpb/distributor.pb.go
diff --git a/pkg/distributor/distributorpb/distributor.proto b/pkg/distributor/distributorpb/distributor.proto
@@ -11,6 +11,7 @@ option go_package = "distributorpb";
 
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 import "github.com/grafana/mimir/pkg/mimirpb/mimir.proto";
+import "github.com/grafana/mimir/pkg/mimirpb/mimir_custom_types.proto";
 
 option (gogoproto.marshaler_all) = true;
 option (gogoproto.unmarshaler_all) = true;

diff --git a/pkg/frontend/querymiddleware/model.pb.go b/pkg/frontend/querymiddleware/model.pb.go
diff --git a/pkg/frontend/querymiddleware/model.proto b/pkg/frontend/querymiddleware/model.proto
@@ -12,6 +12,7 @@ option go_package = "querymiddleware";
 
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 import "github.com/grafana/mimir/pkg/mimirpb/mimir.proto";
+import "github.com/grafana/mimir/pkg/mimirpb/mimir_custom_types.proto";
 import "google/protobuf/any.proto";
 
 option (gogoproto.marshaler_all) = true;
@@ -38,7 +39,7 @@ message PrometheusData {
 }
 
 message SampleStream {
-  repeated cortexpb.LabelPair labels = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "metric", (gogoproto.customtype) = "github.com/grafana/mimir/pkg/mimirpb.LabelAdapter"];
+  repeated cortexpb.LabelAdapter labels = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "metric"];
   repeated cortexpb.Sample samples = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "values"];
   repeated cortexpb.FloatHistogramPair histograms = 3 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "histograms"];
 }

diff --git a/pkg/ingester/client/ingester.pb.go b/pkg/ingester/client/ingester.pb.go
diff --git a/pkg/ingester/client/ingester.proto b/pkg/ingester/client/ingester.proto
@@ -12,6 +12,7 @@ option go_package = "client";
 
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 import "github.com/grafana/mimir/pkg/mimirpb/mimir.proto";
+import "github.com/grafana/mimir/pkg/mimirpb/mimir_custom_types.proto";
 
 option (gogoproto.marshaler_all) = true;
 option (gogoproto.unmarshaler_all) = true;
@@ -123,7 +124,7 @@ message QueryStreamResponse {
 }
 
 message QueryStreamSeries {
-  repeated cortexpb.LabelPair labels = 1 [(gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/grafana/mimir/pkg/mimirpb.LabelAdapter"];
+  repeated cortexpb.LabelAdapter labels = 1 [(gogoproto.nullable) = false];
   int64 chunk_count = 2;
 }
 
@@ -207,7 +208,7 @@ message ActiveSeriesResponse {
 message TimeSeriesChunk {
   string from_ingester_id = 1;
   string user_id = 2;
-  repeated cortexpb.LabelPair labels = 3 [(gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/grafana/mimir/pkg/mimirpb.LabelAdapter"];
+  repeated cortexpb.LabelAdapter labels = 3 [(gogoproto.nullable) = false];
   repeated Chunk chunks = 4 [(gogoproto.nullable) = false];
 }
 

diff --git a/pkg/mimirpb/mimir.proto b/pkg/mimirpb/mimir.proto
@@ -13,7 +13,7 @@ package cortexpb;
 option go_package = "mimirpb";
 
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";
-import "mimir_extra.proto";
+import "github.com/grafana/mimir/pkg/mimirpb/mimir_custom_types.proto";
 
 option (gogoproto.marshaler_all) = true;
 option (gogoproto.unmarshaler_all) = true;

diff --git a/pkg/mimirpb/mimir_extra.proto → pkg/mimirpb/mimir_custom_types.proto b/pkg/mimirpb/mimir_extra.proto → pkg/mimirpb/mimir_custom_types.proto