fixed merge issues

exporter/fileexporter/config.go

@@ -24,7 +24,7 @@ type Config struct {
 	// Path of the file to write to. Path is relative to current directory.
 	Path string `mapstructure:"path"`
 
-	// Mode defines whether the exporter should append to the file
+	// Mode defines whether the exporter should append to the file.
 	// Options:
 	// - false[default]:  truncates the file
 	// - true:  appends to the file.

exporter/fileexporter/file_exporter_test.go

@@ -689,7 +689,7 @@ func TestAppend(t *testing.T) {
 	// Wrap the buffer with the buffered writer closer that implements flush() method.
 	bwc := newBufferedWriteCloser(buf)
 	// Create a file exporter with flushing enabled.
-	feI := newFileExporter(cfg)
+	feI := newFileExporter(cfg, zap.NewNop())
 	assert.IsType(t, &fileExporter{}, feI)
 	fe := feI.(*fileExporter)
 

exporter/fileexporter/grouping_file_exporter.go

@@ -255,7 +255,7 @@ func (e *groupingFileExporter) Start(context.Context, component.Host) error {
 	e.pathSuffix = pathParts[1]
 	e.maxOpenFiles = e.conf.GroupBy.MaxOpenFiles
 	e.newFileWriter = func(path string) (*fileWriter, error) {
-		return newFileWriter(path, nil, e.conf.FlushInterval, export)
+		return newFileWriter(path, e.conf.Append, nil, e.conf.FlushInterval, export)
 	}
 
 	writers, err := simplelru.NewLRU(e.conf.GroupBy.MaxOpenFiles, e.onEvict)