diff --git a/libbeat/otelbeat/oteltest/oteltest.go b/libbeat/otelbeat/oteltest/oteltest.go index 7cd9589c5cb1..05b2bd0103a3 100644 --- a/libbeat/otelbeat/oteltest/oteltest.go +++ b/libbeat/otelbeat/oteltest/oteltest.go @@ -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 { diff --git a/x-pack/filebeat/fbreceiver/receiver_test.go b/x-pack/filebeat/fbreceiver/receiver_test.go index e6b13c7d79a9..09998dcad512 100644 --- a/x-pack/filebeat/fbreceiver/receiver_test.go +++ b/x-pack/filebeat/fbreceiver/receiver_test.go @@ -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