do not mark not-found items as skipped (#4342)

This was an accidental mis-use of the skipped item pattern.  Items deleted during in flight during backup due to race conditions do not count as permanent
skips in the way that other skipped items do.

---

#### Does this PR need a docs update or release note?

- [x] ⛔ No

#### Type of change

- [x] 🧹 Tech Debt/Cleanup

#### Issue(s)

* closes #4044

#### Test Plan

- [x] ⚡ Unit test
- [x] 💚 E2E

src/internal/m365/collection/drive/collection.go

@@ -282,9 +282,7 @@ func (oc *Collection) getDriveItemContent(
 		}
 
 		if clues.HasLabel(err, graph.LabelStatus(http.StatusNotFound)) || graph.IsErrDeletedInFlight(err) {
-			logger.CtxErr(ctx, err).With("skipped_reason", fault.SkipNotFound).Info("item not found")
-			errs.AddSkip(ctx, fault.FileSkip(fault.SkipNotFound, driveID, itemID, itemName, graph.ItemInfo(item)))
-
+			logger.CtxErr(ctx, err).Info("item not found, probably deleted in flight")
 			return nil, clues.Wrap(err, "deleted item").Label(graph.LabelsSkippable)
 		}
 

src/internal/stats/stats.go

@@ -34,6 +34,5 @@ func (bc *ByteCounter) Count(i int64) {
 type SkippedCounts struct {
 	TotalSkippedItems         int `json:"totalSkippedItems"`
 	SkippedMalware            int `json:"skippedMalware"`
-	SkippedNotFound           int `json:"skippedNotFound"`
 	SkippedInvalidOneNoteFile int `json:"skippedInvalidOneNoteFile"`
 }

src/pkg/backup/backup.go

@@ -90,8 +90,7 @@ func New(
 		skipCount = len(fe.Skipped)
 		failMsg   string
 
-		malware, notFound,
-		invalidONFile, otherSkips int
+		malware, invalidONFile, otherSkips int
 	)
 
 	if fe.Failure != nil {
@@ -103,8 +102,6 @@ func New(
 		switch true {
 		case s.HasCause(fault.SkipMalware):
 			malware++
-		case s.HasCause(fault.SkipNotFound):
-			notFound++
 		case s.HasCause(fault.SkipBigOneNote):
 			invalidONFile++
 		default:
@@ -139,7 +136,6 @@ func New(
 		SkippedCounts: stats.SkippedCounts{
 			TotalSkippedItems:         skipCount,
 			SkippedMalware:            malware,
-			SkippedNotFound:           notFound,
 			SkippedInvalidOneNoteFile: invalidONFile,
 		},
 	}
@@ -234,7 +230,7 @@ func (b Backup) Values() []string {
 	if b.TotalSkippedItems > 0 {
 		status += fmt.Sprintf("%d skipped", b.TotalSkippedItems)
 
-		if b.SkippedMalware+b.SkippedNotFound+b.SkippedInvalidOneNoteFile > 0 {
+		if b.SkippedMalware+b.SkippedInvalidOneNoteFile > 0 {
 			status += ": "
 		}
 	}
@@ -245,10 +241,6 @@ func (b Backup) Values() []string {
 		skipped = append(skipped, fmt.Sprintf("%d malware", b.SkippedMalware))
 	}
 
-	if b.SkippedNotFound > 0 {
-		skipped = append(skipped, fmt.Sprintf("%d not found", b.SkippedNotFound))
-	}
-
 	if b.SkippedInvalidOneNoteFile > 0 {
 		skipped = append(skipped, fmt.Sprintf("%d invalid OneNote file", b.SkippedInvalidOneNoteFile))
 	}

src/pkg/backup/backup_test.go

@@ -166,17 +166,6 @@ func (suite *BackupUnitSuite) TestBackup_Values_statusVariations() {
 			},
 			expect: "test (2 skipped: 1 malware)",
 		},
-		{
-			name: "not found",
-			bup: backup.Backup{
-				Status: "test",
-				SkippedCounts: stats.SkippedCounts{
-					TotalSkippedItems: 2,
-					SkippedNotFound:   1,
-				},
-			},
-			expect: "test (2 skipped: 1 not found)",
-		},
 		{
 			name: "errors and malware",
 			bup: backup.Backup{
@@ -190,16 +179,15 @@ func (suite *BackupUnitSuite) TestBackup_Values_statusVariations() {
 			expect: "test (42 errors, 1 skipped: 1 malware)",
 		},
 		{
-			name: "errors and not found",
+			name: "errors and skipped",
 			bup: backup.Backup{
 				Status:     "test",
 				ErrorCount: 42,
 				SkippedCounts: stats.SkippedCounts{
 					TotalSkippedItems: 1,
-					SkippedNotFound:   1,
 				},
 			},
-			expect: "test (42 errors, 1 skipped: 1 not found)",
+			expect: "test (42 errors, 1 skipped)",
 		},
 		{
 			name: "errors and invalid OneNote",
@@ -221,11 +209,10 @@ func (suite *BackupUnitSuite) TestBackup_Values_statusVariations() {
 				SkippedCounts: stats.SkippedCounts{
 					TotalSkippedItems:         1,
 					SkippedMalware:            1,
-					SkippedNotFound:           1,
 					SkippedInvalidOneNoteFile: 1,
 				},
 			},
-			expect: "test (42 errors, 1 skipped: 1 malware, 1 not found, 1 invalid OneNote file)",
+			expect: "test (42 errors, 1 skipped: 1 malware, 1 invalid OneNote file)",
 		},
 	}
 	for _, test := range table {

src/pkg/fault/item.go

@@ -167,10 +167,6 @@ const (
 	// permanently fail any attempts to backup or restore.
 	SkipMalware skipCause = "malware_detected"
 
-	// SkipNotFound identifies that a file was skipped because we could
-	// not find it when trying to download contents
-	SkipNotFound skipCause = "file_not_found"
-
 	// SkipBigOneNote identifies that a file was skipped because it
 	// was big OneNote file and we can only download OneNote files which
 	// are less that 2GB in size.

src/pkg/services/m365/api/mail.go

@@ -344,9 +344,9 @@ func (c Mail) GetItem(
 			if graph.IsErrCannotOpenFileAttachment(err) {
 				logger.CtxErr(ctx, err).
 					With(
-						"skipped_reason", fault.SkipNotFound,
 						"attachment_id", ptr.Val(a.GetId()),
-						"attachment_size", ptr.Val(a.GetSize())).Info("attachment not found")
+						"attachment_size", ptr.Val(a.GetSize())).
+					Info("attachment not found")
 				// TODO This should use a `AddSkip` once we have
 				// figured out the semantics for skipping
 				// subcomponents of an item