mirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-09-21 13:51:00 +02:00
Code Issues Projects Releases Wiki Activity

better errors naming and formatting, typo fixes

Browse Source 
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
This commit is contained in:
György Krajcsovits 2025-09-19 09:43:55 +02:00
parent 798bc98bd5
commit ae7a254aa3
No known key found for this signature in database
GPG Key ID: 47A8F9CE80FD7C7F
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
storage/remote/codec.go
View File

@ -472,10 +472,10 @@ func (c *concreteSeriesIterator) Seek(t int64) chunkenc.ValueType {
} }
func validateHistogramSchema(h *prompb.Histogram) error { func validateHistogramSchema(h *prompb.Histogram) error {
if histogram.IsAcceptibleSchema(h.Schema) { if histogram.IsKnownSchema(h.Schema) {
return nil return nil
} }
return histogram.InvalidSchemaError(h.Schema) return histogram.UnknownSchemaError(h.Schema)
} }
func getHistogramValType(h *prompb.Histogram) chunkenc.ValueType { func getHistogramValType(h *prompb.Histogram) chunkenc.ValueType {

9
storage/remote/codec_test.go
View File

@ -570,24 +570,25 @@ func TestConcreteSeriesIterator_InvalidHistogramSamples(t *testing.T) {
require.Equal(t, chunkenc.ValFloat, it.Next()) require.Equal(t, chunkenc.ValFloat, it.Next())
require.Equal(t, chunkenc.ValNone, it.Next()) require.Equal(t, chunkenc.ValNone, it.Next())
require.Error(t, it.Err()) require.Error(t, it.Err())
require.ErrorIs(t, it.Err(), histogram.ErrHistogramsUnknownSchema)
it = series.Iterator(it) it = series.Iterator(it)
require.Equal(t, chunkenc.ValFloat, it.Next()) require.Equal(t, chunkenc.ValFloat, it.Next())
require.Equal(t, chunkenc.ValNone, it.Next()) require.Equal(t, chunkenc.ValNone, it.Next())
require.Error(t, it.Err()) require.ErrorIs(t, it.Err(), histogram.ErrHistogramsUnknownSchema)
it = series.Iterator(it) it = series.Iterator(it)
require.Equal(t, chunkenc.ValNone, it.Seek(1)) require.Equal(t, chunkenc.ValNone, it.Seek(1))
require.Error(t, it.Err()) require.ErrorIs(t, it.Err(), histogram.ErrHistogramsUnknownSchema)
it = series.Iterator(it) it = series.Iterator(it)
require.Equal(t, chunkenc.ValFloat, it.Seek(3)) require.Equal(t, chunkenc.ValFloat, it.Seek(3))
require.Equal(t, chunkenc.ValNone, it.Next()) require.Equal(t, chunkenc.ValNone, it.Next())
require.Error(t, it.Err()) require.ErrorIs(t, it.Err(), histogram.ErrHistogramsUnknownSchema)
it = series.Iterator(it) it = series.Iterator(it)
require.Equal(t, chunkenc.ValNone, it.Seek(4)) require.Equal(t, chunkenc.ValNone, it.Seek(4))
require.Error(t, it.Err()) require.ErrorIs(t, it.Err(), histogram.ErrHistogramsUnknownSchema)
}) })
} }
} }

4
tsdb/chunkenc/float_histogram_test.go
View File

@ -1488,12 +1488,12 @@ func TestFloatHistogramIteratorFailIfSchemaInValid(t *testing.T) {
it := c.Iterator(nil) it := c.Iterator(nil)
require.Equal(t, ValNone, it.Next()) require.Equal(t, ValNone, it.Next())
require.ErrorIs(t, it.Err(), histogram.ErrHistogramsInvalidSchema) require.ErrorIs(t, it.Err(), histogram.ErrHistogramsUnknownSchema)
}) })
} }
} }
func TestFloatHistogramIteratorReduceShema(t *testing.T) { func TestFloatHistogramIteratorReduceSchema(t *testing.T) {
for _, schema := range []int32{9, 52} { for _, schema := range []int32{9, 52} {
t.Run(fmt.Sprintf("schema %d", schema), func(t *testing.T) { t.Run(fmt.Sprintf("schema %d", schema), func(t *testing.T) {
h := &histogram.FloatHistogram{ h := &histogram.FloatHistogram{

4
tsdb/chunkenc/histogram_test.go
View File

@ -1844,12 +1844,12 @@ func TestHistogramIteratorFailIfSchemaInValid(t *testing.T) {
it := c.Iterator(nil) it := c.Iterator(nil)
require.Equal(t, ValNone, it.Next()) require.Equal(t, ValNone, it.Next())
require.ErrorIs(t, it.Err(), histogram.ErrHistogramsInvalidSchema) require.ErrorIs(t, it.Err(), histogram.ErrHistogramsUnknownSchema)
}) })
} }
} }
func TestHistogramIteratorReduceShema(t *testing.T) { func TestHistogramIteratorReduceSchema(t *testing.T) {
for _, schema := range []int32{9, 52} { for _, schema := range []int32{9, 52} {
t.Run(fmt.Sprintf("schema %d", schema), func(t *testing.T) { t.Run(fmt.Sprintf("schema %d", schema), func(t *testing.T) {
h := &histogram.Histogram{ h := &histogram.Histogram{