[proto] Annotate timeseries field of WriteRequest as non-nullable (#2025

)

src/query/api/v1/handler/prometheus/remote/test/write.go

@@ -37,7 +37,7 @@ import (
 // write request.
 func GeneratePromWriteRequest() *prompb.WriteRequest {
 	req := &prompb.WriteRequest{
-		Timeseries: []*prompb.TimeSeries{{
+		Timeseries: []prompb.TimeSeries{{
 			Labels: []prompb.Label{
 				{Name: []byte("__name__"), Value: []byte("first")},
 				{Name: []byte("foo"), Value: []byte("bar")},

src/query/api/v1/handler/prometheus/remote/write.go

@@ -447,7 +447,7 @@ func (h *PromWriteHandler) forward(
 	return nil
 }
 
-func newPromTSIter(timeseries []*prompb.TimeSeries, tagOpts models.TagOptions) *promTSIter {
+func newPromTSIter(timeseries []prompb.TimeSeries, tagOpts models.TagOptions) *promTSIter {
 	// Construct the tags and datapoints upfront so that if the iterator
 	// is reset, we don't have to generate them twice.
 	var (

src/query/benchmark/benchmarker/main/convert_to_prom.go

@@ -112,7 +112,7 @@ func convertToProm(fromFile, dir, toFile string, workers int, batchSize int, log
 			if err != nil {
 				return 0, err
 			}
-			series := make([]*prompb.TimeSeries, 0, batchSize)
+			series := make([]prompb.TimeSeries, 0, batchSize)
 
 			for line := 0; line < batchSize; line++ {
 				if scanner.Scan() {
@@ -139,7 +139,7 @@ func convertToProm(fromFile, dir, toFile string, workers int, batchSize int, log
 	return lines, nil
 }
 
-func encodeWriteRequest(ts []*prompb.TimeSeries) []byte {
+func encodeWriteRequest(ts []prompb.TimeSeries) []byte {
 	req := &prompb.WriteRequest{
 		Timeseries: ts,
 	}
@@ -155,11 +155,11 @@ type metrics struct {
 	Value float64           `json:"value"`
 }
 
-func marshalTSDBToProm(opentsdb string) (*prompb.TimeSeries, error) {
+func marshalTSDBToProm(opentsdb string) (prompb.TimeSeries, error) {
 	var m metrics
 	data := []byte(opentsdb)
 	if err := json.Unmarshal(data, &m); err != nil {
-		return nil, err
+		return prompb.TimeSeries{}, err
 	}
 
 	tags := models.EmptyTags()
@@ -169,7 +169,7 @@ func marshalTSDBToProm(opentsdb string) (*prompb.TimeSeries, error) {
 
 	labels := storage.TagsToPromLabels(tags)
 	samples := metricsPointsToSamples(m.Value, m.Time)
-	return &prompb.TimeSeries{
+	return prompb.TimeSeries{
 		Labels:  labels,
 		Samples: samples,
 	}, nil

src/query/benchmark/common/parse_json.go

@@ -169,7 +169,7 @@ func id(lowerCaseTags map[string]string, name string) string {
 	return buffer.String()
 }
 
-func metricsToPromTS(m Metrics) *prompb.TimeSeries {
+func metricsToPromTS(m Metrics) prompb.TimeSeries {
 	tags := models.NewTags(len(m.Tags), nil)
 	for n, v := range m.Tags {
 		tags = tags.AddTagWithoutNormalizing(
@@ -180,14 +180,14 @@ func metricsToPromTS(m Metrics) *prompb.TimeSeries {
 	tags.Normalize()
 	labels := storage.TagsToPromLabels(tags)
 	samples := metricsPointsToSamples(m.Value, m.Time)
-	return &prompb.TimeSeries{
+	return prompb.TimeSeries{
 		Labels:  labels,
 		Samples: samples,
 	}
 }
 
 func marshalTSDBToProm(dataChannel <-chan []byte, metricChannel chan<- *bytes.Reader, batchSize int) {
-	timeseries := make([]*prompb.TimeSeries, batchSize)
+	timeseries := make([]prompb.TimeSeries, batchSize)
 	idx := 0
 	for data := range dataChannel {
 		if len(data) == 0 {
@@ -210,7 +210,7 @@ func marshalTSDBToProm(dataChannel <-chan []byte, metricChannel chan<- *bytes.Re
 	}
 }
 
-func encodeWriteRequest(ts []*prompb.TimeSeries) *bytes.Reader {
+func encodeWriteRequest(ts []prompb.TimeSeries) *bytes.Reader {
 	req := &prompb.WriteRequest{
 		Timeseries: ts,
 	}

src/query/generated/proto/prompb/remote.proto

@@ -5,9 +5,10 @@ package prometheus;
 option go_package = "prompb";
 
 import "github.com/m3db/m3/src/query/generated/proto/prompb/types.proto";
+import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 
 message WriteRequest {
-  repeated prometheus.TimeSeries timeseries = 1;
+  repeated prometheus.TimeSeries timeseries = 1 [(gogoproto.nullable) = false];
 }
 
 message ReadRequest {