From 7d73c1d3f80b724a58975b5699a54f181118384a Mon Sep 17 00:00:00 2001 From: Ryan Wu Date: Thu, 27 Mar 2025 19:20:59 +0800 Subject: [PATCH] refactor[discovery, tsdb]: simplify error handling and remove redundant checks (#16328) * refactor: simplify error handling and remove redundant checks Signed-off-by: Ryan Wu * Add the comment for return of reloading blocks failure Co-authored-by: Ayoub Mrini Signed-off-by: Ryan Wu * Add the comment for return of reloading blocks failure Signed-off-by: Ryan Wu --------- Signed-off-by: Ryan Wu Co-authored-by: Ayoub Mrini --- discovery/openstack/loadbalancer.go | 4 ---- discovery/vultr/vultr.go | 5 ----- tsdb/db.go | 7 +++---- tsdb/db_test.go | 4 ++-- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/discovery/openstack/loadbalancer.go b/discovery/openstack/loadbalancer.go index 612c59567e..254b713cdd 100644 --- a/discovery/openstack/loadbalancer.go +++ b/discovery/openstack/loadbalancer.go @@ -189,9 +189,5 @@ func (i *LoadBalancerDiscovery) refresh(ctx context.Context) ([]*targetgroup.Gro tg.Targets = append(tg.Targets, labels) } - if err != nil { - return nil, err - } - return []*targetgroup.Group{tg}, nil } diff --git a/discovery/vultr/vultr.go b/discovery/vultr/vultr.go index 24eebe2938..0ab477438b 100644 --- a/discovery/vultr/vultr.go +++ b/discovery/vultr/vultr.go @@ -16,7 +16,6 @@ package vultr import ( "context" "errors" - "fmt" "log/slog" "net" "net/http" @@ -137,10 +136,6 @@ func NewDiscovery(conf *SDConfig, logger *slog.Logger, metrics discovery.Discove d.client.SetUserAgent(version.PrometheusUserAgent()) - if err != nil { - return nil, fmt.Errorf("error setting up vultr agent: %w", err) - } - d.Discovery = refresh.NewDiscovery( refresh.Options{ Logger: logger, diff --git a/tsdb/db.go b/tsdb/db.go index 1809499855..8abcaf117e 100644 --- a/tsdb/db.go +++ b/tsdb/db.go @@ -2280,10 +2280,9 @@ func (db *DB) CleanTombstones() (err error) { db.logger.Error("failed to delete block after failed `CleanTombstones`", "dir", dir, "err", err) } } - if err != nil { - return fmt.Errorf("reload blocks: %w", err) - } - return nil + + // This should only be reached if an error occurred. + return fmt.Errorf("reload blocks: %w", err) } } return nil diff --git a/tsdb/db_test.go b/tsdb/db_test.go index 371079eb6b..931bc42dda 100644 --- a/tsdb/db_test.go +++ b/tsdb/db_test.go @@ -9104,7 +9104,7 @@ func compareSeries(t require.TestingT, expected, actual map[string][]chunks.Samp require.Equal(t, eS.F(), aS.F(), "sample %d in series %q differs", i, key) case chunkenc.ValHistogram: eH, aH := eS.H(), aS.H() - if aH.CounterResetHint == histogram.UnknownCounterReset && aH.CounterResetHint != histogram.GaugeType { + if aH.CounterResetHint == histogram.UnknownCounterReset { eH = eH.Copy() // It is always safe to set the counter reset hint to UnknownCounterReset eH.CounterResetHint = histogram.UnknownCounterReset @@ -9114,7 +9114,7 @@ func compareSeries(t require.TestingT, expected, actual map[string][]chunks.Samp case chunkenc.ValFloatHistogram: eFH, aFH := eS.FH(), aS.FH() - if aFH.CounterResetHint == histogram.UnknownCounterReset && aFH.CounterResetHint != histogram.GaugeType { + if aFH.CounterResetHint == histogram.UnknownCounterReset { eFH = eFH.Copy() // It is always safe to set the counter reset hint to UnknownCounterReset eFH.CounterResetHint = histogram.UnknownCounterReset