This commit is contained in:
Junang Li 2024-09-11 17:10:21 -04:00
parent 4c15750193
commit 3139af2378
4 changed files with 18 additions and 8 deletions

Binary file not shown.

View file

@ -159,7 +159,7 @@ func TestWriteV2RequestFixture(t *testing.T) {
Symbols: st.Symbols(),
}
// Check if it matches static writeV2RequestFixture.
require.Equal(t, expected, writeV2RequestFixture)
require.True(t, proto.Equal(expected, writeV2RequestFixture))
}
func TestValidateLabelsAndMetricName(t *testing.T) {
@ -588,7 +588,7 @@ func TestDecodeWriteV2Request(t *testing.T) {
actual, err := DecodeWriteV2Request(bytes.NewReader(buf))
require.NoError(t, err)
require.Equal(t, writeV2RequestFixture, actual)
require.True(t, proto.Equal(writeV2RequestFixture, actual))
}
func TestStreamResponse(t *testing.T) {
@ -931,7 +931,7 @@ func TestChunkedSeriesSet(t *testing.T) {
res := ss.Next()
require.False(t, res)
require.ErrorContains(t, ss.Err(), "proto: illegal wireType 7")
require.ErrorContains(t, ss.Err(), "cannot parse invalid wire-format data")
})
}

View file

@ -31,7 +31,6 @@ import (
"github.com/go-kit/log"
"github.com/golang/protobuf/proto"
"github.com/golang/snappy"
"github.com/google/go-cmp/cmp"
"github.com/prometheus/client_golang/prometheus"
client_testutil "github.com/prometheus/client_golang/prometheus/testutil"
"github.com/prometheus/common/model"
@ -1225,6 +1224,7 @@ func v2RequestToWriteRequest(v2Req *writev2.Request) (*prompb.WriteRequest, erro
req.Timeseries[i].Samples = make([]*prompb.Sample, len(rts.Samples))
for j, s := range rts.Samples {
req.Timeseries[i].Samples[j] = &prompb.Sample{}
req.Timeseries[i].Samples[j].Timestamp = s.Timestamp
req.Timeseries[i].Samples[j].Value = s.Value
}
@ -1913,6 +1913,7 @@ func BenchmarkBuildV2WriteRequest(b *testing.B) {
buff := make([]byte, 0)
seriesBuff := make([]*writev2.TimeSeries, len(tc.batch))
for i := range seriesBuff {
seriesBuff[i] = &writev2.TimeSeries{}
seriesBuff[i].Samples = []*writev2.Sample{{}}
seriesBuff[i].Exemplars = []*writev2.Exemplar{{}}
}
@ -2030,9 +2031,15 @@ func TestSendSamplesWithBackoffWithSampleAgeLimit(t *testing.T) {
appendData(5, timeShift, false)
m.Stop()
if diff := cmp.Diff(expectedSamples, c.receivedSamples); diff != "" {
t.Errorf("mismatch (-want +got):\n%s", diff)
for tsID, samples := range expectedSamples {
for i, _ := range samples {
require.True(t, proto.Equal(samples[i], c.receivedSamples[tsID][i]))
}
}
//if diff := cmp.Diff(expectedSamples, c.receivedSamples); diff != "" {
// t.Errorf("mismatch (-want +got):\n%s", diff)
//}
}
func createTimeseriesWithRandomLabelCount(id string, seriesCount int, timeAdd time.Duration, maxLabels int) ([]record.RefSample, []record.RefSeries) {

View file

@ -293,7 +293,7 @@ func TestStreamReadEndpoint(t *testing.T) {
require.Len(t, results, 6, "Expected 6 results.")
require.Equal(t, []*prompb.ChunkedReadResponse{
expected := []*prompb.ChunkedReadResponse{
{
ChunkedSeries: []*prompb.ChunkedSeries{
{
@ -428,7 +428,10 @@ func TestStreamReadEndpoint(t *testing.T) {
},
QueryIndex: 2,
},
}, results)
}
for i, _ := range expected {
require.True(t, proto.Equal(expected[i], results[i]))
}
}
func addNativeHistogramsToTestSuite(t *testing.T, storage *teststorage.TestStorage, n int) {