Skip to content

fix(tests): use assert.CollectT in TestContainerCMDAgentMonitoringRuntimeExperimental #11499

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 4 commits into from
Dec 1, 2025
Merged

fix(tests): use assert.CollectT in TestContainerCMDAgentMonitoringRuntimeExperimental #11499

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
74e8dec
fix(tests): use assert.CollectT in TestContainerCMDAgentMonitoringRun…
mauri870 Nov 27, 2025
54a2d0d
Merge branch 'main' into container-eventually-t
mauri870 Dec 1, 2025
b17d287
use t.Logf
mauri870 Dec 1, 2025
4a198b7
Merge branch 'main' into container-eventually-t
mauri870 Dec 1, 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
12 changes: 6 additions & 6 deletions testing/integration/ess/container_cmd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ func TestContainerCMDAgentMonitoringRuntimeExperimental(t *testing.T) {
// Verify that components are using the expected runtime
require.EventuallyWithTf(t, func(ct *assert.CollectT) {
status, err := agentFixture.ExecStatus(ctx, atesting.WithCmdOptions(withEnv(env)))
require.NoErrorf(t, err, "error getting agent status")
require.NoErrorf(ct, err, "error getting agent status")

expectedComponentCount := 4 // process runtime
if tc.expectedRuntimeName == string(monitoringCfg.OtelRuntimeManager) {
Expand All @@ -552,13 +552,13 @@ func TestContainerCMDAgentMonitoringRuntimeExperimental(t *testing.T) {
switch comp.ID {
case "beat/metrics-monitoring", "filestream-monitoring", "prometheus/metrics-monitoring":
// Monitoring components should use the expected runtime
assert.Equalf(t, tc.expectedRuntimeName, compRuntime, "expected correct runtime name for monitoring component %s with id %s", comp.Name, comp.ID)
assert.Equalf(ct, tc.expectedRuntimeName, compRuntime, "expected correct runtime name for monitoring component %s with id %s", comp.Name, comp.ID)
case "http/metrics-monitoring":
// The comp.VersionInfo.Name for this component is empty at times.
// See https://github.com/elastic/elastic-agent/issues/11162.
default:
// Non-monitoring components should use the default runtime
assert.Equalf(t, string(component.DefaultRuntimeManager), compRuntime, "expected default runtime for non-monitoring component %s with id %s", comp.Name, comp.ID)
assert.Equalf(ct, string(component.DefaultRuntimeManager), compRuntime, "expected default runtime for non-monitoring component %s with id %s", comp.Name, comp.ID)
}
}
}, 1*time.Minute, 1*time.Second,
Expand Down Expand Up @@ -655,7 +655,7 @@ func TestContainerCMDAgentMonitoringRuntimeExperimentalPolicy(t *testing.T) {
// Verify that components are using the expected runtime
require.EventuallyWithTf(t, func(ct *assert.CollectT) {
status, err := agentFixture.ExecStatus(ctx, atesting.WithCmdOptions(withEnv(env)))
require.NoErrorf(t, err, "error getting agent status")
require.NoErrorf(ct, err, "error getting agent status")

expectedComponentCount := 4 // process runtime
if tc.expectedRuntimeName == string(monitoringCfg.OtelRuntimeManager) {
Expand All @@ -676,13 +676,13 @@ func TestContainerCMDAgentMonitoringRuntimeExperimentalPolicy(t *testing.T) {
switch comp.ID {
case "beat/metrics-monitoring", "filestream-monitoring", "prometheus/metrics-monitoring":
// Monitoring components should use the expected runtime
assert.Equalf(t, tc.expectedRuntimeName, compRuntime, "unexpected runtime name for monitoring component %s with id %s", comp.Name, comp.ID)
assert.Equalf(ct, tc.expectedRuntimeName, compRuntime, "unexpected runtime name for monitoring component %s with id %s", comp.Name, comp.ID)
case "http/metrics-monitoring":
// The comp.VersionInfo.Name for this component is empty at times.
// See https://github.com/elastic/elastic-agent/issues/11162.
default:
// Non-monitoring components should use the default runtime
assert.Equalf(t, string(component.DefaultRuntimeManager), compRuntime, "expected default runtime for non-monitoring component %s with id %s", comp.Name, comp.ID)
assert.Equalf(ct, string(component.DefaultRuntimeManager), compRuntime, "expected default runtime for non-monitoring component %s with id %s", comp.Name, comp.ID)
}
}
}, 1*time.Minute, 1*time.Second,
Expand Down