Flaky unit test fix and simplify log print method.

Author: mashhurs

.buildkite/scripts/e2e-pipeline/main.py

@@ -42,9 +42,7 @@ def main(skip_setup=False, integrations=[]):
         working_dir = os.getcwd()
         test_plugin = PluginTest()
 
-        util.show_container_logs("logstash-")
-        util.show_container_logs("elasticsearch-")
-        util.show_container_logs("elastic-agent-")
+        util.show_containers_logs(["logstash-", "elasticsearch-", "elastic-agent-"])
 
         packages = integrations or INTEGRATION_PACKAGES_TO_TEST
         for package in packages:
@@ -55,9 +53,7 @@ def main(skip_setup=False, integrations=[]):
                 print(f"Test failed for {package} with {e}.")
                 failed_packages.append(package)
 
-    util.show_container_logs("logstash-")
-    util.show_container_logs("elasticsearch-")
-    util.show_container_logs("elastic-agent-")
+        util.show_containers_logs(["logstash-", "elasticsearch-", "elastic-agent-"])
 
     if len(failed_packages) > 0:
         raise Exception(f"Following packages failed: {failed_packages}")

.buildkite/scripts/e2e-pipeline/util.py

@@ -18,14 +18,18 @@ def call_url_with_retry(url: str, max_retries: int = 5, delay: int = 1) -> reque
     session.mount(schema, HTTPAdapter(max_retries=retries))
     return session.get(url)
 
-def show_container_logs(container_prefix: str):
+def show_containers_logs(container_prefixes):
     client = docker.from_env()
     containers = client.containers.list(all=True)
     print(f"Available container names: {[c.name for c in containers]}")
-    matching_containers = [c for c in containers if container_prefix in c.name]
-
+    matching_containers = []
+    for container in containers:
+        if any(prefix in container.name for prefix in container_prefixes):
+            matching_containers.append(container)
+    
     if not matching_containers:
-        print(f"No containers found with prefix '{container_prefix}'")
+        prefixes_str = ", ".join(container_prefixes)
+        print(f"No containers found with prefixes: {prefixes_str}")
         return
 
     for container in matching_containers:

src/test/java/co/elastic/logstash/filters/elasticintegration/ElasticsearchRestClientWireMockTest.java

@@ -175,7 +175,10 @@ void setupMock() {
 
             try (RestClient restClient = rcb.build()) {
                 final SSLHandshakeException ex = assertThrows(SSLHandshakeException.class, () -> restClient.performRequest(new Request("GET", "/")));
-                assertThat(ex.getMessage(), stringContainsInOrder("fatal", "bad_certificate"));
+                assertThat(ex.getMessage(), allOf(
+                    containsString("fatal"),
+                    anyOf(containsString("bad_certificate"), containsString("certificate_required"))
+                ));
             }
         }