Support for Erlang 26 #4121

jacekwegr · 2023-09-11T13:06:39Z

This PR updates the some parts of the code to work with the latest Erlang version.

Most of the adjustments are connected to this modification, but there are also a few small tweaks in tests and the source code.

Jobs rockylinux_8 and almalinux_8 on CircleCI continue to utilize OTP24 as there are no updates available for these platforms.

OTP version 26.0.2 is used instead of 26.1 because the gun library has a very long compilation time (exceeding 10 minutes) on the latter version.

codecov · 2023-09-11T13:15:04Z

Codecov Report

Attention: 7 lines in your changes are missing coverage. Please review.

Comparison is base (0bbe037) 83.92% compared to head (a19d783) 83.90%.
Report is 74 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #4121      +/-   ##
==========================================
- Coverage   83.92%   83.90%   -0.02%     
==========================================
  Files         552      552              
  Lines       33630    33633       +3     
==========================================
- Hits        28225    28221       -4     
- Misses       5405     5412       +7

Files	Coverage Δ
src/gen_mod_deps.erl	`97.10% <100.00%> (ø)`
src/just_tls.erl	`79.72% <100.00%> (ø)`
src/gdpr_api.erl	`92.75% <0.00%> (-2.77%)`	⬇️
src/mongoose_lib.erl	`84.93% <44.44%> (-3.96%)`	⬇️

... and 12 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

NelsonVides

Looking very good! Tomorrow I'll run tests locally from this branch to check and continue helping from there, thanks for the effort 😄

src/gdpr_api.erl

NelsonVides · 2023-09-11T20:49:13Z

big_tests/test.config

@@ -145,7 +146,8 @@
        {transport, escalus_ws},
        {ssl, true},
        {port, 5285},
-        {wspath, <<"/ws-xmpp">>}]},
+        {wspath, <<"/ws-xmpp">>},
+        {ssl_opts, [{verify, verify_none}]}]},


Very smart idea 👌🏽

arcusfelis

added comments about path_helper

test/migration_scripts_SUITE.erl

Co-authored-by: Nelson Vides <[email protected]>

NelsonVides · 2023-09-20T08:03:01Z

big_tests/tests/connect_SUITE.erl

 ciphers_available_in_os() ->
    CiphersStr = os:cmd("openssl ciphers 'ALL:eNULL'"),
    [string:strip(C, both, $\n) || C <- string:tokens(CiphersStr, ":")].

 ciphers_working_with_ssl_clients(Config) ->
    Port = c2s_port(Config),
+    Path = rpc(get_node(Port), os, getenv, ["PWD"]),


All right, nice! 👌🏽

src/gdpr_api.erl

pawlooss1

Looks good ❤️ So much effort put into this one. I left one question.

pawlooss1 · 2023-10-02T14:07:47Z

test/mongooseim_metrics_SUITE.erl

 queued_messages_increase(_C) ->
+    Fun = fun(Value) ->
+        case Value of
+            [{fsm, 5}, {regular, 5}, {total, 10}] -> true;
+            [{fsm, 5}, {regular, 6}, {total, 11}] -> true;
+            _ -> false
+        end
+    end,
    async_helper:wait_until(
      fun() ->
              {ok, L} = mongoose_metrics:get_metric_value(global, processQueueLengths),
              lists:sort(L)
-      end,
-      [{fsm, 5}, {regular, 5}, {total, 10}]
-     ).
+      end, Fun).


Were you able to investigate why the return value was non-deterministic?

No, I forgot about it, but I should probably look into that. Thanks for pointing that out!

Thanks 🙂 I'd be better if we found the cause and fix it in the module/test setup instead of assertion.

NelsonVides · 2023-10-03T08:40:13Z

src/gen_mod_deps.erl

@@ -65,7 +65,7 @@ add_deps(HostType, Modules) ->
 %% @end
 -spec resolve_deps(mongooseim:host_type(), module_map() | module_list()) -> module_map().
 resolve_deps(HostType, Modules) when is_map(Modules) ->
-    resolve_deps(HostType, maps:to_list(Modules));
+    resolve_deps(HostType, lists:sort(maps:to_list(Modules)));


WOW, that was it 🤯

src/metrics/mongoose_metrics.erl

pawlooss1

LGTM 👍

mongoose-im · 2023-10-05T12:52:39Z

elasticsearch_and_cassandra_26 / elasticsearch_and_cassandra_mnesia / a19d783
Reports root/ big
OK: 369 / Failed: 0 / User-skipped: 38 / Auto-skipped: 0

