[chore][pkg/stanza] Flatten handling of lost files (open-telemetry#27454

)

Subset of open-telemetry#27434

pkg/stanza/fileconsumer/roller_other.go

@@ -30,14 +30,17 @@ OUTER:
  if newReader.Fingerprint.StartsWith(oldReader.Fingerprint) {
  continue OUTER
  }
- if oldReader.FileName == newReader.FileName {
- // At this point, we know that the file has been rotated. However, we do not know
- // if it was moved or truncated. If truncated, then both handles point to the same
- // file, in which case we should only read from it using the new reader. We can use
- // the ValidateOrClose method to establish that the file has not been truncated.
- if !oldReader.ValidateOrClose() {
- continue OUTER
- }
+
+ if oldReader.FileName != newReader.FileName {
+ continue
+ }
+
+ // At this point, we know that the file has been rotated. However, we do not know
+ // if it was moved or truncated. If truncated, then both handles point to the same
+ // file, in which case we should only read from it using the new reader. We can use
+ // the ValidateOrClose method to establish that the file has not been truncated.
+ if !oldReader.ValidateOrClose() {
+ continue OUTER
  }
  }
  lostReaders = append(lostReaders, oldReader)