fix conflicts

Author: mauri870

libbeat/beat/info.go

@@ -42,17 +42,10 @@ type Info struct {
 	UserAgent        string    // A string of the user-agent that can be passed to any outputs or network connections
 	FIPSDistribution bool      // If the beat was compiled as a FIPS distribution.
 
-<<<<<<< HEAD
-	LogConsumer consumer.Logs // otel log consumer
-	ComponentID string        // otel component id from the collector config e.g. "filebeatreceiver/logs"
-	Logger      *logp.Logger
-=======
 	LogConsumer     consumer.Logs // otel log consumer
 	ComponentID     string        // otel component id from the collector config e.g. "filebeatreceiver/logs"
 	IncludeMetadata bool          // when true, otelconsumer includes @metadata in the log record body
 	Logger          *logp.Logger
-	Paths           *paths.Path // per beat paths definition
->>>>>>> 2e949e6c4 (otel: option to preserve at metadata field in log record body (#50191))
 }
 
 func (i Info) FQDNAwareHostname(useFQDN bool) string {

x-pack/filebeat/fbreceiver/config_test.go

@@ -10,82 +10,6 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-<<<<<<< HEAD
-=======
-func TestUnmarshal(t *testing.T) {
-	t.Run("partial path override preserves defaults", func(t *testing.T) {
-		cfg := &Config{
-			Beatconfig: map[string]any{
-				"path": map[string]any{
-					"home": "/default/home",
-					"data": "/default/data",
-				},
-			},
-		}
-
-		userConf := confmap.NewFromStringMap(map[string]any{
-			"path.home": "/custom/home",
-			"filebeat":  map[string]any{"inputs": []any{}},
-		})
-
-		require.NoError(t, cfg.Unmarshal(userConf))
-
-		pathMap, ok := cfg.Beatconfig["path"].(map[string]any)
-		require.True(t, ok, "path should be a map")
-		assert.Equal(t, "/custom/home", pathMap["home"], "user override should win")
-		assert.Equal(t, "/default/data", pathMap["data"], "unspecified default should be preserved")
-		assert.Contains(t, cfg.Beatconfig, "filebeat")
-	})
-
-	t.Run("no defaults does not error", func(t *testing.T) {
-		cfg := &Config{}
-
-		userConf := confmap.NewFromStringMap(map[string]any{
-			"filebeat": map[string]any{"inputs": []any{}},
-		})
-
-		require.NoError(t, cfg.Unmarshal(userConf))
-		assert.Contains(t, cfg.Beatconfig, "filebeat")
-	})
-
-	t.Run("full path override replaces both", func(t *testing.T) {
-		cfg := &Config{
-			Beatconfig: map[string]any{
-				"path": map[string]any{
-					"home": "/default/home",
-					"data": "/default/data",
-				},
-			},
-		}
-
-		userConf := confmap.NewFromStringMap(map[string]any{
-			"path": map[string]any{
-				"home": "/custom/home",
-				"data": "/custom/data",
-			},
-			"filebeat": map[string]any{"inputs": []any{}},
-		})
-
-		require.NoError(t, cfg.Unmarshal(userConf))
-
-		pathMap, ok := cfg.Beatconfig["path"].(map[string]any)
-		require.True(t, ok)
-		assert.Equal(t, "/custom/home", pathMap["home"])
-		assert.Equal(t, "/custom/data", pathMap["data"])
-	})
-}
-
-func TestUnmarshalIncludeMetadata(t *testing.T) {
-	cfg := &Config{}
-	userConf := confmap.NewFromStringMap(map[string]any{
-		"include_metadata": true,
-		"filebeat":         map[string]any{"inputs": []any{}},
-	})
-	require.NoError(t, cfg.Unmarshal(userConf))
-	assert.Equal(t, true, cfg.Beatconfig["include_metadata"])
-}
-
->>>>>>> 2e949e6c4 (otel: option to preserve at metadata field in log record body (#50191))
 func TestValidate(t *testing.T) {
 	tests := map[string]struct {
 		c           *Config

x-pack/filebeat/tests/integration/otel_kafka_test.go

@@ -17,12 +17,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-<<<<<<< HEAD
-	"github.com/elastic/beats/v7/x-pack/otel/otelmap"
-=======
 	"github.com/elastic/beats/v7/libbeat/tests/integration"
 	"github.com/elastic/beats/v7/x-pack/otel/oteltest"
->>>>>>> 2e949e6c4 (otel: option to preserve at metadata field in log record body (#50191))
 	"github.com/elastic/beats/v7/x-pack/otel/oteltestcol"
 	"github.com/elastic/elastic-agent-libs/mapstr"
 	"github.com/elastic/sarama"