Merge branch 'master' into feature/instrument

Author: JanuszJakubiec

Diff for: .circleci/template.yml

@@ -310,7 +310,7 @@ commands:
           name: Upload results
           when: always
           command: |
-              tools/circleci-prepare-log-dir.sh
+              tools/prepare-log-dir.sh
               if [ -n "${AWS_SECRET_ACCESS_KEY}" ]; then tools/circleci-upload-to-s3.sh; fi
   report_failed_test_cases_to_ga4:
     steps:

Diff for: .github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
         ## the full list of supported (prebuilt) OTP versions for ubuntu-22.04 runners
         ## can be found here:
         ##     https://builds.hex.pm/builds/otp/ubuntu-22.04/builds.txt
-        otp: [ '25.3.2.9', '26.2.2' ]
+        otp: [ '26.2.5.2', '27.0.1' ]
     runs-on: ubuntu-22.04
     env:
       PRESET: 'small_tests'
@@ -66,17 +66,17 @@ jobs:
       matrix:
         preset: [internal_mnesia, pgsql_mnesia, mysql_redis, odbc_mssql_mnesia,
                  ldap_mnesia, elasticsearch_and_cassandra_mnesia]
-        otp: [ '26.1.2' ]
+        otp: [ '27.0.1' ]
         include:
           - test-spec: "default.spec"
           - preset: elasticsearch_and_cassandra_mnesia
             test-spec: "mam.spec"
           - preset: ldap_mnesia
             test-spec: "default.spec"
-            otp: '25.3.2.6'
+            otp: '26.2.5.2'
           - preset: pgsql_mnesia
             test-spec: "default.spec"
-            otp: '25.3.2.6'
+            otp: '26.2.5.2'
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
@@ -101,11 +101,11 @@ jobs:
       fail-fast: false
       matrix:
         preset: [pgsql_mnesia, mysql_redis, odbc_mssql_mnesia]
-        otp: [ '26.1.2' ]
+        otp: [ '27.0.1' ]
         test-spec: ["dynamic_domains.spec"]
         include:
           - preset: pgsql_mnesia
-            otp: '25.3.2.6'
+            otp: '26.2.5.2'
             test-spec: "dynamic_domains.spec"
     runs-on: ubuntu-22.04
     steps:
@@ -140,7 +140,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        otp: [ '25.2' ]
+        otp: [ '26.2.5.2' ]
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
@@ -156,7 +156,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        otp: [ '25.2' ]
+        otp: [ '26.2.5.2' ]
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
@@ -172,7 +172,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        otp: [ '25.2' ]
+        otp: [ '26.2.5.2' ]
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
@@ -191,7 +191,7 @@ jobs:
         pkg: [ubuntu_xenial]
     runs-on: ubuntu-22.04
     env:
-      ESL_ERLANG_PKG_VER: "25.0.3"
+      ESL_ERLANG_PKG_VER: "25.3.2"
       pkg_PLATFORM: ${{matrix.pkg}}
     steps:
       - uses: actions/checkout@v3

Diff for: big_tests/rebar.config

@@ -22,5 +22,6 @@
         {amqp_client, "3.13.0-rc.2"},
         {rabbit_common, "3.13.4"},
         {esip, "1.0.52"},
-        {jid, "2.1.0", {pkg, mongoose_jid}}
+        {jid, "2.1.0", {pkg, mongoose_jid}},
+        {ct_groups_summary_hook, "0.1.1"}
 ]}.

Diff for: big_tests/rebar.lock

@@ -8,6 +8,9 @@
   {pkg,<<"credentials_obfuscation">>,<<"3.4.0">>},
   1},
  {<<"csv">>,{pkg,<<"csve">>,<<"3.0.3">>},0},
+ {<<"ct_groups_summary_hook">>,
+  {pkg,<<"ct_groups_summary_hook">>,<<"0.1.1">>},
+  0},
  {<<"escalus">>,{pkg,<<"escalus">>,<<"4.2.15">>},0},
  {<<"esip">>,{pkg,<<"esip">>,<<"1.0.52">>},0},
  {<<"exml">>,{pkg,<<"hexml">>,<<"3.4.1">>},0},
