Merge branch 'develop' into develop-3.2-otp24

basho · Dec 21, 2022 · 21dbd31 · 21dbd31
2 parents 0718f36 + cca4f1a
commit 21dbd31
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 riak_sysmon
 ===========
 
-[![Build Status](https://secure.travis-ci.org/basho/riak_sysmon.png?branch=feature/riak-2903/rebar3)](http://travis-ci.org/basho/riak_sysmon)
+[![Erlang CI Actions Status](https://github.com/basho/riak_sysmon/workflows/Erlang%20CI/badge.svg)](https://github.com/basho/riak_sysmon/actions)
 
 `riak_sysmon` is an Erlang/OTP application that manages the event
 messages that can be generated by the Erlang virtual machine's

diff --git a/rebar.config b/rebar.config
@@ -23,6 +23,8 @@
 
 {brt_protect, true}.
 
+{minimum_otp_vsn, "22.0"}.
+
 {erl_opts, [
     warn_bif_clash,
     warn_export_all,

diff --git a/src/riak_sysmon_filter.erl b/src/riak_sysmon_filter.erl
@@ -26,8 +26,6 @@
 
 -behaviour(gen_server).
 
--include("stacktrace.hrl").
-
 -ifdef(TEST).
 -include_lib("eunit/include/eunit.hrl").
 -endif. % TEST
@@ -474,9 +472,9 @@ get_node_map() ->
                      {bummer, bummer}
                 end
          end || T <- ets:tab2list(sys_dist)]
-    catch ?_exception_(X, Y, StackToken) ->
+    catch Class:Reason:Stacktrace ->
             error_logger:error_msg("~s:get_node_map: ~p ~p @ ~p\n",
-                                   [?MODULE, X, Y, ?_get_stacktrace_(StackToken)]),
+                                   [?MODULE, Class, Reason, Stacktrace]),
             []
     end.
 

diff --git a/src/stacktrace.hrl b/src/stacktrace.hrl
diff --git a/test/riak_sysmon_schema_tests.erl b/test/riak_sysmon_schema_tests.erl
@@ -37,7 +37,7 @@
 basic_schema_test() ->
     %% The defaults are defined in .../priv/riak_sysmon.schema. it is the file under test.
     Config = cuttlefish_unit:generate_config(filename:join(
-        cuttlefish_unit:lib_priv_dir(riak_sysmon_app), "riak_sysmon.schema"), []),
+        code:lib_dir(riak_sysmon, priv), "riak_sysmon.schema"), []),
 
     HeapSize = case erlang:system_info(wordsize) of
                    4 -> ?DEFAULT_HEAP_WORD_LIMIT;
@@ -70,7 +70,8 @@ override_schema_test() ->
     HeapSize = (400 * 1024 * 1024) div WordSize,
 
     Config = cuttlefish_unit:generate_config(filename:join(
-        cuttlefish_unit:lib_priv_dir(riak_sysmon_app), "riak_sysmon.schema"), Conf),
+        code:lib_dir(riak_sysmon, priv), "riak_sysmon.schema"), Conf),
+    io:format("~p", [Config]),
 
     cuttlefish_unit:assert_config(Config, "riak_sysmon.process_limit", ?PLUS1(?DEFAULT_PROCESS_LIMIT)),
     cuttlefish_unit:assert_config(Config, "riak_sysmon.port_limit", ?PLUS1(?DEFAULT_PORT_LIMIT)),