Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Merge c2s_preprocessing_hook into user_send_packet #3852

Merged
merged 2 commits into from
Nov 14, 2022
Merged

Merge c2s_preprocessing_hook into user_send_packet #3852

merged 2 commits into from
Nov 14, 2022

Conversation

NelsonVides
Copy link
Collaborator

No description provided.

@mongoose-im
Copy link
Collaborator

mongoose-im commented Nov 9, 2022 •
edited
Loading

small_tests_24 / small_tests / 2c099c2
Reports root / small

small_tests_25 / small_tests / 2c099c2
Reports root / small

ldap_mnesia_24 / ldap_mnesia / 2c099c2
Reports root/ big
OK: 1568 / Failed: 0 / User-skipped: 701 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 2c099c2
Reports root/ big
OK: 3582 / Failed: 0 / User-skipped: 78 / Auto-skipped: 0

ldap_mnesia_25 / ldap_mnesia / 2c099c2
Reports root/ big
OK: 1568 / Failed: 0 / User-skipped: 701 / Auto-skipped: 0

pgsql_mnesia_24 / pgsql_mnesia / 2c099c2
Reports root/ big
OK: 3758 / Failed: 0 / User-skipped: 89 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / 2c099c2
Reports root/ big
OK: 3582 / Failed: 0 / User-skipped: 78 / Auto-skipped: 0

dynamic_domains_mysql_redis_25 / mysql_redis / 2c099c2
Reports root/ big
OK: 3556 / Failed: 0 / User-skipped: 104 / Auto-skipped: 0

internal_mnesia_25 / internal_mnesia / 2c099c2
Reports root/ big
OK: 1657 / Failed: 0 / User-skipped: 612 / Auto-skipped: 0

elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / 2c099c2
Reports root/ big
OK: 1993 / Failed: 0 / User-skipped: 611 / Auto-skipped: 0

mysql_redis_25 / mysql_redis / 2c099c2
Reports root/ big
OK: 3750 / Failed: 2 / User-skipped: 103 / Auto-skipped: 0

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">> =>
          <<"[email protected]/bob_unnamed_2040">>,
        <<"message">> => <<"Hi there!">>,
        <<"to_user_id">> =>
          <<"alice_unnamed_2041@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}]}]}}

Report log

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">> =>
          <<"[email protected]/bob_unnamed_2042">>,
        <<"message">> => <<"Hi there!">>,
        <<"to_user_id">> =>
          <<"alice_unnamed_2045@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}]}]}}

Report log

riak_mnesia_24 / riak_mnesia / 2c099c2
Reports root/ big
OK: 1839 / Failed: 0 / User-skipped: 597 / Auto-skipped: 0

dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / 2c099c2
Reports root/ big
OK: 3582 / Failed: 0 / User-skipped: 78 / Auto-skipped: 0

pgsql_mnesia_25 / pgsql_mnesia / 2c099c2
Reports root/ big
OK: 3758 / Failed: 0 / User-skipped: 89 / Auto-skipped: 0

mssql_mnesia_25 / odbc_mssql_mnesia / 2c099c2
Reports root/ big
OK: 3758 / Failed: 0 / User-skipped: 89 / Auto-skipped: 0

mysql_redis_25 / mysql_redis / 2c099c2
Reports root/ big
OK: 3744 / Failed: 0 / User-skipped: 103 / Auto-skipped: 0

@codecov
Copy link

codecov bot commented Nov 9, 2022 •
edited
Loading

Codecov Report

Base: 72.14% // Head: 72.18% // Increases project coverage by +0.04% 🎉

Coverage data is based on head (4e2cb5c) compared to base (bdcd811).
Patch coverage: 25.00% of modified lines in pull request are covered.

Additional details and impacted files 
@@                   Coverage Diff                    @@
##           feature/mongoose_c2s    #3852      +/-   ##
========================================================
+ Coverage                 72.14%   72.18%   +0.04%     
========================================================
  Files                       534      534              
  Lines                     34032    34012      -20     
========================================================
  Hits                      24551    24551              
+ Misses                     9481     9461      -20
Impacted Files Coverage Δ
src/c2s/mongoose_c2s_hooks.erl 92.85% <ø> (+1.94%) ⬆️
src/jingle_sip/mod_jingle_sip.erl 1.17% <0.00%> (+0.03%) ⬆️
src/stream_management/mod_stream_management.erl 89.15% <ø> (ø)
src/c2s/mongoose_c2s.erl 73.62% <100.00%> (-0.19%) ⬇️
src/mod_amp.erl 96.51% <100.00%> (-0.16%) ⬇️
src/domain/mongoose_domain_loader.erl 89.28% <0.00%> (-3.58%) ⬇️
src/pubsub/mod_pubsub.erl 67.65% <0.00%> (+0.18%) ⬆️
src/wpool/mongoose_wpool.erl 83.17% <0.00%> (+0.93%) ⬆️
src/pubsub/mod_pubsub_db_mnesia.erl 93.67% <0.00%> (+1.26%) ⬆️
src/inbox/mod_inbox_rdbms_async.erl 73.52% <0.00%> (+1.47%) ⬆️
... and 3 more

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.
📢 Do you have feedback about the report comment? Let us know in this issue.

