Update instrumentation tests for s2s

Author: chrzaszcz

Diff for: big_tests/tests/s2s_SUITE.erl

@@ -13,6 +13,7 @@
 -include_lib("eunit/include/eunit.hrl").
 
 -import(distributed_helper, [mim/0, rpc_spec/1, rpc/4]).
+-import(domain_helper, [host_type/0]).
 
 -include_lib("common_test/include/ct.hrl").
 
@@ -107,6 +108,7 @@ suite() ->
 %%%===================================================================
 
 init_per_suite(Config0) ->
+    ct:pal("Tested events: ~p~n", [tested_events()]),
     instrument_helper:start(tested_events()),
     mongoose_helper:inject_module(?MODULE, reload),
     Config1 = escalus:init_per_suite(Config0),
@@ -599,12 +601,10 @@ assert_events(TS, Config) ->
     Opts2 = Opts#{expected_count => element_count(TLS)},
     MimDomain = domain_helper:domain(),
     DomainFilter = fun(#{lserver := LServer}) -> LServer =:= MimDomain end,
-    instrument_helper:assert(s2s_element_in, #{}, DomainFilter, Opts2),
-    instrument_helper:assert(s2s_element_out, #{}, DomainFilter, Opts2),
-
     CombinedFilter = fun(M) -> DomainFilter(M) andalso SizeFilter(M) end,
-    instrument_helper:assert(xmpp_element_size_out, Labels, CombinedFilter, Opts2),
-    instrument_helper:assert(xmpp_element_size_in, Labels, CombinedFilter, Opts2).
+    Labels2 = Labels#{host_type => host_type()},
+    instrument_helper:assert(xmpp_element_in, Labels2, CombinedFilter, Opts2),
+    instrument_helper:assert(xmpp_element_out, Labels2, CombinedFilter, Opts2).
 
 data_events(true) -> {tls_data_in, tls_data_out};
 data_events(false) -> {tcp_data_in, tcp_data_out}.
@@ -668,12 +668,8 @@ group_with_tls(node1_tls_optional_node2_tls_required_trusted_with_cachain) -> tr
 group_with_tls(_GN) -> false.
 
 tested_events() ->
-    [{xmpp_element_size_in, #{connection_type => s2s}},
-     {xmpp_element_size_out, #{connection_type => s2s}},
-     {tls_data_in, #{connection_type => s2s}},
-     {tls_data_out, #{connection_type => s2s}},
-     {tcp_data_in, #{connection_type => s2s}},
-     {tcp_data_out, #{connection_type => s2s}},
-     {s2s_element_in, #{}},
-     {s2s_element_out, #{}},
-     {s2s_auth_failed, #{}}].
+    lists:filter(fun is_event_tested/1,
+                 instrument_helper:declared_events(mongoose_s2s_listener, [#{}])).
+
+is_event_tested({_Event, #{host_type := HostType}}) -> HostType =:= host_type();
+is_event_tested({_Event, _Labels}) -> true.