Merge pull request #12643 from thalesmg/test-flaky-elasticsearch-m-20240304

test(elastic_search): fix flaky test

.ci/docker-compose-file/docker-compose-elastic-search-tls.yaml

@@ -1,5 +1,7 @@
 version: "3.9"
 
+# hint: run the following if the container fails to start locally
+# sysctl -w vm.max_map_count=262144
 services:
   setup:
     image: public.ecr.aws/elastic/elasticsearch:${ELASTIC_TAG}
@@ -54,7 +56,7 @@ services:
       - xpack.security.http.ssl.certificate=certs/es01/es01.crt
       - xpack.security.http.ssl.certificate_authorities=certs/ca/ca.crt
       - xpack.license.self_generated.type=${LICENSE}
-    mem_limit: 1073741824
+    mem_limit: 4G
     ulimits:
       memlock:
         soft: -1

apps/emqx_bridge_es/test/emqx_bridge_es_SUITE.erl

@@ -36,6 +36,7 @@ all() ->
     emqx_common_test_helpers:all(?MODULE).
 
 init_per_suite(Config) ->
+    emqx_common_test_helpers:clear_screen(),
     ProxyName = "elasticsearch",
     ESHost = os:getenv("ELASTICSEARCH_HOST", "elasticsearch"),
     ESPort = list_to_integer(os:getenv("ELASTICSEARCH_PORT", "9200")),
@@ -82,9 +83,6 @@ wait_until_elasticsearch_is_up(Count, Host, Port) ->
 
 end_per_suite(Config) ->
     Apps = ?config(apps, Config),
-    %ProxyHost = ?config(proxy_host, Config),
-    %ProxyPort = ?config(proxy_port, Config),
-    %emqx_common_test_helpers:reset_proxy(ProxyHost, ProxyPort),
     emqx_cth_suite:stop(Apps),
     ok.
 
@@ -92,9 +90,6 @@ init_per_testcase(_TestCase, Config) ->
     Config.
 
 end_per_testcase(_TestCase, _Config) ->
-    %ProxyHost = ?config(proxy_host, Config),
-    %ProxyPort = ?config(proxy_port, Config),
-    %emqx_common_test_helpers:reset_proxy(ProxyHost, ProxyPort),
     emqx_bridge_v2_testlib:delete_all_bridges_and_connectors(),
     emqx_common_test_helpers:call_janitor(60_000),
     ok.
@@ -125,7 +120,11 @@ send_message(Topic) ->
 
 check_action_metrics(ActionName, ConnectorName, Expect) ->
     ActionId = emqx_bridge_v2:id(?TYPE, ActionName, ConnectorName),
-    Metrics =
+    ?retry(
+        300,
+        20,
+        ?assertEqual(
+            Expect,
             #{
                 match => emqx_resource_metrics:matched_get(ActionId),
                 success => emqx_resource_metrics:success_get(ActionId),
@@ -133,10 +132,8 @@ check_action_metrics(ActionName, ConnectorName, Expect) ->
                 queuing => emqx_resource_metrics:queuing_get(ActionId),
                 dropped => emqx_resource_metrics:dropped_get(ActionId)
             },
-    ?assertEqual(
-        Expect,
-        Metrics,
             {ActionName, ConnectorName, ActionId}
+        )
     ).
 
 action_config(ConnectorName) ->
@@ -159,7 +156,8 @@ action(ConnectorName) ->
         <<"connector">> => ConnectorName,
         <<"resource_opts">> => #{
             <<"health_check_interval">> => <<"30s">>,
-            <<"query_mode">> => <<"sync">>
+            <<"query_mode">> => <<"sync">>,
+            <<"metrics_flush_interval">> => <<"300ms">>
         }
     }.