[chore][pkg/stanza] Unexporter reader's logger (open-telemetry#27431)

Incremental step towards decoupling the `Reader` struct.

pkg/stanza/fileconsumer/internal/reader/factory.go

@@ -60,7 +60,7 @@ func (f *Factory) build(file *os.File, m *Metadata, lineSplitFunc bufio.SplitFun
  Metadata: m,
  file: file,
  FileName: file.Name(),
- SugaredLogger: f.SugaredLogger.With("path", file.Name()),
+ logger:  f.SugaredLogger.With("path", file.Name()),
  decoder: decode.New(f.Encoding),
  lineSplitFunc: lineSplitFunc,
  }

pkg/stanza/fileconsumer/internal/reader/reader.go

@@ -38,11 +38,11 @@ type Metadata struct {
 
 // Reader manages a single file
 type Reader struct {
- *zap.SugaredLogger
  *Config
  *Metadata
  FileName string
  EOF bool
+ logger *zap.SugaredLogger
  file *os.File
  lineSplitFunc bufio.SplitFunc
  splitFunc bufio.SplitFunc
@@ -71,7 +71,7 @@ func (r *Reader) NewFingerprintFromFile() (*fingerprint.Fingerprint, error) {
 // ReadToEnd will read until the end of the file
 func (r *Reader) ReadToEnd(ctx context.Context) {
  if _, err := r.file.Seek(r.Offset, 0); err != nil {
- r.Errorw("Failed to seek", zap.Error(err))
+ r.logger.Errorw("Failed to seek", zap.Error(err))
  return
  }
 
@@ -91,14 +91,14 @@ func (r *Reader) ReadToEnd(ctx context.Context) {
  if err := s.Error(); err != nil {
  // If Scan returned an error then we are not guaranteed to be at the end of the file
  r.EOF = false
- r.Errorw("Failed during scan", zap.Error(err))
+ r.logger.Errorw("Failed during scan", zap.Error(err))
  }
  break
  }
 
  token, err := r.decoder.Decode(s.Bytes())
  if err != nil {
- r.Errorw("decode: %w", zap.Error(err))
+ r.logger.Errorw("decode: %w", zap.Error(err))
  } else if err := r.processFunc(ctx, token, r.FileAttributes); err != nil {
  if errors.Is(err, header.ErrEndOfHeader) {
  r.finalizeHeader()
@@ -110,12 +110,12 @@ func (r *Reader) ReadToEnd(ctx context.Context) {
  r.splitFunc = r.lineSplitFunc
  r.processFunc = r.Emit
  if _, err = r.file.Seek(r.Offset, 0); err != nil {
- r.Errorw("Failed to seek post-header", zap.Error(err))
+ r.logger.Errorw("Failed to seek post-header", zap.Error(err))
  return
  }
  s = scanner.New(r, r.MaxLogSize, scanner.DefaultBufferSize, r.Offset, r.splitFunc)
  } else {
- r.Errorw("process: %w", zap.Error(err))
+ r.logger.Errorw("process: %w", zap.Error(err))
  }
  }
 
@@ -125,7 +125,7 @@ func (r *Reader) ReadToEnd(ctx context.Context) {
 
 func (r *Reader) finalizeHeader() {
  if err := r.headerReader.Stop(); err != nil {
- r.Errorw("Failed to stop header pipeline during finalization", zap.Error(err))
+ r.logger.Errorw("Failed to stop header pipeline during finalization", zap.Error(err))
  }
  r.headerReader = nil
  r.HeaderFinalized = true
@@ -138,22 +138,22 @@ func (r *Reader) Delete() {
  }
  r.Close()
  if err := os.Remove(r.FileName); err != nil {
- r.Errorf("could not delete %s", r.FileName)
+ r.logger.Errorf("could not delete %s", r.FileName)
  }
 }
 
 // Close will close the file
 func (r *Reader) Close() {
  if r.file != nil {
  if err := r.file.Close(); err != nil {
- r.Debugw("Problem closing reader", zap.Error(err))
+ r.logger.Debugw("Problem closing reader", zap.Error(err))
  }
  r.file = nil
  }
 
  if r.headerReader != nil {
  if err := r.headerReader.Stop(); err != nil {
- r.Errorw("Failed to stop header pipeline", zap.Error(err))
+ r.logger.Errorw("Failed to stop header pipeline", zap.Error(err))
  }
  }
 }
@@ -201,7 +201,7 @@ func (r *Reader) ValidateFingerprint() bool {
  }
  refreshedFingerprint, err := fingerprint.New(r.file, r.FingerprintSize)
  if err != nil {
- r.Debugw("Failed to create fingerprint", zap.Error(err))
+ r.logger.Debugw("Failed to create fingerprint", zap.Error(err))
  return false
  }
  return refreshedFingerprint.StartsWith(r.Fingerprint)