small_tests_25 / small_tests / a19d783
Reports root / small

small_tests_26 / small_tests / a19d783
Reports root / small

small_tests_26_arm64 / small_tests / a19d783
Reports root / small

ldap_mnesia_25 / ldap_mnesia / a19d783
Reports root/ big
OK: 2276 / Failed: 0 / User-skipped: 833 / Auto-skipped: 0

ldap_mnesia_26 / ldap_mnesia / a19d783
Reports root/ big
OK: 2276 / Failed: 0 / User-skipped: 833 / Auto-skipped: 0

dynamic_domains_mysql_redis_26 / mysql_redis / a19d783
Reports root/ big
OK: 4205 / Failed: 0 / User-skipped: 116 / Auto-skipped: 0

dynamic_domains_mssql_mnesia_26 / odbc_mssql_mnesia / a19d783
Reports root/ big
OK: 4234 / Failed: 0 / User-skipped: 87 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / a19d783
Reports root/ big
OK: 4237 / Failed: 0 / User-skipped: 84 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_26 / pgsql_mnesia / a19d783
Reports root/ big
OK: 4237 / Failed: 0 / User-skipped: 84 / Auto-skipped: 0

pgsql_mnesia_25 / pgsql_mnesia / a19d783
Reports root/ big
OK: 4626 / Failed: 0 / User-skipped: 91 / Auto-skipped: 0

internal_mnesia_26 / internal_mnesia / a19d783
Reports root/ big
OK: 2422 / Failed: 0 / User-skipped: 687 / Auto-skipped: 0

pgsql_cets_26 / pgsql_cets / a19d783
Reports root/ big
OK: 4596 / Failed: 0 / User-skipped: 121 / Auto-skipped: 0

mssql_mnesia_26 / odbc_mssql_mnesia / a19d783
Reports root/ big
OK: 4623 / Failed: 0 / User-skipped: 94 / Auto-skipped: 0

pgsql_mnesia_26 / pgsql_mnesia / a19d783
Reports root/ big
OK: 4626 / Failed: 0 / User-skipped: 91 / Auto-skipped: 0

mysql_redis_26 / mysql_redis / a19d783
Reports root/ big
OK: 4606 / Failed: 0 / User-skipped: 111 / Auto-skipped: 0

small_tests_26_arm64 / small_tests / a19d783
Reports root / small

This comment was marked as outdated.

Sign in to view

jacekwegr marked this pull request as ready for review September 11, 2023 15:07

NelsonVides reviewed Sep 11, 2023

View reviewed changes

This comment was marked as outdated.

Sign in to view

arcusfelis reviewed Sep 13, 2023

View reviewed changes

test/migration_scripts_SUITE.erl Outdated Show resolved Hide resolved

This comment was marked as outdated.

Sign in to view

jacekwegr and others added 2 commits September 13, 2023 10:36

Set verify_none in connect_SUITE

e734638

Add cacertfile to tls_opts

dc4f53c

jacekwegr marked this pull request as draft September 20, 2023 07:04

jacekwegr and others added 14 commits September 20, 2023 09:05

Fix cipher test cases in connect_SUITE

745e45b

Change migration_scripts_SUITE

b7c237e

Set the verify option to verify_none explicitly

fed28f8

set verify_none for login_SUITE

d56e39d

set verify_none for s2s_SUITE

17a11d0

Change ejabberd_admin_SUITE to work with erl 26

0133c51

Change bosh_SUITE to work with erl 26

8f6f124

Set verify_mode to none in push_integration_SUITE

63ff397

Additional error code when location is a directory

bf1e461

Set SSL options depending on context

5f39b6c

Set verify_none for websockets_SUITE

742be1a

Change service_domain_db_SUITE to work with erl 26

56cfb64

Add missing whitespace in gdpr_api

82ab716

Co-authored-by: Nelson Vides <[email protected]>

Use helper module in migration_scripts_SUITE

c724087

jacekwegr force-pushed the support-erlang-26 branch from ca020d9 to c724087 Compare September 20, 2023 07:14

This comment was marked as outdated.

Sign in to view

NelsonVides reviewed Sep 20, 2023

View reviewed changes

Change graphql_gdpr test to work with Erlang 26

99b2e77

This comment was marked as outdated.

Sign in to view

jacekwegr force-pushed the support-erlang-26 branch from a298fa7 to 9f1d4cd Compare October 2, 2023 11:08

This comment was marked as outdated.

Sign in to view

