chore(otel): remove otelbeat

dev-tools/mage/build.go

@@ -168,7 +168,7 @@
 // environment.
 func GolangCrossBuild(params BuildArgs) error {
 	if os.Getenv("GOLANG_CROSSBUILD") != "1" {
 		return errors.New("Use the crossBuild target. golangCrossBuild can " +
 			"only be executed within the golang-crossbuild docker environment.")
 	}
 
@@ -198,12 +198,6 @@
 	return Build(params)
 }
 
-func BuildOTel() error {
-	args := DefaultBuildArgs()
-	args.ExtraFlags = append(args.ExtraFlags, "-tags", "otelbeat")
-	return Build(args)
-}
-
 // Build invokes "go build" to produce a binary.
 func Build(params BuildArgs) error {
 	fmt.Println(">> build: Building", params.Name)
@@ -298,7 +292,7 @@
 		},
 		StringFileInfo: goversioninfo.StringFileInfo{
 			CompanyName:      BeatVendor,
 			ProductName:      strings.Title(BeatName),
 			ProductVersion:   version,
 			FileVersion:      version,
 			FileDescription:  BeatDescription,

dev-tools/mage/gotest.go

@@ -503,13 +503,6 @@ func BuildSystemTestBinary() error {
 	return BuildSystemTestGoBinary(DefaultTestBinaryArgs())
 }
 
-// BuildSystemTestOTelBinary builds beat binary that includes otel.
-func BuildSystemTestOTelBinary() error {
-	args := DefaultTestBinaryArgs()
-	args.ExtraFlags = []string{"-tags", "otelbeat"}
-	return BuildSystemTestGoBinary(args)
-}
-
 // BuildSystemTestGoBinary build a binary for testing that is instrumented for
 // testing and measuring code coverage. The binary is only instrumented for
 // coverage when TEST_COVERAGE=true (default is false).

x-pack/filebeat/cmd/root.go

@@ -40,7 +40,6 @@ func Filebeat() *cmd.BeatsRootCmd {
 	command.PersistentPreRun = func(cmd *cobra.Command, args []string) {
 		management.ConfigTransform.SetTransform(filebeatCfg)
 	}
-	addOTelCommand(command)
 	return command
 }
 

x-pack/filebeat/magefile.go

@@ -43,14 +43,9 @@ func Build() error {
 	return devtools.Build(devtools.DefaultBuildArgs())
 }
 
-// BuildOTel builds the Beat binary with OTel sub command
-func BuildOTel() error {
-	return devtools.BuildOTel()
-}
-
 // BuildSystemTestBinary builds a binary instrumented for use with Python system tests.
 func BuildSystemTestBinary() error {
-	return devtools.BuildSystemTestOTelBinary()
+	return devtools.BuildSystemTestBinary()
 }
 
 // GolangCrossBuild builds the Beat binary inside of the golang-builder.
@@ -173,8 +168,7 @@ func IntegTest() {
 
 // GoIntegTest starts the docker containers and executes the Go integration tests.
 func GoIntegTest(ctx context.Context) error {
-	// build integration test binary with otel sub command
-	devtools.BuildSystemTestOTelBinary()
+	devtools.BuildSystemTestBinary()
 	args := devtools.DefaultGoTestIntegrationFromHostArgs(ctx)
 	// ES_USER must be admin in order for the Go Integration tests to function because they require
 	// indices:data/read/search
@@ -185,8 +179,7 @@ func GoIntegTest(ctx context.Context) error {
 
 // GoFIPSOnlyIntegTest starts the docker containers and executes the Go integration tests with GODEBUG=fips140=only set.
 func GoFIPSOnlyIntegTest(ctx context.Context) error {
-	// build integration test binary with otel sub command
-	devtools.BuildSystemTestOTelBinary()
+	devtools.BuildSystemTestBinary()
 	args := devtools.DefaultGoTestIntegrationFromHostArgs(ctx)
 	// ES_USER must be admin in order for the Go Integration tests to function because they require
 	// indices:data/read/search