feat(metrics): add scheduler related metrics (#2076)

Signed-off-by: Alexei Dodon <adodon@cisco.com>

pkg/storage/common/common.go

@@ -1061,6 +1061,15 @@ func (dt *dedupeTask) DoWork(ctx context.Context) error {
 	return err
 }
 
+func (dt *dedupeTask) String() string {
+	return fmt.Sprintf("{Name: %s, digest: %s, dedupe: %t}",
+		dt.Name(), dt.digest, dt.dedupe)
+}
+
+func (dt *dedupeTask) Name() string {
+	return "DedupeTask"
+}
+
 type StorageMetricsInitGenerator struct {
 	ImgStore storageTypes.ImageStore
 	done     bool
@@ -1132,3 +1141,12 @@ func (smt *smTask) DoWork(ctx context.Context) error {
 
 	return nil
 }
+
+func (smt *smTask) String() string {
+	return fmt.Sprintf("{Name: \"%s\", repo: \"%s\"}",
+		smt.Name(), smt.repo)
+}
+
+func (smt *smTask) Name() string {
+	return "StorageMetricsTask"
+}

pkg/storage/gc/gc.go

@@ -851,3 +851,12 @@ func (gct *gcTask) DoWork(ctx context.Context) error {
 	// run task
 	return gct.gc.CleanRepo(ctx, gct.repo) //nolint: contextcheck
 }
+
+func (gct *gcTask) String() string {
+	return fmt.Sprintf("{Name: %s, repo: %s}",
+		gct.Name(), gct.repo)
+}
+
+func (gct *gcTask) Name() string {
+	return "GCTask"
+}

pkg/storage/local/local_test.go

@@ -63,7 +63,9 @@ var DeleteReferrers = config.ImageRetention{ //nolint: gochecknoglobals
 var errCache = errors.New("new cache error")
 
 func runAndGetScheduler() (*scheduler.Scheduler, context.CancelFunc) {
-	taskScheduler := scheduler.NewScheduler(config.New(), zlog.Logger{})
+	log := zlog.Logger{}
+	metrics := monitoring.NewMetricsServer(true, log)
+	taskScheduler := scheduler.NewScheduler(config.New(), metrics, log)
 	taskScheduler.RateLimit = 50 * time.Millisecond
 
 	ctx, cancel := context.WithCancel(context.Background())

pkg/storage/s3/s3_test.go

@@ -62,7 +62,7 @@ func cleanupStorage(store driver.StorageDriver, name string) {
 func createMockStorage(rootDir string, cacheDir string, dedupe bool, store driver.StorageDriver,
 ) storageTypes.ImageStore {
 	log := log.Logger{Logger: zerolog.New(os.Stdout)}
-	metrics := monitoring.NewMetricsServer(false, log)
+	metrics := monitoring.NewMetricsServer(true, log)
 
 	var cacheDriver cache.Cache
 
@@ -187,7 +187,9 @@ func createObjectsStoreDynamo(rootDir string, cacheDir string, dedupe bool, tabl
 }
 
 func runAndGetScheduler() (*scheduler.Scheduler, context.CancelFunc) {
-	taskScheduler := scheduler.NewScheduler(config.New(), log.Logger{})
+	logger := log.Logger{}
+	metrics := monitoring.NewMetricsServer(false, logger)
+	taskScheduler := scheduler.NewScheduler(config.New(), metrics, logger)
 	taskScheduler.RateLimit = 50 * time.Millisecond
 
 	ctx, cancel := context.WithCancel(context.Background())
@@ -2048,7 +2050,9 @@ func TestRebuildDedupeIndex(t *testing.T) {
 
 		Convey("Intrerrupt rebuilding and restart, checking idempotency", func() {
 			for i := 0; i < 10; i++ {
-				taskScheduler := scheduler.NewScheduler(config.New(), log.Logger{})
+				logger := log.Logger{}
+				metrics := monitoring.NewMetricsServer(false, logger)
+				taskScheduler := scheduler.NewScheduler(config.New(), metrics, logger)
 				taskScheduler.RateLimit = 1 * time.Millisecond
 
 				ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
@@ -2087,7 +2091,9 @@ func TestRebuildDedupeIndex(t *testing.T) {
 
 			// now from dedupe false to true
 			for i := 0; i < 10; i++ {
-				taskScheduler := scheduler.NewScheduler(config.New(), log.Logger{})
+				logger := log.Logger{}
+				metrics := monitoring.NewMetricsServer(false, logger)
+				taskScheduler := scheduler.NewScheduler(config.New(), metrics, logger)
 				taskScheduler.RateLimit = 1 * time.Millisecond
 
 				ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)