compactor: Put important compaction logs as info; init object store m…

…etrics.

Signed-off-by: Bartlomiej Plotka <[email protected]>

pkg/compact/compact.go

@@ -690,7 +690,7 @@ func (cg *Group) compact(ctx context.Context, dir string, comp tsdb.Compactor) (
 	if overlappingBlocks {
 		cg.verticalCompactions.Inc()
 	}
-	level.Debug(cg.logger).Log("msg", "compacted blocks",
+	level.Info(cg.logger).Log("msg", "compacted blocks",
 		"blocks", fmt.Sprintf("%v", plan), "duration", time.Since(begin), "overlapping_blocks", overlappingBlocks)
 
 	bdir := filepath.Join(dir, compID.String())
@@ -732,7 +732,7 @@ func (cg *Group) compact(ctx context.Context, dir string, comp tsdb.Compactor) (
 	if err := block.Upload(ctx, cg.logger, cg.bkt, bdir); err != nil {
 		return false, ulid.ULID{}, retry(errors.Wrapf(err, "upload of %s failed", compID))
 	}
-	level.Debug(cg.logger).Log("msg", "uploaded block", "result_block", compID, "duration", time.Since(begin))
+	level.Info(cg.logger).Log("msg", "uploaded block", "result_block", compID, "duration", time.Since(begin))
 
 	// Delete the blocks we just compacted from the group and bucket so they do not get included
 	// into the next planning cycle.

pkg/objstore/objstore.go

@@ -188,6 +188,16 @@ func Exists(ctx context.Context, bkt Bucket, src string) (bool, error) {
 	return true, nil
 }
 
+const (
+	iterOp     = "iter"
+	sizeOp     = "objectsize"
+	getOp      = "get"
+	getRangeOp = "get_range"
+	existsOp   = "exists"
+	uploadOp   = "upload"
+	deleteOp   = "delete"
+)
+
 // BucketWithMetrics takes a bucket and registers metrics with the given registry for
 // operations run against the bucket.
 func BucketWithMetrics(name string, b Bucket, r prometheus.Registerer) Bucket {
@@ -219,6 +229,12 @@ func BucketWithMetrics(name string, b Bucket, r prometheus.Registerer) Bucket {
 	}
 	if r != nil {
 		r.MustRegister(bkt.ops, bkt.opsFailures, bkt.opsDuration, bkt.lastSuccessfullUploadTime)
+		for _, op := range []string{iterOp, sizeOp, getOp, getRangeOp, existsOp, uploadOp, deleteOp} {
+			bkt.ops.WithLabelValues(op)
+			bkt.opsFailures.WithLabelValues(op)
+			bkt.opsDuration.WithLabelValues(op)
+		}
+		bkt.lastSuccessfullUploadTime.WithLabelValues(b.Name())
 	}
 	return bkt
 }
@@ -233,110 +249,98 @@ type metricBucket struct {
 }
 
 func (b *metricBucket) Iter(ctx context.Context, dir string, f func(name string) error) error {
-	const op = "iter"
-
 	err := b.bkt.Iter(ctx, dir, f)
 	if err != nil {
-		b.opsFailures.WithLabelValues(op).Inc()
+		b.opsFailures.WithLabelValues(iterOp).Inc()
 	}
-	b.ops.WithLabelValues(op).Inc()
+	b.ops.WithLabelValues(iterOp).Inc()
 
 	return err
 }
 
 // ObjectSize returns the size of the specified object.
 func (b *metricBucket) ObjectSize(ctx context.Context, name string) (uint64, error) {
-	const op = "objectsize"
-	b.ops.WithLabelValues(op).Inc()
+	b.ops.WithLabelValues(sizeOp).Inc()
 	start := time.Now()
 
 	rc, err := b.bkt.ObjectSize(ctx, name)
 	if err != nil {
-		b.opsFailures.WithLabelValues(op).Inc()
+		b.opsFailures.WithLabelValues(sizeOp).Inc()
 		return 0, err
 	}
-	b.opsDuration.WithLabelValues(op).Observe(time.Since(start).Seconds())
+	b.opsDuration.WithLabelValues(sizeOp).Observe(time.Since(start).Seconds())
 	return rc, nil
 }
 
 func (b *metricBucket) Get(ctx context.Context, name string) (io.ReadCloser, error) {
-	const op = "get"
-	b.ops.WithLabelValues(op).Inc()
+	b.ops.WithLabelValues(getOp).Inc()
 
 	rc, err := b.bkt.Get(ctx, name)
 	if err != nil {
-		b.opsFailures.WithLabelValues(op).Inc()
+		b.opsFailures.WithLabelValues(getOp).Inc()
 		return nil, err
 	}
-	rc = newTimingReadCloser(
+	return newTimingReadCloser(
 		rc,
-		op,
+		getOp,
 		b.opsDuration,
 		b.opsFailures,
-	)
-
-	return rc, nil
+	), nil
 }
 
 func (b *metricBucket) GetRange(ctx context.Context, name string, off, length int64) (io.ReadCloser, error) {
-	const op = "get_range"
-	b.ops.WithLabelValues(op).Inc()
+	b.ops.WithLabelValues(getRangeOp).Inc()
 
 	rc, err := b.bkt.GetRange(ctx, name, off, length)
 	if err != nil {
-		b.opsFailures.WithLabelValues(op).Inc()
+		b.opsFailures.WithLabelValues(getRangeOp).Inc()
 		return nil, err
 	}
-	rc = newTimingReadCloser(
+	return newTimingReadCloser(
 		rc,
-		op,
+		getRangeOp,
 		b.opsDuration,
 		b.opsFailures,
-	)
-
-	return rc, nil
+	), nil
 }
 
 func (b *metricBucket) Exists(ctx context.Context, name string) (bool, error) {
-	const op = "exists"
 	start := time.Now()
 
 	ok, err := b.bkt.Exists(ctx, name)
 	if err != nil {
-		b.opsFailures.WithLabelValues(op).Inc()
+		b.opsFailures.WithLabelValues(existsOp).Inc()
 	}
-	b.ops.WithLabelValues(op).Inc()
-	b.opsDuration.WithLabelValues(op).Observe(time.Since(start).Seconds())
+	b.ops.WithLabelValues(existsOp).Inc()
+	b.opsDuration.WithLabelValues(existsOp).Observe(time.Since(start).Seconds())
 
 	return ok, err
 }
 
 func (b *metricBucket) Upload(ctx context.Context, name string, r io.Reader) error {
-	const op = "upload"
 	start := time.Now()
 
 	err := b.bkt.Upload(ctx, name, r)
 	if err != nil {
-		b.opsFailures.WithLabelValues(op).Inc()
+		b.opsFailures.WithLabelValues(uploadOp).Inc()
 	} else {
 		b.lastSuccessfullUploadTime.WithLabelValues(b.bkt.Name()).SetToCurrentTime()
 	}
-	b.ops.WithLabelValues(op).Inc()
-	b.opsDuration.WithLabelValues(op).Observe(time.Since(start).Seconds())
+	b.ops.WithLabelValues(uploadOp).Inc()
+	b.opsDuration.WithLabelValues(uploadOp).Observe(time.Since(start).Seconds())
 
 	return err
 }
 
 func (b *metricBucket) Delete(ctx context.Context, name string) error {
-	const op = "delete"
 	start := time.Now()
 
 	err := b.bkt.Delete(ctx, name)
 	if err != nil {
-		b.opsFailures.WithLabelValues(op).Inc()
+		b.opsFailures.WithLabelValues(deleteOp).Inc()
 	}
-	b.ops.WithLabelValues(op).Inc()
-	b.opsDuration.WithLabelValues(op).Observe(time.Since(start).Seconds())
+	b.ops.WithLabelValues(deleteOp).Inc()
+	b.opsDuration.WithLabelValues(deleteOp).Observe(time.Since(start).Seconds())
 
 	return err
 }