From 86f0b148704cc49aa5e16cd6b8a2f56d7e709a4a Mon Sep 17 00:00:00 2001 From: sazary Date: Thu, 5 May 2022 19:24:17 +0430 Subject: [PATCH] testutil: Use %w verb wherever we're using an error in fmt.Errorf Signed-off-by: sazary --- prometheus/testutil/testutil.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/prometheus/testutil/testutil.go b/prometheus/testutil/testutil.go index 861f2d550..38da29290 100644 --- a/prometheus/testutil/testutil.go +++ b/prometheus/testutil/testutil.go @@ -124,7 +124,7 @@ func ToFloat64(c prometheus.Collector) float64 { func CollectAndCount(c prometheus.Collector, metricNames ...string) int { reg := prometheus.NewPedanticRegistry() if err := reg.Register(c); err != nil { - panic(fmt.Errorf("registering collector failed: %s", err)) + panic(fmt.Errorf("registering collector failed: %w", err)) } result, err := GatherAndCount(reg, metricNames...) if err != nil { @@ -140,7 +140,7 @@ func CollectAndCount(c prometheus.Collector, metricNames ...string) int { func GatherAndCount(g prometheus.Gatherer, metricNames ...string) (int, error) { got, err := g.Gather() if err != nil { - return 0, fmt.Errorf("gathering metrics failed: %s", err) + return 0, fmt.Errorf("gathering metrics failed: %w", err) } if metricNames != nil { got = filterMetrics(got, metricNames) @@ -159,7 +159,7 @@ func GatherAndCount(g prometheus.Gatherer, metricNames ...string) (int, error) { func ScrapeAndCompare(url string, expected io.Reader, metricNames ...string) error { resp, err := http.Get(url) if err != nil { - return fmt.Errorf("scraping metrics failed: %s", err) + return fmt.Errorf("scraping metrics failed: %w", err) } defer resp.Body.Close() @@ -187,7 +187,7 @@ func ScrapeAndCompare(url string, expected io.Reader, metricNames ...string) err func CollectAndCompare(c prometheus.Collector, expected io.Reader, metricNames ...string) error { reg := prometheus.NewPedanticRegistry() if err := reg.Register(c); err != nil { - return fmt.Errorf("registering collector failed: %s", err) + return fmt.Errorf("registering collector failed: %w", err) } return GatherAndCompare(reg, expected, metricNames...) } @@ -208,7 +208,7 @@ func TransactionalGatherAndCompare(g prometheus.TransactionalGatherer, expected got, done, err := g.Gather() defer done() if err != nil { - return fmt.Errorf("gathering metrics failed: %s", err) + return fmt.Errorf("gathering metrics failed: %w", err) } wanted, err := convertReaderToMetricFamily(expected) @@ -225,7 +225,7 @@ func convertReaderToMetricFamily(reader io.Reader) ([]*dto.MetricFamily, error) var tp expfmt.TextParser notNormalized, err := tp.TextToMetricFamilies(reader) if err != nil { - return nil, fmt.Errorf("converting reader to metric families failed: %s", err) + return nil, fmt.Errorf("converting reader to metric families failed: %w", err) } return internal.NormalizeMetricFamilies(notNormalized), nil @@ -250,13 +250,13 @@ func compare(got, want []*dto.MetricFamily) error { enc := expfmt.NewEncoder(&gotBuf, expfmt.FmtText) for _, mf := range got { if err := enc.Encode(mf); err != nil { - return fmt.Errorf("encoding gathered metrics failed: %s", err) + return fmt.Errorf("encoding gathered metrics failed: %w", err) } } enc = expfmt.NewEncoder(&wantBuf, expfmt.FmtText) for _, mf := range want { if err := enc.Encode(mf); err != nil { - return fmt.Errorf("encoding expected metrics failed: %s", err) + return fmt.Errorf("encoding expected metrics failed: %w", err) } } if diffErr := diff(wantBuf, gotBuf); diffErr != "" {