@@ -41,6 +44,7 @@
  {<<"cowlib">>, <<"DB8F7505D8332D98EF50A3EF34B34C1AFDDEC7506E4EE4DD4A3A266285D282CA">>},
  {<<"credentials_obfuscation">>, <<"34E18B126B3AEFD6E8143776FBE1CECEEA6792307C99AC5EE8687911F048CFD7">>},
  {<<"csv">>, <<"69E7D9B3FDC72016644368762C6A3E6CBFEB85BCCADBF1BD99AB6C827E360E04">>},
+ {<<"ct_groups_summary_hook">>, <<"21B94902B6CF2D345F4D790D34B49654E71CB8E570DCCC9C1C3616DAE720A7AA">>},
  {<<"escalus">>, <<"1F153CFBEAA67B012F7A34D0AD61A8CD68ED7C0BF9F02B94606B339FBCDCD617">>},
  {<<"esip">>, <<"A2840287C493A4280E6FBA57A257706843B025C315875E38B03FD07190E22DBA">>},
  {<<"exml">>, <<"9581FE6512D9772C61BBE611CD4A8E5BB90B4D4481275325EC520F7A931A9393">>},
@@ -73,6 +77,7 @@
  {<<"cowlib">>, <<"E1E1284DC3FC030A64B1AD0D8382AE7E99DA46C3246B815318A4B848873800A4">>},
  {<<"credentials_obfuscation">>, <<"738ACE0ED5545D2710D3F7383906FC6F6B582D019036E5269C4DBD85DBCED566">>},
  {<<"csv">>, <<"741D1A55AABADAA3E0FE13051050101A73E90C4570B9F9403A939D9546813521">>},
+ {<<"ct_groups_summary_hook">>, <<"997CDE48FEB0C398989E4091A341D4FFF43CFA06CDB8FB2E80CC4A0E0362691C">>},
  {<<"escalus">>, <<"048CEB922E64F23DD05890A60256EDC28B86969E48B0BE5FDE202F62315C9E4F">>},
  {<<"esip">>, <<"6F00165395900500AA262CE0297162D93931C78C1464D89FD0EDC6E3D6BC011F">>},
  {<<"exml">>, <<"D8E7894E2544402B4986EEB2443C15B51B14F686266F091DBF2777D1D99A2FA2">>},

Diff for: big_tests/src/ct_groups_summary_hook.erl

@@ -35,7 +35,7 @@
 
 -record(state, { node_name, reader, writer,
                  current_line_num, out_file, url_file, group, suite,
-                 priv_dir, log_flags = [] }).
+                 log_flags = [] }).
 -include_lib("exml/include/exml.hrl").
 
 %% @doc Return a unique id for this CTH.
@@ -74,8 +74,7 @@ post_end_per_group(Group,_Config,Return,State) ->
 pre_init_per_testcase(TC,Config,State=#state{}) ->
     maybe_print_log_on_mim_node(testcase, starting, TC, State),
     Dog = test_server:timetrap(test_server:seconds(10)),
-    State2 = keep_priv_dir(Config, State),
-    State3 = ensure_initialized(Config, State2),
+    State3 = ensure_initialized(Config, State),
     State4 = pre_insert_line_numbers_into_report(State3, TC),
     test_server:timetrap_cancel(Dog),
     {Config, State4}.
@@ -174,17 +173,13 @@ ensure_initialized(Config, State=#state{node_name=Node, out_file=undefined}) ->
 ensure_initialized(_Config, State=#state{}) ->
     State.
 
-keep_priv_dir(Config, State) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    State#state{priv_dir=PrivDir}.
-
 pre_insert_line_numbers_into_report(State=#state{writer=undefined}, _TC) ->
     State; % Invalid state
 pre_insert_line_numbers_into_report(State=#state{node_name=Node, reader=Reader, writer=Writer,
                                              current_line_num=CurrentLineNum, url_file=UrlFile,
-                                             priv_dir=PrivDir, group=Group, suite=Suite}, TC) ->
+                                             group=Group, suite=Suite}, TC) ->
     CurrentLineNum2 = read_and_write_lines(Node, Reader, Writer, CurrentLineNum),
-    add_log_link_to_line(PrivDir, UrlFile, CurrentLineNum2, Node, " when started"),
+    add_log_link_to_line(UrlFile, CurrentLineNum2, Node, " when started"),
     Message = io_lib:format(
         "<font color=gray>INIT suite=~p group=~p testcase=~p</font>~n",
         [Suite, Group, TC]),
@@ -195,9 +190,9 @@ post_insert_line_numbers_into_report(State=#state{writer=undefined}, _TC) ->
     State; % Invalid state
 post_insert_line_numbers_into_report(State=#state{node_name=Node, reader=Reader, writer=Writer,
                                              current_line_num=CurrentLineNum, url_file=UrlFile,
-                                             group=Group, suite=Suite, priv_dir=PrivDir}, TC) ->
+                                             group=Group, suite=Suite}, TC) ->
     CurrentLineNum2 = read_and_write_lines(Node, Reader, Writer, CurrentLineNum),
