Fix merge conflicts

belimawr · belimawr · commit 85c9980b1350 · 2025-12-12T15:26:18.000-05:00
diff --git a/filebeat/input/filestream/internal/input-logfile/harvester.go b/filebeat/input/filestream/internal/input-logfile/harvester.go
@@ -202,7 +202,7 @@ func startHarvester(
 ) func(context.Context) error {
 	srcID := hg.identifier.ID(src)
 
-	return func(canceler context.Context) error {
+	return func(canceler context.Context) (err error) {
 		defer func() {
 			if v := recover(); v != nil {
 				err := fmt.Errorf("harvester panic with: %+v\n%s", v, debug.Stack())
diff --git a/x-pack/filebeat/tests/integration/managerV2_test.go b/x-pack/filebeat/tests/integration/managerV2_test.go
@@ -16,6 +16,7 @@ import (
 	"net/http/httptest"
 	"net/url"
 	"path/filepath"
+	"strings"
 	"sync"
 	"sync/atomic"
 	"testing"
@@ -935,8 +936,6 @@ func outputUnitES(t *testing.T, id int) *proto.UnitExpected {
 		},
 	}
 }
-<<<<<<< HEAD
-=======
 
 func TestReloadErrorHandling(t *testing.T) {
 	filebeat := NewFilebeat(t)
@@ -1429,4 +1428,3 @@ func TestPipelineConnectionErrorFailsInput(t *testing.T) {
 		})
 	}
 }
->>>>>>> 462751c83 ([Filebeat] Correctly report V2 inputs as failed to the Manager (#47905))

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ import (`
`16`	`16`	`"net/http/httptest"`
`17`	`17`	`"net/url"`
`18`	`18`	`"path/filepath"`
	`19`	`+ "strings"`
`19`	`20`	`"sync"`
`20`	`21`	`"sync/atomic"`
`21`	`22`	`"testing"`
`@@ -935,8 +936,6 @@ func outputUnitES(t testing.T, id int) proto.UnitExpected {`
`935`	`936`	`},`
`936`	`937`	`}`
`937`	`938`	`}`
`938`		`-<<<<<<< HEAD`
`939`		`-=======`
`940`	`939`
`941`	`940`	`func TestReloadErrorHandling(t *testing.T) {`
`942`	`941`	`filebeat := NewFilebeat(t)`
`@@ -1429,4 +1428,3 @@ func TestPipelineConnectionErrorFailsInput(t *testing.T) {`
`1429`	`1428`	`})`
`1430`	`1429`	`}`
`1431`	`1430`	`}`
`1432`		`->>>>>>> 462751c83 ([Filebeat] Correctly report V2 inputs as failed to the Manager (#47905))`