nits

open-telemetry · VihasMakwana · Jan 7, 2025 · Feb 25, 2025 · Feb 28, 2025 · Feb 28, 2025
commit cecb53e538d588d62adc9f7a29c8ea8262365cef
@@ -197,9 +197,6 @@ func (m *Manager) makeFingerprint(path string) (*fingerprint.Fingerprint, *os.Fi
 		}
 		return nil, nil
 	}
-	if m.excludeDuplicate(fp, file) {
-		return nil, nil
-	}
 	return fp, file
 }
 
@@ -216,6 +213,10 @@ func (m *Manager) makeReaders(ctx context.Context, paths []string) {
 			continue
 		}
 
+		if m.excludeDuplicate(fp, file) {
+			continue
+		}
+
 		r, err := m.newReader(ctx, file, fp)
 		if err != nil {
 			m.set.Logger.Error("Failed to create reader", zap.Error(err))
@@ -243,25 +244,27 @@ func (m *Manager) processUnmatchedFiles(ctx context.Context, files []*os.File, f
 			continue
 		}
 
-		r, err := m.createReader(file, fp, metadata)
+		var r *reader.Reader
+		var err error
+
+		if metadata != nil {
+			r, err = m.readerFactory.NewReaderFromMetadata(file, metadata)
+		} else {
+			// If we don't match any previously known files, create a new reader from scratch.
+			m.set.Logger.Info("Started watching file", zap.String("path", file.Name()))
+			r, err = m.readerFactory.NewReader(file, fp)
+		}
+
 		if err != nil {
 			m.set.Logger.Error("Failed to create reader", zap.Error(err))
 			continue
 		}
+
 		m.telemetryBuilder.FileconsumerOpenFiles.Add(ctx, 1)
 		m.tracker.Add(r)
 	}
 }
 
-func (m *Manager) createReader(file *os.File, fp *fingerprint.Fingerprint, metadata *reader.Metadata) (*reader.Reader, error) {
-	if metadata != nil {
-		return m.readerFactory.NewReaderFromMetadata(file, metadata)
-	}
-
-	m.set.Logger.Info("Started watching file", zap.String("path", file.Name()))
-	return m.readerFactory.NewReader(file, fp)
-}
-
 func (m *Manager) excludeDuplicate(fp *fingerprint.Fingerprint, file *os.File) bool {
 	// excludeDuplicate return true if duplicate path is found with the same content and closes the duplicate.
 	// This can happen when files are being rotated with copy/truncate strategy. (After copy, prior to truncate.)

@@ -1582,8 +1582,6 @@ func TestReadGzipCompressedLogsFromEnd(t *testing.T) {
 }
 
 func TestArchive(t *testing.T) {
-	t.Skip("Time sensitive tests disabled for now on Windows. See https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/32715#issuecomment-2107737828")
-
 	t.Parallel()
 	persister := testutil.NewUnscopedMockPersister()