C2s/metrics #3800
C2s/metrics #3800
Conversation
This comment was marked as outdated.
This comment was marked as outdated.
Codecov ReportBase: 69.81% // Head: 70.34% // Increases project coverage by
Additional details and impacted files@@ Coverage Diff @@
## feature/mongoose_c2s #3800 +/- ##
========================================================
+ Coverage 69.81% 70.34% +0.52%
========================================================
Files 536 536
Lines 34872 34879 +7
========================================================
+ Hits 24346 24535 +189
+ Misses 10526 10344 -182
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. ☔ View full report at Codecov. |
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
|
small_tests_24 / small_tests / a8e3477 small_tests_25 / small_tests / a8e3477 ldap_mnesia_24 / ldap_mnesia / a8e3477 ldap_mnesia_25 / ldap_mnesia / a8e3477 dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / a8e3477 pgsql_mnesia_24 / pgsql_mnesia / a8e3477 internal_mnesia_25 / internal_mnesia / a8e3477 dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / a8e3477 inbox_SUITE:async_pools:one_to_one:msg_sent_to_offline_user{error,
{{assertion_failed,assert,is_iq_result,
{xmlel,<<"message">>,
[{<<"from">>,
<<"alice_msg_sent_to_offline_user_1296@domain.example.com/res1">>},
{<<"to">>,
<<"bob_msg_sent_to_offline_user_1296@domain.example.com/res1">>},
{<<"type">>,<<"chat">>}],
[{xmlel,<<"body">>,[],[{xmlcdata,<<"test">>}]},
{xmlel,<<"stanza-id">>,
[{<<"by">>,
<<"bob_msg_sent_to_offline_user_1296@domain.example.com">>},
{<<"id">>,<<"BQLCCIEJF202">>},
{<<"xmlns">>,<<"urn:xmpp:sid:0">>}],
[]}]},
"<message from='alice_msg_sent_to_offline_user_1296@domain.example.com/res1' to='bob_msg_sent_to_offline_user_1296@domain.example.com/res1' type='chat'><body>test</body><stanza-id by='bob_msg_sent_to_offline_user_1296@domain.example.com' id='BQLCCIEJF202' xmlns='urn:xmpp:sid:0'/></message>"},
[{escalus_new_assert,assert_true,2,
[{file,
"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
{line,84}]},
{escalus_session,session,1,
[{file,
"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_session.erl"},
{line,131}]},
{escalus_session,session,2,
[{file,
"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_session.erl"},
{line,273}]},
{escalus_connection,connection_step,2,
[{file,
"/home/circleci/project/big_tests/_build/def...dynamic_domains_mysql_redis_25 / mysql_redis / a8e3477 pgsql_mnesia_25 / pgsql_mnesia / a8e3477 dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / a8e3477 last_SUITE:valid_queries:last_offline_user{error,
{{assertion_failed,assert,is_last_result,
{xmlel,<<"presence">>,
[{<<"from">>,<<"alice_unnamed_1418@domain.example.com/res1">>},
{<<"to">>,<<"alice_unnamed_1418@domain.example.com/res1">>},
{<<"type">>,<<"unavailable">>}],
[{xmlel,<<"status">>,[],[{xmlcdata,<<"Unknown condition">>}]}]},
"<presence from='alice_unnamed_1418@domain.example.com/res1' to='alice_unnamed_1418@domain.example.com/res1' type='unavailable'><status>Unknown condition</status></presence>"},
[{escalus_new_assert,assert_true,2,
[{file,
"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
{line,84}]},
{last_SUITE,'-last_offline_user/1-fun-0-',2,
[{file,"/home/circleci/project/big_tests/tests/last_SUITE.erl"},
{line,133}]},
{escalus_story,story,4,
[{file,
"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
{line,72}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1782}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1291}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1223}]}]}}mysql_redis_25 / mysql_redis / a8e3477 mod_event_pusher_rabbit_SUITE:group_chat_message_publish:group_chat_message_received_event_properly_formatted{error,
{{assertMatch,
[{module,mod_event_pusher_rabbit_SUITE},
{line,422},
{expression,
"get_decoded_message_from_rabbit ( AliceGroupChatMsgRecvRK )"},
{pattern,
"# { << \"from_user_id\" >> := BobRoomJID , << \"to_user_id\" >> := AliceFullJID , << \"message\" >> := Message }"},
{value,
#{<<"from_user_id">> => <<"muc_publish@muc.localhost">>,
<<"message">> => <<>>,
<<"to_user_id">> =>
<<"alice_unnamed_2033@localhost/res1">>}}]},
[{mod_event_pusher_rabbit_SUITE,
'-group_chat_message_received_event_properly_formatted/1-fun-1-',3,
[{file,
"/home/circleci/project/big_tests/tests/mod_event_pusher_rabbit_SUITE.erl"},
{line,422}]},
{escalus_story,story,4,
[{file,
"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
{line,72}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1782}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1291}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1223}]}]}}mssql_mnesia_25 / odbc_mssql_mnesia / a8e3477 service_domain_db_SUITE:db:db_get_all_dynamic{error,
{{badrpc,timeout},
[{distributed_helper,rpc,
[#{node => mongooseim@localhost},service_domain_db,sync_local,[]],
[{file,
"/home/circleci/project/big_tests/tests/distributed_helper.erl"},
{line,117}]},
{service_domain_db_SUITE,sync_local,1,
[{file,
"/home/circleci/project/big_tests/tests/service_domain_db_SUITE.erl"},
{line,1175}]},
{service_domain_db_SUITE,sync,0,
[{file,
"/home/circleci/project/big_tests/tests/service_domain_db_SUITE.erl"},
{line,1154}]},
{service_domain_db_SUITE,db_get_all_dynamic,1,
[{file,
"/home/circleci/project/big_tests/tests/service_domain_db_SUITE.erl"},
{line,354}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1782}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1291}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1223}]}]}}dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / a8e3477 dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / a8e3477 rest_client_SUITE:roster:add_and_remove_some_contacts_properly{error,{{badmatch,{{<<"500">>,<<"Internal Server Error">>},<<>>}},
[{rest_client_SUITE,add_contact_check_roster_push,2,
[{file,"/home/circleci/project/big_tests/tests/rest_client_SUITE.erl"},
{line,1304}]},
{lists,foreach_1,2,[{file,"lists.erl"},{line,1442}]},
{rest_client_SUITE,'-add_and_remove_some_contacts_properly/1-fun-1-',
4,
[{file,"/home/circleci/project/big_tests/tests/rest_client_SUITE.erl"},
{line,1241}]},
{escalus_story,story,4,
[{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
{line,72}]},
{rest_client_SUITE,add_and_remove_some_contacts_properly,1,
[{file,"/home/circleci/project/big_tests/tests/rest_client_SUITE.erl"},
{line,1236}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1782}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1291}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1223}]}]}}mssql_mnesia_25 / odbc_mssql_mnesia / a8e3477 dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / a8e3477 inbox_extensions_SUITE:async_pools:one_to_one:mute_muted_entry_gets_unmuted{error,
{{assert,
[{module,inbox_extensions_SUITE},
{line,798},
{expression,"escalus_pred : is_message ( Message )"},
{expected,true},
{value,false}]},
[{inbox_extensions_SUITE,check_message_with_properties,4,
[{file,
"/home/circleci/project/big_tests/tests/inbox_extensions_SUITE.erl"},
{line,798}]},
{inbox_extensions_SUITE,set_inbox_properties,4,
[{file,
"/home/circleci/project/big_tests/tests/inbox_extensions_SUITE.erl"},
{line,792}]},
{inbox_extensions_SUITE,'-mute_muted_entry_gets_unmuted/1-fun-2-',2,
[{file,
"/home/circleci/project/big_tests/tests/inbox_extensions_SUITE.erl"},
{line,568}]},
{escalus_story,story,4,
[{file,
"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
{line,72}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1782}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1291}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1223}]}]}}dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / a8e3477 |
| user_send_packet/3, | ||
| user_open_session/3, |
There was a problem hiding this comment.
Remember these changes well because we will have conflicts in the future with the hook reworks 😛
src/c2s/mongoose_c2s.erl
Outdated
| @@ -217,6 +217,7 @@ activate_socket(#c2s_data{socket = Socket}) -> | |||
|
|
|||
| -spec send_text(c2s_data(), iodata()) -> ok | {error, term()}. | |||
| send_text(#c2s_data{socket = Socket}, Text) -> | |||
| mongoose_metrics:update(global, [data, xmpp, sent, xml_stanza_size], size(Text)), | |||
There was a problem hiding this comment.
Careful, because size/1 will only take a tuple or a binary, but exml:to_iolist/1 might return here an iolist of binaries if a list of #xmlel{} records was given. Ideally, this should use iolist_size/1 instead. Will also (theoretically) give better type information.
src/c2s/mongoose_c2s.erl
Outdated
| maybe_send_xml(_StateData, _Acc, []) -> | ||
| ok; | ||
| maybe_send_xml(StateData = #c2s_data{host_type = HostType, lserver = LServer}, undefined, ToSend) -> | ||
| Acc = mongoose_acc:new(#{host_type => HostType, lserver => LServer, location => ?LOCATION}), | ||
| send_element(StateData, ToSend, Acc); | ||
| [send_element(StateData, El, Acc) || El <- ToSend], |
There was a problem hiding this comment.
And here we're losing an optimisation. We could call once per packet exml:to_iolist/1, which will generate a single binary, and then gen_tcp:send/X, which will do one socket operation, as many times as there are packets available; or, we could do a single call to exml:to_iolist/1 with the list of records, which will return a iolist list of binaries, and do a single socket operation with that iolist.
Considering that encoding and socket operations are more expensive than metrics, I'd keep them in their most optimal usage and have metrics either do iolist_size/1, which will perfectly free anyway, or, have the metrics code explore the list of binaries and do the update per metrics.
|
small_tests_24 / small_tests / a5c97ac small_tests_25 / small_tests / a5c97ac ldap_mnesia_24 / ldap_mnesia / a5c97ac dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / a5c97ac ldap_mnesia_25 / ldap_mnesia / a5c97ac pgsql_mnesia_24 / pgsql_mnesia / a5c97ac internal_mnesia_25 / internal_mnesia / a5c97ac dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / a5c97ac elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / a5c97ac pgsql_mnesia_25 / pgsql_mnesia / a5c97ac dynamic_domains_mysql_redis_25 / mysql_redis / a5c97ac mysql_redis_25 / mysql_redis / a5c97ac riak_mnesia_24 / riak_mnesia / a5c97ac mssql_mnesia_25 / odbc_mssql_mnesia / a5c97ac dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / a5c97ac |
Fixes metrics suites.
The following changes were introduced:
user_receive_packettoxmpp_send_elementas first one can be dropped by further hooks and not send at all,mongoose_c2s:send_text/2andmongoose_c2s:handle_socket_data/2),xmppStanzaCountmetric,xmpp_send_elementhook processes one element per run instead of not all.