remove further custom type references for LabelAdapter

grafana · Jan 2, 2025 · 764c9f6 · 764c9f6
1 parent 823590d
commit 764c9f6
Show file tree

Hide file tree

Showing 8 changed files with 407 additions and 308 deletions.
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
@@ -39,7 +39,7 @@ message PrometheusData {
 }
 
 message SampleStream {
-  repeated cortexpb_custom.LabelAdapter labels = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "metric", (gogoproto.customtype) = "github.com/grafana/mimir/pkg/mimirpb_custom.LabelAdapter"];
+  repeated cortexpb_custom.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/ruler/ruler.pb.go b/pkg/ruler/ruler.pb.go
diff --git a/pkg/ruler/ruler.proto b/pkg/ruler/ruler.proto
@@ -78,12 +78,10 @@ message RuleStateDesc {
 message AlertStateDesc {
   string state = 1;
   repeated cortexpb_custom.LabelAdapter labels = 2 [
-    (gogoproto.nullable) = false,
-    (gogoproto.customtype) = "github.com/grafana/mimir/pkg/mimirpb_custom.LabelAdapter"
+    (gogoproto.nullable) = false
   ];
   repeated cortexpb_custom.LabelAdapter annotations = 3 [
-    (gogoproto.nullable) = false,
-    (gogoproto.customtype) = "github.com/grafana/mimir/pkg/mimirpb_custom.LabelAdapter"
+    (gogoproto.nullable) = false
   ];
   double value = 4;
   google.protobuf.Timestamp active_at = 5

diff --git a/pkg/ruler/rulespb/rules.pb.go b/pkg/ruler/rulespb/rules.pb.go
diff --git a/pkg/ruler/rulespb/rules.proto b/pkg/ruler/rulespb/rules.proto
@@ -49,11 +49,9 @@ message RuleDesc {
   google.protobuf.Duration for = 4 [(gogoproto.nullable) = false,(gogoproto.stdduration) = true];
   google.protobuf.Duration keep_firing_for = 13 [(gogoproto.nullable) = false,(gogoproto.stdduration) = true];
   repeated cortexpb_custom.LabelAdapter labels = 5 [
-    (gogoproto.nullable) = false,
-    (gogoproto.customtype) = "github.com/grafana/mimir/pkg/mimirpb_custom.LabelAdapter"
+    (gogoproto.nullable) = false
   ];
   repeated cortexpb_custom.LabelAdapter annotations = 6 [
-    (gogoproto.nullable) = false,
-    (gogoproto.customtype) = "github.com/grafana/mimir/pkg/mimirpb_custom.LabelAdapter"
+    (gogoproto.nullable) = false
   ];
 }