Skip to content

[8.19](backport #45314) otel: update filebeat integration tests to run in isolation #45319

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
mauri870 merged 1 commit into from
Jul 11, 2025
Merged

[8.19](backport #45314) otel: update filebeat integration tests to run in isolation #45319

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
32 changes: 20 additions & 12 deletions x-pack/filebeat/tests/integration/otel_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ http.host: localhost
http.port: %d
`

namespace := strings.ReplaceAll(uuid.Must(uuid.NewV4()).String(), "-", "")
fbOtelIndex := "logs-integration-" + namespace
fbIndex := "logs-filebeat-" + namespace
// start filebeat in otel mode
filebeatOTel := integration.NewBeat(
t,
Expand All @@ -70,7 +73,7 @@ http.port: %d
)

logFilePath := filepath.Join(filebeatOTel.TempDir(), "log.log")
filebeatOTel.WriteConfigFile(fmt.Sprintf(beatsCfgFile, logFilePath, "logs-integration-default", 5066))
filebeatOTel.WriteConfigFile(fmt.Sprintf(beatsCfgFile, logFilePath, fbOtelIndex, 5066))
writeEventsToLogFile(t, logFilePath, numEvents)
filebeatOTel.Start()
defer filebeatOTel.Stop()
Expand All @@ -83,7 +86,7 @@ http.port: %d
)
logFilePath = filepath.Join(filebeat.TempDir(), "log.log")
writeEventsToLogFile(t, logFilePath, numEvents)
s := fmt.Sprintf(beatsCfgFile, logFilePath, "logs-filebeat-default", 5067)
s := fmt.Sprintf(beatsCfgFile, logFilePath, fbIndex, 5067)

filebeat.WriteConfigFile(s)
filebeat.Start()
Expand All @@ -102,10 +105,10 @@ http.port: %d
findCtx, findCancel := context.WithTimeout(context.Background(), 10*time.Second)
defer findCancel()

otelDocs, err = estools.GetAllLogsForIndexWithContext(findCtx, es, ".ds-logs-integration-default*")
otelDocs, err = estools.GetAllLogsForIndexWithContext(findCtx, es, ".ds-"+fbOtelIndex+"*")
require.NoError(t, err)

filebeatDocs, err = estools.GetAllLogsForIndexWithContext(findCtx, es, ".ds-logs-filebeat-default*")
filebeatDocs, err = estools.GetAllLogsForIndexWithContext(findCtx, es, ".ds-"+fbIndex+"*")
require.NoError(t, err)

return otelDocs.Hits.Total.Value >= numEvents && filebeatDocs.Hits.Total.Value >= numEvents
Expand Down Expand Up @@ -315,13 +318,17 @@ func TestFilebeatOTelReceiverE2E(t *testing.T) {
"otel",
)

namespace := strings.ReplaceAll(uuid.Must(uuid.NewV4()).String(), "-", "")
fbReceiverIndex := "logs-integration-" + namespace
filebeatIndex := "logs-filebeat-" + namespace

otelConfig := struct {
Index string
MonitoringPort int
InputFile string
PathHome string
}{
Index: "logs-integration-default",
Index: fbReceiverIndex,
MonitoringPort: 5066,
InputFile: filepath.Join(filebeatOTel.TempDir(), "log.log"),
PathHome: filebeatOTel.TempDir(),
Expand Down Expand Up @@ -427,7 +434,7 @@ http.port: %d
`
logFilePath := filepath.Join(filebeat.TempDir(), "log.log")
writeEventsToLogFile(t, logFilePath, wantEvents)
s := fmt.Sprintf(beatsCfgFile, logFilePath, "logs-filebeat-default", 5067)
s := fmt.Sprintf(beatsCfgFile, logFilePath, filebeatIndex, 5067)
filebeat.WriteConfigFile(s)
filebeat.Start()
defer filebeat.Stop()
Expand All @@ -444,10 +451,10 @@ http.port: %d
findCtx, findCancel := context.WithTimeout(context.Background(), 10*time.Second)
defer findCancel()

otelDocs, err = estools.GetAllLogsForIndexWithContext(findCtx, es, ".ds-logs-integration-default*")
otelDocs, err = estools.GetAllLogsForIndexWithContext(findCtx, es, ".ds-"+fbReceiverIndex+"*")
require.NoError(t, err)

filebeatDocs, err = estools.GetAllLogsForIndexWithContext(findCtx, es, ".ds-logs-filebeat-default*")
filebeatDocs, err = estools.GetAllLogsForIndexWithContext(findCtx, es, ".ds-"+filebeatIndex+"*")
require.NoError(t, err)

return otelDocs.Hits.Total.Value >= wantEvents && filebeatDocs.Hits.Total.Value >= wantEvents
Expand Down Expand Up @@ -492,21 +499,22 @@ func TestFilebeatOTelMultipleReceiversE2E(t *testing.T) {
PathHome string
}

namespace := strings.ReplaceAll(uuid.Must(uuid.NewV4()).String(), "-", "")
otelConfig := struct {
Index string
Receivers []receiverConfig
}{
Index: "logs-integration-default",
Index: "logs-integration-" + namespace,
Receivers: []receiverConfig{
{
MonitoringPort: 5066,
InputFile: logFilePath,
PathHome: filebeatOTel.TempDir(),
PathHome: filepath.Join(filebeatOTel.TempDir(), "r1"),
},
{
MonitoringPort: 5067,
InputFile: logFilePath,
PathHome: filebeatOTel.TempDir(),
PathHome: filepath.Join(filebeatOTel.TempDir(), "r2"),
},
},
}
Expand Down Expand Up @@ -592,7 +600,7 @@ service:
findCtx, findCancel := context.WithTimeout(t.Context(), 10*time.Second)
defer findCancel()

otelDocs, err = estools.GetAllLogsForIndexWithContext(findCtx, es, ".ds-logs-integration-default*")
otelDocs, err = estools.GetAllLogsForIndexWithContext(findCtx, es, ".ds-"+otelConfig.Index+"*")
require.NoError(t, err)

return otelDocs.Hits.Total.Value >= wantTotalLogs
Expand Down