Skip to content

Fix flaky FlowAggregator E2E tests #7741

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
antoninbas merged 1 commit into from
Feb 9, 2026
Merged

Fix flaky FlowAggregator E2E tests #7741

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions test/e2e/flowaggregator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,11 @@ func setupFlowAggregatorTest(t *testing.T, options flowVisibilityTestOptions) (*
if err := setupFlowAggregator(t, data, options); err != nil {
t.Fatalf("Error when setting up FlowAggregator: %v", err)
}

if err := getAndCheckFlowAggregatorMetrics(t, data, options.databaseURL != ""); err != nil {
t.Fatalf("Error when checking metrics of Flow Aggregator: %v", err)
}

// Execute teardownFlowAggregator later than teardownTest to ensure that the logs of Flow
// Aggregator has been exported.
teardownFuncs = append(teardownFuncs, func() { teardownFlowAggregator(t, data) })
Expand Down Expand Up @@ -295,9 +300,6 @@ func TestFlowAggregator(t *testing.T) {
data, v4Enabled, v6Enabled := setupFlowAggregatorTest(t, flowVisibilityTestOptions{
databaseURL: defaultCHDatabaseURL,
})
if err := getAndCheckFlowAggregatorMetrics(t, data, true); err != nil {
t.Fatalf("Error when checking metrics of Flow Aggregator: %v", err)
}

k8sUtils, err = NewKubernetesUtils(data)
if err != nil {
Expand Down Expand Up @@ -341,7 +343,6 @@ func TestFlowAggregatorProxyMode(t *testing.T) {
includeK8sNames: includeK8sNames,
},
})
require.NoError(t, getAndCheckFlowAggregatorMetrics(t, data, false), "Error when checking metrics of Flow Aggregator")

// UIDs are only supported when using gRPC between FE and FA.
if k8sUIDsInsteadOfNames {
Expand Down