fix clickhouse_backup_number_backups_remote and last_backup_size_remote metrics behavior in watch command, fix #1152

Signed-off-by: Slach <[email protected]>

Author: Slach

ChangeLog.md

@@ -1,3 +1,7 @@
+# v2.6.19
+BUG FIXES
+- fix `clickhouse_backup_number_backups_remote` and `last_backup_size_remote` metrics behavior in `watch` command, fix [1152](https://github.com/Altinity/clickhouse-backup/issues/1152)
+
 # v2.6.18
 IMPROVEMENTS
 - add support multipart upload and multipart download for COS storage, add COS_ALLOW_MULTIPART_DOWNLOAD and COS_CONCURRENCY to config, fix [1074](https://github.com/Altinity/clickhouse-backup/issues/1074) 

pkg/backup/watch.go

@@ -66,7 +66,7 @@ func (b *Backuper) ValidateWatchParams(watchInterval, fullInterval, watchBackupN
 //
 // - each watch-interval, run create_remote increment --diff-from=prev-name + delete local increment, even when upload failed
 //   - save previous backup type incremental, next try will also incremental, until reach full interval
-func (b *Backuper) Watch(watchInterval, fullInterval, watchBackupNameTemplate, tablePattern string, partitions, skipProjections []string, schemaOnly, backupRBAC, backupConfigs, skipCheckPartsColumns, deleteSource bool, version string, commandId int, metrics metrics.APIMetricsInterface, cliCtx *cli.Context) error {
+func (b *Backuper) Watch(watchInterval, fullInterval, watchBackupNameTemplate, tablePattern string, partitions, skipProjections []string, schemaOnly, backupRBAC, backupConfigs, skipCheckPartsColumns, deleteSource bool, version string, commandId int, metrics *metrics.APIMetrics, cliCtx *cli.Context) error {
 	ctx, cancel, err := status.Current.GetContextWithCancel(commandId)
 	if err != nil {
 		return err
@@ -205,6 +205,20 @@ func (b *Backuper) Watch(watchInterval, fullInterval, watchBackupNameTemplate, t
 					lastFullBackup = now
 				}
 			}
+			// https://github.com/Altinity/clickhouse-backup/issues/1152
+			go func() {
+				remoteBackups, listRemoteErr := b.GetRemoteBackups(ctx, false)
+				if listRemoteErr == nil && len(remoteBackups) > 0 {
+					numberBackupsRemote := len(remoteBackups)
+					lastBackupInstance := remoteBackups[numberBackupsRemote-1]
+					lastSizeRemote := lastBackupInstance.GetFullSize()
+					metrics.LastBackupSizeRemote.Set(float64(lastSizeRemote))
+					metrics.NumberBackupsRemote.Set(float64(numberBackupsRemote))
+				} else {
+					metrics.LastBackupSizeRemote.Set(0)
+					metrics.NumberBackupsRemote.Set(0)
+				}
+			}()
 		}
 		if b.ch.IsOpen {
 			b.ch.Close()

pkg/server/metrics/metrics.go

@@ -8,14 +8,6 @@ import (
 	"github.com/rs/zerolog/log"
 )
 
-type APIMetricsInterface interface {
-	Start(command string, startTime time.Time)
-	Finish(command string, startTime time.Time)
-	Success(command string)
-	Failure(command string)
-	ExecuteWithMetrics(command string, errCounter int, f func() error) (error, int)
-}
-
 type APIMetrics struct {
 	SuccessfulCounter map[string]prometheus.Counter
 	FailedCounter     map[string]prometheus.Counter