@NelsonVides NelsonVides marked this pull request as ready for review November 9, 2022 22:11
Base automatically changed from c2s/merge_master to feature/mongoose_c2s November 10, 2022 09:22
kamilwaz
kamilwaz requested changes Nov 14, 2022
View reviewed changes
src/jingle_sip/mod_jingle_sip.erl Outdated
maybe_iq_stanza(Acc) ->
-spec user_send_packet(mongoose_acc:t(), mongoose_c2s_hooks:hook_params(), gen_hook:extra()) ->
gen_hook:hook_fn_ret(mongoose_acc:t()).
user_send_packet(Acc, _, _) ->
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not better to use user_send_iq here?

src/mod_amp.erl Outdated
gen_hook:hook_fn_ret(mongoose_acc:t()).
run_initial_check(Acc, _, _) ->
user_send_packet(Acc, _, _) ->
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And user_send_message here.

@mongoose-im
Copy link
Collaborator

mongoose-im commented Nov 14, 2022 •
edited
Loading

small_tests_24 / small_tests / 4e2cb5c
Reports root / small

small_tests_25 / small_tests / 4e2cb5c
Reports root / small

ldap_mnesia_24 / ldap_mnesia / 4e2cb5c
Reports root/ big
OK: 1568 / Failed: 0 / User-skipped: 701 / Auto-skipped: 0

ldap_mnesia_25 / ldap_mnesia / 4e2cb5c
Reports root/ big
OK: 1568 / Failed: 0 / User-skipped: 701 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 4e2cb5c
Reports root/ big
OK: 3582 / Failed: 0 / User-skipped: 78 / Auto-skipped: 0

pgsql_mnesia_24 / pgsql_mnesia / 4e2cb5c
Reports root/ big
OK: 3758 / Failed: 0 / User-skipped: 89 / Auto-skipped: 0

dynamic_domains_mysql_redis_25 / mysql_redis / 4e2cb5c
Reports root/ big
OK: 3556 / Failed: 0 / User-skipped: 104 / Auto-skipped: 0

internal_mnesia_25 / internal_mnesia / 4e2cb5c
Reports root/ big
OK: 1657 / Failed: 0 / User-skipped: 612 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / 4e2cb5c
Reports root/ big
OK: 3582 / Failed: 0 / User-skipped: 78 / Auto-skipped: 0

pgsql_mnesia_25 / pgsql_mnesia / 4e2cb5c
Reports root/ big
OK: 3758 / Failed: 0 / User-skipped: 89 / Auto-skipped: 0

riak_mnesia_24 / riak_mnesia / 4e2cb5c
Reports root/ big
OK: 1839 / Failed: 0 / User-skipped: 597 / Auto-skipped: 0

elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / 4e2cb5c
Reports root/ big
OK: 2010 / Failed: 2 / User-skipped: 611 / Auto-skipped: 0

pubsub_SUITE:tree+basic:retract_test 
{error,{{badmatch,false},
    [{pubsub_tools,check_response,2,
             [{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
            {line,491}]},
     {pubsub_tools,receive_response,3,
             [{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
            {line,481}]},
     {pubsub_tools,receive_and_check_response,4,
             [{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
            {line,471}]},
     {pubsub_SUITE,'-retract_test/1-fun-0-',2,
             [{file,"/home/circleci/project/big_tests/tests/pubsub_SUITE.erl"},
            {line,648}]},
     {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}]}]}}

Report log

pubsub_SUITE:tree+basic:subscribe_options_separate_request_test 
{error,{{badmatch,false},
    [{pubsub_tools,check_response,2,
             [{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
            {line,491}]},
     {pubsub_tools,receive_response,3,
             [{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
            {line,481}]},
     {pubsub_tools,receive_and_check_response,4,
             [{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
            {line,471}]},
     {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}]}]}}

Report log

mysql_redis_25 / mysql_redis / 4e2cb5c
Reports root/ big
OK: 3744 / Failed: 0 / User-skipped: 103 / Auto-skipped: 0

dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / 4e2cb5c
Reports root/ big
OK: 3582 / Failed: 0 / User-skipped: 78 / Auto-skipped: 0

mssql_mnesia_25 / odbc_mssql_mnesia / 4e2cb5c
Reports root/ big
OK: 3758 / Failed: 0 / User-skipped: 89 / Auto-skipped: 0

kamilwaz
kamilwaz approved these changes Nov 14, 2022
View reviewed changes
Copy link

@kamilwaz kamilwaz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good job 👍

@kamilwaz kamilwaz merged commit 707f6d6 into feature/mongoose_c2s Nov 14, 2022
@kamilwaz kamilwaz deleted the c2s/merge_preprocessing_hook branch November 14, 2022 14:20
@jacekwegr jacekwegr added this to the 6.1.0 milestone Apr 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kamilwaz kamilwaz kamilwaz approved these changes

Assignees
No one assigned
Labels
mongoose_c2s
Projects
None yet
Milestone
6.1.0
Development

Successfully merging this pull request may close these issues.
4 participants
@NelsonVides @mongoose-im @kamilwaz @jacekwegr