-
Notifications
You must be signed in to change notification settings - Fork 428
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.
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
Instrument/mod muc #4268
Instrument/mod muc #4268
Conversation
10f4b80
to
65159a7
Compare
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## feature/instrument #4268 +/- ##
===================================================
Coverage 84.32% 84.33%
===================================================
Files 557 555 -2
Lines 33740 33720 -20
===================================================
- Hits 28451 28437 -14
+ Misses 5289 5283 -6 ☔ View full report in Codecov by Sentry. |
9a1b237
to
23330dc
Compare
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
23330dc
to
8ec1de4
Compare
This comment was marked as outdated.
This comment was marked as outdated.
8ec1de4
to
9178ff3
Compare
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
8ccbee1
to
79264ca
Compare
This comment was marked as outdated.
This comment was marked as outdated.
79264ca
to
392d20f
Compare
This comment was marked as outdated.
This comment was marked as outdated.
392d20f
to
b4ee490
Compare
elasticsearch_and_cassandra_26 / elasticsearch_and_cassandra_mnesia / b4ee490 small_tests_25 / small_tests / b4ee490 small_tests_26 / small_tests / b4ee490 small_tests_26_arm64 / small_tests / b4ee490 ldap_mnesia_25 / ldap_mnesia / b4ee490 muc_SUITE:init_per_suite{'EXIT',
{{badrpc,
{'EXIT',{undef,[{mod_muc,instrumentation,[<<"localhost">>],[]}]}}},
[{distributed_helper,rpc,
[#{node => mongooseim@localhost},
mod_muc,instrumentation,
[<<"localhost">>]],
[{file,
"/home/circleci/project/big_tests/../test/common/distributed_helper.erl"},
{line,140}]},
{instrument_helper,declared_events,1,
[{file,
"/home/circleci/project/big_tests/tests/instrument_helper.erl"},
{line,26}]},
{muc_SUITE,init_per_suite,1,
[{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
{line,333}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1782}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1379}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1223}]}]}} ldap_mnesia_26 / ldap_mnesia / b4ee490 muc_SUITE:init_per_suite{'EXIT',
{{badrpc,
{'EXIT',{undef,[{mod_muc,instrumentation,[<<"localhost">>],[]}]}}},
[{distributed_helper,rpc,
[#{node => mongooseim@localhost},
mod_muc,instrumentation,
[<<"localhost">>]],
[{file,
"/home/circleci/project/big_tests/../test/common/distributed_helper.erl"},
{line,140}]},
{instrument_helper,declared_events,1,
[{file,
"/home/circleci/project/big_tests/tests/instrument_helper.erl"},
{line,26}]},
{muc_SUITE,init_per_suite,1,
[{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
{line,333}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1793}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1390}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1234}]}]}} dynamic_domains_mysql_redis_26 / mysql_redis / b4ee490 muc_SUITE:init_per_suite{'EXIT',
{{badrpc,
{'EXIT',{undef,[{mod_muc,instrumentation,[<<"test type">>],[]}]}}},
[{distributed_helper,rpc,
[#{node => mongooseim@localhost},
mod_muc,instrumentation,
[<<"test type">>]],
[{file,
"/home/circleci/project/big_tests/../test/common/distributed_helper.erl"},
{line,140}]},
{instrument_helper,declared_events,1,
[{file,
"/home/circleci/project/big_tests/tests/instrument_helper.erl"},
{line,26}]},
{muc_SUITE,init_per_suite,1,
[{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
{line,333}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1793}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1390}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1234}]}]}} dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / b4ee490 muc_SUITE:init_per_suite{'EXIT',
{{badrpc,
{'EXIT',{undef,[{mod_muc,instrumentation,[<<"test type">>],[]}]}}},
[{distributed_helper,rpc,
[#{node => mongooseim@localhost},
mod_muc,instrumentation,
[<<"test type">>]],
[{file,
"/home/circleci/project/big_tests/../test/common/distributed_helper.erl"},
{line,140}]},
{instrument_helper,declared_events,1,
[{file,
"/home/circleci/project/big_tests/tests/instrument_helper.erl"},
{line,26}]},
{muc_SUITE,init_per_suite,1,
[{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
{line,333}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1782}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1379}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1223}]}]}} dynamic_domains_mssql_mnesia_26 / odbc_mssql_mnesia / b4ee490 muc_SUITE:init_per_suite{'EXIT',
{{badrpc,
{'EXIT',{undef,[{mod_muc,instrumentation,[<<"test type">>],[]}]}}},
[{distributed_helper,rpc,
[#{node => mongooseim@localhost},
mod_muc,instrumentation,
[<<"test type">>]],
[{file,
"/home/circleci/project/big_tests/../test/common/distributed_helper.erl"},
{line,140}]},
{instrument_helper,declared_events,1,
[{file,
"/home/circleci/project/big_tests/tests/instrument_helper.erl"},
{line,26}]},
{muc_SUITE,init_per_suite,1,
[{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
{line,333}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1793}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1390}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1234}]}]}} dynamic_domains_pgsql_mnesia_26 / pgsql_mnesia / b4ee490 muc_SUITE:init_per_suite{'EXIT',
{{badrpc,
{'EXIT',{undef,[{mod_muc,instrumentation,[<<"test type">>],[]}]}}},
[{distributed_helper,rpc,
[#{node => mongooseim@localhost},
mod_muc,instrumentation,
[<<"test type">>]],
[{file,
"/home/circleci/project/big_tests/../test/common/distributed_helper.erl"},
{line,140}]},
{instrument_helper,declared_events,1,
[{file,
"/home/circleci/project/big_tests/tests/instrument_helper.erl"},
{line,26}]},
{muc_SUITE,init_per_suite,1,
[{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
{line,333}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1793}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1390}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1234}]}]}} internal_mnesia_26 / internal_mnesia / b4ee490 muc_SUITE:init_per_suite{'EXIT',
{{badrpc,
{'EXIT',{undef,[{mod_muc,instrumentation,[<<"localhost">>],[]}]}}},
[{distributed_helper,rpc,
[#{node => mongooseim@localhost},
mod_muc,instrumentation,
[<<"localhost">>]],
[{file,
"/home/circleci/project/big_tests/../test/common/distributed_helper.erl"},
{line,140}]},
{instrument_helper,declared_events,1,
[{file,
"/home/circleci/project/big_tests/tests/instrument_helper.erl"},
{line,26}]},
{muc_SUITE,init_per_suite,1,
[{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
{line,333}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1793}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1390}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1234}]}]}} pgsql_cets_26 / pgsql_cets / b4ee490 muc_SUITE:init_per_suite{'EXIT',
{{badrpc,
{'EXIT',{undef,[{mod_muc,instrumentation,[<<"localhost">>],[]}]}}},
[{distributed_helper,rpc,
[#{node => mongooseim@localhost},
mod_muc,instrumentation,
[<<"localhost">>]],
[{file,
"/home/circleci/project/big_tests/../test/common/distributed_helper.erl"},
{line,140}]},
{instrument_helper,declared_events,1,
[{file,
"/home/circleci/project/big_tests/tests/instrument_helper.erl"},
{line,26}]},
{muc_SUITE,init_per_suite,1,
[{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
{line,333}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1793}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1390}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1234}]}]}} pgsql_mnesia_25 / pgsql_mnesia / b4ee490 muc_SUITE:init_per_suite{'EXIT',
{{badrpc,
{'EXIT',{undef,[{mod_muc,instrumentation,[<<"localhost">>],[]}]}}},
[{distributed_helper,rpc,
[#{node => mongooseim@localhost},
mod_muc,instrumentation,
[<<"localhost">>]],
[{file,
"/home/circleci/project/big_tests/../test/common/distributed_helper.erl"},
{line,140}]},
{instrument_helper,declared_events,1,
[{file,
"/home/circleci/project/big_tests/tests/instrument_helper.erl"},
{line,26}]},
{muc_SUITE,init_per_suite,1,
[{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
{line,333}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1782}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1379}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1223}]}]}} mysql_redis_26 / mysql_redis / b4ee490 muc_SUITE:init_per_suite{'EXIT',
{{badrpc,
{'EXIT',{undef,[{mod_muc,instrumentation,[<<"localhost">>],[]}]}}},
[{distributed_helper,rpc,
[#{node => mongooseim@localhost},
mod_muc,instrumentation,
[<<"localhost">>]],
[{file,
"/home/circleci/project/big_tests/../test/common/distributed_helper.erl"},
{line,140}]},
{instrument_helper,declared_events,1,
[{file,
"/home/circleci/project/big_tests/tests/instrument_helper.erl"},
{line,26}]},
{muc_SUITE,init_per_suite,1,
[{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
{line,333}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1793}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1390}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1234}]}]}} pgsql_mnesia_26 / pgsql_mnesia / b4ee490 muc_SUITE:init_per_suite{'EXIT',
{{badrpc,
{'EXIT',{undef,[{mod_muc,instrumentation,[<<"localhost">>],[]}]}}},
[{distributed_helper,rpc,
[#{node => mongooseim@localhost},
mod_muc,instrumentation,
[<<"localhost">>]],
[{file,
"/home/circleci/project/big_tests/../test/common/distributed_helper.erl"},
{line,140}]},
{instrument_helper,declared_events,1,
[{file,
"/home/circleci/project/big_tests/tests/instrument_helper.erl"},
{line,26}]},
{muc_SUITE,init_per_suite,1,
[{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
{line,333}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1793}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1390}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1234}]}]}} mssql_mnesia_26 / odbc_mssql_mnesia / b4ee490 muc_SUITE:init_per_suite{'EXIT',
{{badrpc,
{'EXIT',{undef,[{mod_muc,instrumentation,[<<"localhost">>],[]}]}}},
[{distributed_helper,rpc,
[#{node => mongooseim@localhost},
mod_muc,instrumentation,
[<<"localhost">>]],
[{file,
"/home/circleci/project/big_tests/../test/common/distributed_helper.erl"},
{line,140}]},
{instrument_helper,declared_events,1,
[{file,
"/home/circleci/project/big_tests/tests/instrument_helper.erl"},
{line,26}]},
{muc_SUITE,init_per_suite,1,
[{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
{line,333}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1793}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1390}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1234}]}]}} |
7b817ff
to
a1c639f
Compare
b4ee490
to
84b71e8
Compare
elasticsearch_and_cassandra_26 / elasticsearch_and_cassandra_mnesia / 84b71e8 small_tests_25 / small_tests / 84b71e8 small_tests_26 / small_tests / 84b71e8 small_tests_26_arm64 / small_tests / 84b71e8 ldap_mnesia_26 / ldap_mnesia / 84b71e8 dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / 84b71e8 ldap_mnesia_25 / ldap_mnesia / 84b71e8 dynamic_domains_mysql_redis_26 / mysql_redis / 84b71e8 dynamic_domains_mssql_mnesia_26 / odbc_mssql_mnesia / 84b71e8 dynamic_domains_pgsql_mnesia_26 / pgsql_mnesia / 84b71e8 internal_mnesia_26 / internal_mnesia / 84b71e8 pgsql_mnesia_25 / pgsql_mnesia / 84b71e8 pgsql_cets_26 / pgsql_cets / 84b71e8 mysql_redis_26 / mysql_redis / 84b71e8 pgsql_mnesia_26 / pgsql_mnesia / 84b71e8 mssql_mnesia_26 / odbc_mssql_mnesia / 84b71e8 |
Make it possible to take instrumentation events from the table. This makes it easier to test probes, because previous values can be erased.
84b71e8
to
de64343
Compare
elasticsearch_and_cassandra_26 / elasticsearch_and_cassandra_mnesia / de64343 small_tests_25 / small_tests / de64343 small_tests_26 / small_tests / de64343 small_tests_26_arm64 / small_tests / de64343 ldap_mnesia_25 / ldap_mnesia / de64343 dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / de64343 dynamic_domains_mysql_redis_26 / mysql_redis / de64343 ldap_mnesia_26 / ldap_mnesia / de64343 dynamic_domains_pgsql_mnesia_26 / pgsql_mnesia / de64343 pgsql_cets_26 / pgsql_cets / de64343 dynamic_domains_mssql_mnesia_26 / odbc_mssql_mnesia / de64343 internal_mnesia_26 / internal_mnesia / de64343 mysql_redis_26 / mysql_redis / de64343 pgsql_mnesia_25 / pgsql_mnesia / de64343 mssql_mnesia_26 / odbc_mssql_mnesia / de64343 pgsql_mnesia_26 / pgsql_mnesia / de64343 graphql_SUITE:tls_enabled:tls_connect_admin_unknown_certificate{error,{{assertMatch,[{module,graphql_SUITE},
{line,253},
{expression,"Result"},
{pattern,"{ error , { tls_alert , { unknown_ca , _ } } }"},
{value,{error,connection_closed}}]},
[{graphql_SUITE,tls_connect_admin_unknown_certificate,1,
[{file,"/home/circleci/project/big_tests/tests/graphql_SUITE.erl"},
{line,253}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1793}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1302}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1234}]}]}} ldap_mnesia_26 / ldap_mnesia / de64343 dynamic_domains_mssql_mnesia_26 / odbc_mssql_mnesia / de64343 pgsql_mnesia_26 / pgsql_mnesia / de64343 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks ok
This PR converts
mod_muc
metrics frommongoose_metrics
tomongoose_instrument
.More details in commit messages.
Note: In the current implementation, probes are started when instrumentation events are set up. As a result, the module is not started yet, while the probe is already enabled. There is a similar possibility of a race condition when a module is being stopped. This is why a
try ... catch
is required inmod_muc:count_rooms/1
. A solution might be to start probes after starting the module, but this would make the code more complex. We could do it in a separate story if needed.