Skip to content

[oteltest][fbreceiver] Fix flaky test #45127

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
VihasMakwana merged 5 commits into from
Jul 1, 2025
Merged

[oteltest][fbreceiver] Fix flaky test #45127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c6dd366
skip TestReceiverDegraded
VihasMakwana Jun 26, 2025
5ca3a34
typo
VihasMakwana Jun 26, 2025
4c339ad
Merge branch 'main' into fbreceiver-flaky
VihasMakwana Jul 1, 2025
b2cb0c1
commit
VihasMakwana Jul 1, 2025
c5501fc
replace require.EventuallyWithT
VihasMakwana Jul 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
26 changes: 13 additions & 13 deletions libbeat/otelbeat/oteltest/oteltest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,25 +173,25 @@ func CheckReceivers(params CheckReceiversParams) {

// Ensure the logger fields from the otel collector are present
for _, zl := range zapLogs.All() {
require.Contains(t, zl.ContextMap(), "otelcol.component.kind")
require.Equal(t, "receiver", zl.ContextMap()["otelcol.component.kind"])
require.Contains(t, zl.ContextMap(), "otelcol.signal")
require.Equal(t, "logs", zl.ContextMap()["otelcol.signal"])
require.Contains(t, zl.ContextMap(), "otelcol.component.id")
require.Contains(ct, zl.ContextMap(), "otelcol.component.kind")
require.Equal(ct, "receiver", zl.ContextMap()["otelcol.component.kind"])
require.Contains(ct, zl.ContextMap(), "otelcol.signal")
require.Equal(ct, "logs", zl.ContextMap()["otelcol.signal"])
require.Contains(ct, zl.ContextMap(), "otelcol.component.id")
compID, ok := zl.ContextMap()["otelcol.component.id"].(string)
require.True(t, ok, "otelcol.component.id should be a string")
require.Contains(t, zl.ContextMap(), "service.name")
require.Equal(t, beatForCompID(compID), zl.ContextMap()["service.name"])
require.True(ct, ok, "otelcol.component.id should be a string")
require.Contains(ct, zl.ContextMap(), "service.name")
require.Equal(ct, beatForCompID(compID), zl.ContextMap()["service.name"])
break
}
require.NotNilf(t, host.Evt, "expected not nil nil, got %v", host.Evt)
require.NotNil(ct, host.Evt, "expected not nil, got nil")

if params.Status.Error == "" {
require.Equalf(t, host.Evt.Status(), componentstatus.StatusOK, "expected %v, got %v", params.Status.Status, host.Evt.Status())
require.Nilf(t, host.Evt.Err(), "expected nil, got %v", host.Evt.Err())
require.Equalf(ct, host.Evt.Status(), componentstatus.StatusOK, "expected %v, got %v", params.Status.Status, host.Evt.Status())
require.Nilf(ct, host.Evt.Err(), "expected nil, got %v", host.Evt.Err())
} else {
require.Equalf(t, host.Evt.Status(), params.Status.Status, "expected %v, got %v", params.Status.Status, host.Evt.Status())
require.ErrorContainsf(t, host.Evt.Err(), params.Status.Error, "expected error to contain '%v': %v", params.Status.Error, host.Evt.Err())
require.Equalf(ct, host.Evt.Status(), params.Status.Status, "expected %v, got %v", params.Status.Status, host.Evt.Status())
require.ErrorContainsf(ct, host.Evt.Err(), params.Status.Error, "expected error to contain '%v': %v", params.Status.Error, host.Evt.Err())
}

if params.AssertFunc != nil {
Expand Down
1 change: 0 additions & 1 deletion x-pack/filebeat/fbreceiver/receiver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,6 @@ func TestMultipleReceivers(t *testing.T) {
}

func TestReceiverDegraded(t *testing.T) {
t.Skip("Flaky on CI but works locally: https://github.com/elastic/beats/issues/45057")
testCases := []struct {
name string
status oteltest.ExpectedStatus
Expand Down