-    add_log_link_to_line(PrivDir, UrlFile, CurrentLineNum2, Node, " when finished"),
+    add_log_link_to_line(UrlFile, CurrentLineNum2, Node, " when finished"),
     %% Write a message after the main part
     Message = io_lib:format(
         "<font color=gray>DONE suite=~p group=~p testcase=~p</font>~n",
@@ -214,25 +209,22 @@ insert_line_numbers_into_report(State=#state{node_name=Node, reader=Reader, writ
 %% allows to add simple links.
 %%
 %% We can't add link with label (i.e. index.html#LABEL), because it would be escaped.
-%% Let's create an HTML file for each link we want to insert, and insert our custom
-%% redirect code inside.
 %%
 %% Args:
 %% `Heading' - some description for the link
-%% `PrivDir' - current log_private directory
-%% `LinkName' - filename where to write our redirect code inside log_private
 %% `UrlFile' - destination URL to redirect to
 %% `Label' - position in the document
-add_log_link_to_line(PrivDir, UrlFile, LogLine, Node, ExtraDescription) ->
+add_log_link_to_line(UrlFile, LogLine, Node, ExtraDescription) ->
     Label = "L" ++ integer_to_list(LogLine),
     Heading = "View log from node " ++ atom_to_list(Node) ++ ExtraDescription,
-    %% We need to invent something unique enough here :)
-    LinkName = atom_to_list(Node) ++ "_" ++ integer_to_list(LogLine) ++ ".html",
+    LinkText = atom_to_list(Node) ++ "#" ++ integer_to_list(LogLine),
     URL = UrlFile ++ "#" ++ Label,
-    RedirectCode = "<meta http-equiv='refresh' content='0; url=../" ++ URL ++ "' />",
-    WhereToWrite = filename:join(PrivDir, LinkName),
-    file:write_file(WhereToWrite, RedirectCode),
-    escalus_ct:add_log_link(Heading, LinkName, "text/html").
+    ct_add_link(Heading, URL, LinkText, "text/html").
+
+%% ct_logs:add_link/3 but without URL escaping
+ct_add_link(Heading, URL, LinkText, Type) ->
+    Link = io_lib:format(" <a href=\"~ts\" type=~tp>~ts</a>", [URL, Type, LinkText]),
+    ct_logs:log(Heading ++ binary_to_list(iolist_to_binary(Link)), "", []).
 
 open_out_file(OutFile) ->
     open_file_without_linking(node(), OutFile, [write, delayed_write]).

Diff for: big_tests/src/ct_mongoose_log_hook.erl

@@ -63,7 +63,7 @@ suite() ->
 %%--------------------------------------------------------------------
 
 init_per_suite(Config) ->
-    {Mod, Code} = rpc(mim(), dynamic_compile, from_string, [acc_test_helper_code(Config)]),
+    {Mod, Code} = dynamic_compile:from_string(acc_test_helper_code(Config)),
     rpc(mim(), code, load_binary, [Mod, "acc_test_helper.erl", Code]),
     recreate_table(),
     escalus:init_per_suite(Config).