From 54edb2143f9dbf8280e1cfa1c8efbfef1bb3e5bb Mon Sep 17 00:00:00 2001
From: Salva Corts <salva.corts@grafana.com>
Date: Fri, 10 Nov 2023 16:50:07 +0100
Subject: [PATCH] Followups #11154 (#11204)

Addressing comments from #11154 after it was merged
---
 pkg/bloomcompactor/bloomcompactor.go |  2 +-
 pkg/bloomcompactor/job.go            | 20 ++++++++++++--------
 pkg/bloomcompactor/metrics.go        |  4 ++--
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkg/bloomcompactor/bloomcompactor.go b/pkg/bloomcompactor/bloomcompactor.go
index f7bcd5df40..b517957833 100644
--- a/pkg/bloomcompactor/bloomcompactor.go
+++ b/pkg/bloomcompactor/bloomcompactor.go
@@ -197,7 +197,7 @@ func (c *Compactor) running(ctx context.Context) error {
 		case <-ticker.C:
 			c.metrics.compactionRunsStarted.Inc()
 			if err := c.runCompaction(ctx); err != nil {
-				c.metrics.compactionRunsErred.Inc()
+				c.metrics.compactionRunsFailed.Inc()
 				level.Error(c.logger).Log("msg", "failed to run compaction", "err", err)
 				continue
 			}
diff --git a/pkg/bloomcompactor/job.go b/pkg/bloomcompactor/job.go
index 5257be9709..3084b7db7c 100644
--- a/pkg/bloomcompactor/job.go
+++ b/pkg/bloomcompactor/job.go
@@ -13,8 +13,8 @@ type Job struct {
 	seriesFP                       model.Fingerprint
 	chunks                         []index.ChunkMeta
 
-	// We compute them lazily.
-	from, through *model.Time
+	// We compute them lazily. Unset value is 0.
+	from, through model.Time
 }
 
 // NewJob returns a new compaction Job.
@@ -65,20 +65,24 @@ func (j *Job) IndexPath() string {
 }
 
 func (j *Job) From() model.Time {
-	if j.from == nil {
+	if j.from == 0 {
 		j.computeFromThrough()
 	}
-	return *j.from
+	return j.from
 }
 
 func (j *Job) Through() model.Time {
-	if j.through == nil {
+	if j.through == 0 {
 		j.computeFromThrough()
 	}
-	return *j.through
+	return j.through
 }
 
 func (j *Job) computeFromThrough() {
+	if len(j.chunks) == 0 {
+		return
+	}
+
 	minFrom := model.Latest
 	maxThrough := model.Earliest
 
@@ -92,6 +96,6 @@ func (j *Job) computeFromThrough() {
 		}
 	}
 
-	j.from = &minFrom
-	j.through = &maxThrough
+	j.from = minFrom
+	j.through = maxThrough
 }
diff --git a/pkg/bloomcompactor/metrics.go b/pkg/bloomcompactor/metrics.go
index 0d8ed23c54..9baa7128d2 100644
--- a/pkg/bloomcompactor/metrics.go
+++ b/pkg/bloomcompactor/metrics.go
@@ -13,7 +13,7 @@ const (
 type metrics struct {
 	compactionRunsStarted          prometheus.Counter
 	compactionRunsCompleted        prometheus.Counter
-	compactionRunsErred            prometheus.Counter
+	compactionRunsFailed           prometheus.Counter
 	compactionRunDiscoveredTenants prometheus.Counter
 	compactionRunSkippedTenants    prometheus.Counter
 	compactionRunSucceededTenants  prometheus.Counter
@@ -39,7 +39,7 @@ func newMetrics(r prometheus.Registerer) *metrics {
 			Name:      "runs_completed_total",
 			Help:      "Total number of compactions completed successfully",
 		}),
-		compactionRunsErred: promauto.With(r).NewCounter(prometheus.CounterOpts{
+		compactionRunsFailed: promauto.With(r).NewCounter(prometheus.CounterOpts{
 			Namespace: metricsNamespace,
 			Subsystem: metricsSubsystem,
 			Name:      "runs_failed_total",