jacekwegr changed the title ~~Partial support for Erlang 26~~ Support for Erlang 26 Oct 2, 2023

jacekwegr force-pushed the support-erlang-26 branch from 28d83ac to 9f1d4cd Compare October 2, 2023 11:47

jacekwegr marked this pull request as ready for review October 2, 2023 12:28

pawlooss1 self-requested a review October 2, 2023 13:18

pawlooss1 reviewed Oct 2, 2023

View reviewed changes

NelsonVides reviewed Oct 3, 2023

View reviewed changes

This comment was marked as outdated.

Sign in to view

jacekwegr force-pushed the support-erlang-26 branch from 6f6d763 to d87a11f Compare October 4, 2023 09:54

This comment was marked as outdated.

Sign in to view

jacekwegr force-pushed the support-erlang-26 branch from d87a11f to b0d9879 Compare October 4, 2023 10:35

This comment was marked as outdated.

Sign in to view

jacekwegr force-pushed the support-erlang-26 branch from b0d9879 to 446b0b6 Compare October 4, 2023 11:21

This comment was marked as outdated.

Sign in to view

jacekwegr force-pushed the support-erlang-26 branch from 446b0b6 to eb0f722 Compare October 5, 2023 08:28

This comment was marked as outdated.

Sign in to view

jacekwegr force-pushed the support-erlang-26 branch from eb0f722 to 45fdee8 Compare October 5, 2023 09:01

This comment was marked as outdated.

Sign in to view

jacekwegr force-pushed the support-erlang-26 branch from 45fdee8 to d9ac197 Compare October 5, 2023 09:45

This comment was marked as outdated.

Sign in to view

pawlooss1 reviewed Oct 5, 2023

View reviewed changes

src/metrics/mongoose_metrics.erl Outdated Show resolved Hide resolved

Add a comment to the queued_messages_increase test

a19d783

jacekwegr force-pushed the support-erlang-26 branch from d9ac197 to a19d783 Compare October 5, 2023 12:45

pawlooss1 approved these changes Oct 5, 2023

View reviewed changes

pawlooss1 merged commit 8307632 into master Oct 5, 2023
3 of 4 checks passed

pawlooss1 deleted the support-erlang-26 branch October 5, 2023 13:52

chrzaszcz added this to the 6.2.0 milestone Dec 11, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support for Erlang 26 #4121

Support for Erlang 26 #4121

jacekwegr commented Sep 11, 2023 •

edited

Loading

This comment was marked as outdated.

codecov bot commented Sep 11, 2023 •

edited

Loading

This comment was marked as outdated.

NelsonVides left a comment

NelsonVides Sep 11, 2023

This comment was marked as outdated.

arcusfelis left a comment

This comment was marked as outdated.

This comment was marked as outdated.

NelsonVides Sep 20, 2023

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

pawlooss1 left a comment

pawlooss1 Oct 2, 2023

jacekwegr Oct 3, 2023

pawlooss1 Oct 3, 2023

NelsonVides Oct 3, 2023

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.

This comment was marked as outdated.

pawlooss1 left a comment

mongoose-im commented Oct 5, 2023 •

edited

Loading

Support for Erlang 26 #4121

Support for Erlang 26 #4121

Conversation

jacekwegr commented Sep 11, 2023 • edited Loading

This comment was marked as outdated.

codecov bot commented Sep 11, 2023 • edited Loading

Codecov Report

This comment was marked as outdated.

NelsonVides left a comment

Choose a reason for hiding this comment

NelsonVides Sep 11, 2023

Choose a reason for hiding this comment

This comment was marked as outdated.

arcusfelis left a comment

Choose a reason for hiding this comment

This comment was marked as outdated.

This comment was marked as outdated.

NelsonVides Sep 20, 2023

Choose a reason for hiding this comment

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

pawlooss1 left a comment

Choose a reason for hiding this comment

pawlooss1 Oct 2, 2023

Choose a reason for hiding this comment

jacekwegr Oct 3, 2023

Choose a reason for hiding this comment

pawlooss1 Oct 3, 2023

Choose a reason for hiding this comment

NelsonVides Oct 3, 2023

Choose a reason for hiding this comment

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.

This comment was marked as outdated.

pawlooss1 left a comment

Choose a reason for hiding this comment

mongoose-im commented Oct 5, 2023 • edited Loading

jacekwegr commented Sep 11, 2023 •

edited

Loading

codecov bot commented Sep 11, 2023 •

edited

Loading

mongoose-im commented Oct 5, 2023 •

edited

Loading