more cleanup, mostly linting fixes

Signed-off-by: Callum Styan <callumstyan@gmail.com>

storage/remote/codec.go

@@ -976,7 +976,7 @@ func DecodeMinimizedWriteRequestLen(r io.Reader) (*prompb.MinimizedWriteRequestL
 func MinimizedWriteRequestToWriteRequest(redReq *prompb.MinimizedWriteRequest) (*prompb.WriteRequest, error) {
 	req := &prompb.WriteRequest{
 		Timeseries: make([]prompb.TimeSeries, len(redReq.Timeseries)),
-		//Metadata:   redReq.Metadata,
+		// TODO handle metadata?
 	}
 
 	for i, rts := range redReq.Timeseries {

storage/remote/codec_test.go

@@ -77,7 +77,7 @@ var writeRequestFixture = &prompb.WriteRequest{
 // writeRequestMinimizedFixture represents the same request as writeRequestFixture, but using the minimized representation.
 var writeRequestMinimizedFixture = func() *prompb.MinimizedWriteRequest {
 	st := newRwSymbolTable()
-	labels := []uint32{}
+	var labels []uint32
 	for _, s := range []string{
 		"__name__", "test_metric1",
 		"b", "c",
@@ -85,8 +85,8 @@ var writeRequestMinimizedFixture = func() *prompb.MinimizedWriteRequest {
 		"d", "e",
 		"foo", "bar",
 	} {
-		off, len := st.Ref(s)
-		labels = append(labels, off, len)
+		off, length := st.Ref(s)
+		labels = append(labels, off, length)
 	}
 	return &prompb.MinimizedWriteRequest{
 		Timeseries: []prompb.MinimizedTimeSeries{

storage/remote/queue_manager.go

@@ -1524,7 +1524,7 @@ func (s *shards) sendSamples(ctx context.Context, samples []prompb.TimeSeries, s
 	s.updateMetrics(ctx, err, sampleCount, exemplarCount, histogramCount, time.Since(begin))
 }
 
-func (s *shards) sendMinSamples(ctx context.Context, samples []prompb.MinimizedTimeSeries, labels string, sampleCount, exemplarCount, histogramCount int, pBuf *[]byte, buf *[]byte) {
+func (s *shards) sendMinSamples(ctx context.Context, samples []prompb.MinimizedTimeSeries, labels string, sampleCount, exemplarCount, histogramCount int, pBuf, buf *[]byte) {
 	begin := time.Now()
 	// Build the ReducedWriteRequest with no metadata.
 	// Failing to build the write request is non-recoverable, since it will
@@ -1696,20 +1696,7 @@ func populateMinimizedTimeSeriesLen(symbolTable *rwSymbolTable, batch []timeSeri
 				Timestamp: d.timestamp,
 			})
 			nPendingSamples++
-			// TODO: handle all types
-		//case tExemplar:
-		//	l := make([]prompb.LabelRef, 0, d.exemplarLabels.Len())
-		//	d.exemplarLabels.Range(func(el labels.Label) {
-		//		nRef := pool.intern(el.Name)
-		//		vRef := pool.intern(el.Value)
-		//		l = append(l, prompb.LabelRef{NameRef: nRef, ValueRef: vRef})
-		//	})
-		//	pendingData[nPending].Exemplars = append(pendingData[nPending].Exemplars, prompb.ExemplarRef{
-		//		Labels:    l,
-		//		Value:     d.value,
-		//		Timestamp: d.timestamp,
-		//	})
-		//	nPendingExemplars++
+		// TODO: handle all exemplars
 		case tHistogram:
 			pendingData[nPending].Histograms = append(pendingData[nPending].Histograms, HistogramToHistogramProto(d.timestamp, d.histogram))
 			nPendingHistograms++
@@ -1811,7 +1798,7 @@ func buildWriteRequest(samples []prompb.TimeSeries, metadata []prompb.MetricMeta
 		buf = &[]byte{}
 	}
 	compressed := snappy.Encode(*buf, pBuf.Bytes())
-	if n := snappy.MaxEncodedLen(len(pBuf.Bytes())); buf != nil && n > len(*buf) {
+	if n := snappy.MaxEncodedLen(len(pBuf.Bytes())); n > len(*buf) {
 		// grow the buffer for the next time
 		*buf = make([]byte, n)
 	}
@@ -1841,20 +1828,20 @@ func newRwSymbolTable() rwSymbolTable {
 	}
 }
 
-func (r *rwSymbolTable) Ref(str string) (off uint32, leng uint32) {
+func (r *rwSymbolTable) Ref(str string) (uint32, uint32) {
 	if offlen, ok := r.symbolsMap[str]; ok {
 		return offlen.Off, offlen.Len
 	}
-	off, leng = uint32(len(r.symbols)), uint32(len(str))
+	off, length := uint32(len(r.symbols)), uint32(len(str))
 	if int(off) > len(r.symbols) {
 		panic(1)
 	}
 	r.symbols = append(r.symbols, str...)
-	if len(r.symbols) < int(off+leng) {
+	if len(r.symbols) < int(off+length) {
 		panic(2)
 	}
-	r.symbolsMap[str] = offLenPair{off, leng}
-	return
+	r.symbolsMap[str] = offLenPair{off, length}
+	return off, length
 }
 
 func (r *rwSymbolTable) RefLen(str string) uint32 {
@@ -1892,7 +1879,7 @@ func (r *rwSymbolTable) clear() {
 	r.symbols = r.symbols[:0]
 }
 
-func buildMinimizedWriteRequest(samples []prompb.MinimizedTimeSeries, labels string, pBuf *[]byte, buf *[]byte) ([]byte, int64, error) {
+func buildMinimizedWriteRequest(samples []prompb.MinimizedTimeSeries, labels string, pBuf, buf *[]byte) ([]byte, int64, error) {
 	var highest int64
 	for _, ts := range samples {
 		// At the moment we only ever append a TimeSeries with a single sample or exemplar in it.
@@ -1930,7 +1917,7 @@ func buildMinimizedWriteRequest(samples []prompb.MinimizedTimeSeries, labels str
 	}
 
 	compressed := snappy.Encode(*buf, data)
-	if n := snappy.MaxEncodedLen(len(data)); buf != nil && n > len(*buf) {
+	if n := snappy.MaxEncodedLen(len(data)); n > len(*buf) {
 		// grow the buffer for the next time
 		*buf = make([]byte, n)
 	}
@@ -1976,7 +1963,7 @@ func buildMinimizedWriteRequestLen(samples []prompb.MinimizedTimeSeriesLen, labe
 	}
 
 	compressed := snappy.Encode(*buf, pBuf.Bytes())
-	if n := snappy.MaxEncodedLen(len(pBuf.Bytes())); buf != nil && n > len(*buf) {
+	if n := snappy.MaxEncodedLen(len(pBuf.Bytes())); n > len(*buf) {
 		// grow the buffer for the next time
 		*buf = make([]byte, n)
 	}

storage/remote/queue_manager_test.go

@@ -206,7 +206,6 @@ func TestMetadataDelivery(t *testing.T) {
 func TestSampleDeliveryTimeout(t *testing.T) {
 	for _, rwFormat := range []RemoteWriteFormat{Base1, Min32Optimized} {
 		t.Run(fmt.Sprint(rwFormat), func(t *testing.T) {
-			//remoteWrite11 := proto == "1.1"
 			// Let's send one less sample than batch size, and wait the timeout duration
 			n := 9
 			samples, series := createTimeseries(n, n)
@@ -511,7 +510,6 @@ func TestQueueFilledDeadlock(t *testing.T) {
 
 func TestReleaseNoninternedString(t *testing.T) {
 	for _, rwFormat := range []RemoteWriteFormat{Base1, Min32Optimized} {
-
 		t.Run(fmt.Sprint(rwFormat), func(t *testing.T) {
 			cfg := config.DefaultQueueConfig
 			mcfg := config.DefaultMetadataConfig
@@ -1498,9 +1496,9 @@ func BenchmarkBuildMinimizedWriteRequest(b *testing.B) {
 		batch []timeSeries
 	}
 	testCases := []testcase{
-		testcase{createDummyTimeSeries(2)},
-		testcase{createDummyTimeSeries(10)},
-		testcase{createDummyTimeSeries(100)},
+		{createDummyTimeSeries(2)},
+		{createDummyTimeSeries(10)},
+		{createDummyTimeSeries(100)},
 	}
 	for _, tc := range testCases {
 		symbolTable := newRwSymbolTable()

storage/remote/write_handler.go

@@ -353,7 +353,6 @@ func (h *writeHandler) writeMinLen(ctx context.Context, req *prompb.MinimizedWri
 
 		for _, ep := range ts.Exemplars {
 			e := exemplarProtoToExemplar(ep)
-			//e := exemplarRefProtoToExemplar(req.StringSymbolTable, ep)
 			h.appendExemplar(app, e, ls, &outOfOrderExemplarErrs)
 		}
 

storage/remote/write_handler_test.go

@@ -236,53 +236,6 @@ func BenchmarkRemoteWritehandler(b *testing.B) {
 	}
 }
 
-// TODO(npazosmendez): adapt to minimized version
-// func BenchmarkReducedRemoteWriteHandler(b *testing.B) {
-// 	const labelValue = "abcdefg'hijlmn234!@#$%^&*()_+~`\"{}[],./<>?hello0123hiOlá你好Dzieńdobry9Zd8ra765v4stvuyte"
-// 	reqs := []*http.Request{}
-// 	for i := 0; i < b.N; i++ {
-// 		pool := newLookupPool()
-// 		num := strings.Repeat(strconv.Itoa(i), 16)
-// 		buf, _, err := buildReducedWriteRequest([]prompb.ReducedTimeSeries{{
-// 			Labels: []prompb.LabelRef{
-// 				{NameRef: pool.intern("__name__"), ValueRef: pool.intern("test_metric")},
-// 				{NameRef: pool.intern("test_label_name_" + num), ValueRef: pool.intern(labelValue + num)},
-// 			},
-// 			Histograms: []prompb.Histogram{HistogramToHistogramProto(0, &testHistogram)},
-// 		}}, pool.getTable(), nil, nil)
-// 		require.NoError(b, err)
-// 		req, err := http.NewRequest("", "", bytes.NewReader(buf))
-// 		require.NoError(b, err)
-// 		req.Header.Set(RemoteWriteVersionHeader, RemoteWriteVersion11HeaderValue)
-// 		reqs = append(reqs, req)
-// 	}
-
-// TODO(npazosmendez): add benchmarks with realistic scenarios
-//func BenchmarkMin64RemoteWriteHandler(b *testing.B) {
-//	const labelValue = "abcdefg'hijlmn234!@#$%^&*()_+~`\"{}[],./<>?hello0123hiOlá你好Dzieńdobry9Zd8ra765v4stvuyte"
-//	reqs := []*http.Request{}
-//	for i := 0; i < b.N; i++ {
-//		rw := newRwSymbolTable()
-//		num := strings.Repeat(strconv.Itoa(i), 16)
-//		buf, _, err := buildMinimizedWriteRequestFixed64([]prompb.MinimizedTimeSeriesFixed64{{
-//			LabelSymbols: []uint64{
-//				rw.Ref64Packed("__name__"), rw.Ref64Packed("test_metric"),
-//				rw.Ref64Packed("test_label_name_" + num), rw.Ref64Packed(labelValue + num),
-//			},
-//			Histograms: []prompb.Histogram{HistogramToHistogramProto(0, &testHistogram)},
-//		}}, rw.LabelsString(), nil, nil)
-//		require.NoError(b, err)
-//		req, err := http.NewRequest("", "", bytes.NewReader(buf))
-//		require.NoError(b, err)
-//		req.Header.Set(RemoteWriteVersionHeader, RemoteWriteVersion11HeaderValue)
-//		reqs = append(reqs, req)
-//	}
-//
-//	appendable := &mockAppendable{}
-//	// TODO: test with other proto format(s)
-//	handler := NewWriteHandler(log.NewNopLogger(), nil, appendable, Base1)
-//	recorder := httptest.NewRecorder()
-
 func TestCommitErr(t *testing.T) {
 	buf, _, err := buildWriteRequest(writeRequestFixture.Timeseries, nil, nil, nil)
 	require.NoError(t, err)

web/api/v1/errors_test.go

@@ -17,7 +17,6 @@ package v1
 import (
 	"context"
 	"fmt"
-	"github.com/prometheus/prometheus/storage/remote"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -37,6 +36,7 @@ import (
 	"github.com/prometheus/prometheus/rules"
 	"github.com/prometheus/prometheus/scrape"
 	"github.com/prometheus/prometheus/storage"
+	"github.com/prometheus/prometheus/storage/remote"
 	"github.com/prometheus/prometheus/util/annotations"
 )
 

web/web.go

@@ -18,7 +18,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/prometheus/prometheus/storage/remote"
 	"io"
 	stdlog "log"
 	"math"
@@ -59,6 +58,7 @@ import (
 	"github.com/prometheus/prometheus/rules"
 	"github.com/prometheus/prometheus/scrape"
 	"github.com/prometheus/prometheus/storage"
+	"github.com/prometheus/prometheus/storage/remote"
 	"github.com/prometheus/prometheus/template"
 	"github.com/prometheus/prometheus/util/httputil"
 	api_v1 "github.com/prometheus/prometheus/web/api/v1"