diff --git a/src/internal/m365/exchange/backup.go b/src/internal/m365/exchange/backup.go index 1f2732ea0..197753ecc 100644 --- a/src/internal/m365/exchange/backup.go +++ b/src/internal/m365/exchange/backup.go @@ -208,6 +208,8 @@ func ProduceBackupCollections( return nil, nil, false, err } + ctx = clues.Add(ctx, "can_use_previous_backup", canUsePreviousBackup) + for _, scope := range eb.Scopes() { if el.Failure() != nil { break diff --git a/src/internal/m365/onedrive/collections.go b/src/internal/m365/onedrive/collections.go index 0e4a2549c..b32d39282 100644 --- a/src/internal/m365/onedrive/collections.go +++ b/src/internal/m365/onedrive/collections.go @@ -234,6 +234,8 @@ func (c *Collections) Get( return nil, false, err } + ctx = clues.Add(ctx, "can_use_previous_backup", canUsePreviousBackup) + driveTombstones := map[string]struct{}{} for driveID := range oldPathsByDriveID { diff --git a/src/internal/operations/backup.go b/src/internal/operations/backup.go index f3a3cbd55..8390f1afd 100644 --- a/src/internal/operations/backup.go +++ b/src/internal/operations/backup.go @@ -297,7 +297,7 @@ func (op *BackupOperation) do( return nil, clues.Stack(err) } - mans, mdColls, canUseMetaData, err := produceManifestsAndMetadata( + mans, mdColls, canUseMetadata, err := produceManifestsAndMetadata( ctx, kbf, op.kopia, @@ -308,7 +308,9 @@ func (op *BackupOperation) do( return nil, clues.Wrap(err, "producing manifests and metadata") } - if canUseMetaData { + ctx = clues.Add(ctx, "can_use_metadata", canUseMetadata) + + if canUseMetadata { lastBackupVersion = mans.MinBackupVersion() } @@ -325,7 +327,10 @@ func (op *BackupOperation) do( return nil, clues.Wrap(err, "producing backup data collections") } - ctx = clues.Add(ctx, "coll_count", len(cs)) + ctx = clues.Add( + ctx, + "can_use_previous_backup", canUsePreviousBackup, + "collection_count", len(cs)) writeStats, deets, toMerge, err := consumeBackupCollections( ctx, @@ -336,7 +341,7 @@ func (op *BackupOperation) do( cs, ssmb, backupID, - op.incremental && canUseMetaData && canUsePreviousBackup, + op.incremental && canUseMetadata && canUsePreviousBackup, op.Errors) if err != nil { return nil, clues.Wrap(err, "persisting collection backups") @@ -476,6 +481,8 @@ func consumeBackupCollections( isIncremental bool, errs *fault.Bus, ) (*kopia.BackupStats, *details.Builder, kopia.DetailsMergeInfoer, error) { + ctx = clues.Add(ctx, "collection_source", "operations") + complete := observe.MessageWithCompletion(ctx, "Backing up data") defer func() { complete <- struct{}{} diff --git a/src/internal/streamstore/streamstore.go b/src/internal/streamstore/streamstore.go index 25bad8c2d..9deb0176d 100644 --- a/src/internal/streamstore/streamstore.go +++ b/src/internal/streamstore/streamstore.go @@ -229,6 +229,8 @@ func write( dbcs []data.BackupCollection, errs *fault.Bus, ) (string, error) { + ctx = clues.Add(ctx, "collection_source", "streamstore") + backupStats, _, _, err := bup.ConsumeBackupCollections( ctx, nil,