Skip to content

[9.1] (backport #10717) Make all beats receiver integration tests use standard tools #10720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 28, 2025
Merged

[9.1] (backport #10717) Make all beats receiver integration tests use standard tools #10720

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cabd032
Make all beats receiver integration tests use standard tools (#10717)
swiatekm Oct 22, 2025
1ddc232
Resolve conflicts
swiatekm Oct 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 8 additions & 33 deletions testing/integration/ess/beat_receivers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
"fmt"
"io"
"net/http"
"os/exec"
"runtime"
"strings"
"testing"
Expand Down Expand Up @@ -515,17 +514,17 @@ outputs:
ctx, cancel := testcontext.WithDeadline(t, t.Context(), time.Now().Add(5*time.Minute))
defer cancel()

fixture, cmd, output := prepareAgentCmd(t, ctx, configContents)
// set up a standalone agent
fixture, err := define.NewFixtureFromLocalBuild(t, define.Version())
require.NoError(t, err)

err = cmd.Start()
err = fixture.Prepare(ctx)
require.NoError(t, err)
err = fixture.Configure(ctx, configContents)
require.NoError(t, err)

t.Cleanup(func() {
if t.Failed() {
t.Log("Elastic-Agent output:")
t.Log(output.String())
}
})
output, err := fixture.Install(ctx, &atesting.InstallOpts{Privileged: true, Force: true})
require.NoError(t, err, "failed to install agent: %s", output)

require.Eventually(t, func() bool {
err = fixture.IsHealthy(ctx)
Expand Down Expand Up @@ -570,9 +569,6 @@ outputs:
30*time.Second, 1*time.Second,
"Expected to find at least one document for metricset %s in index %s and runtime %q, got 0", mset, index, tt.runtimeExperimental)
}

cancel()
cmd.Wait()
})
}

Expand Down Expand Up @@ -876,27 +872,6 @@ func getBeatStartLogRecords(logs string) []map[string]any {
return logRecords
}

func prepareAgentCmd(t *testing.T, ctx context.Context, config []byte) (*atesting.Fixture, *exec.Cmd, *strings.Builder) {
// set up a standalone agent
fixture, err := define.NewFixtureFromLocalBuild(t, define.Version())
require.NoError(t, err)

err = fixture.Prepare(ctx)
require.NoError(t, err)
err = fixture.Configure(ctx, config)
require.NoError(t, err)

cmd, err := fixture.PrepareAgentCommand(ctx, nil)
require.NoError(t, err)
cmd.WaitDelay = 1 * time.Second

var output strings.Builder
cmd.Stderr = &output
cmd.Stdout = &output

return fixture, cmd, &output
}

func genIgnoredFields(goos string) []string {
switch goos {
case "windows":
Expand Down