Merge tag '1.0.0-rc.28' into develop

Upgrades to dependencies

CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## 1.0.0-rc.28
+## Fixes
+* Upgraded `plum_db` with a fix to a bug causing a partition a crash when 
+  forcing a partition hashtree reset
+* Upgraded `observer_cli` and `prometheus` dependencies
+* Remove unused `bear` dependency
+
 ## 1.0.0-rc.27
 ## Changes
 * Moved json encoding to `bondy_json` module which now uses the new `json` moduled instead of `jsone` when running on OTP27. In addition, float and date formatting has been implemented to mirror those existing in `jsone`. Also the defaul float format respects the deprecated `jsx` lib format for backwards compatibility.

apps/bondy/src/bondy.app.src

@@ -26,10 +26,10 @@
         "Bondy implements the open Web Application Messaging Protocol (WAMP) "
         "and is written in Erlang."
     },
-    {vsn, "1.0.0-rc.27"},
+    {vsn, "1.0.0-rc.28"},
     {registered, []},
     %% We pass the version number in the bondy_app:start/2 arguments
-    {mod, {bondy_app, [{vsn, "1.0.0-rc.27"}]}},
+    {mod, {bondy_app, [{vsn, "1.0.0-rc.28"}]}},
     {applications,[
         %% Erlang/OTP
         stdlib,
@@ -48,7 +48,6 @@
         backoff,
         %% 3rd-party Utils
         %% 3rd-party Instrumentation
-        bear,
         prometheus,
         telemetry,
         riak_sysmon,

apps/bondy/src/bondy_app.erl

@@ -84,7 +84,7 @@ vsn() ->
 %% -----------------------------------------------------------------------------
 start(_Type, Args) ->
     %% We initialise the Bondy config, we need to make this call before
-    %% starting tuplespace, partisan and plum_db are started, becuase we are
+    %% starting tuplespace, partisan and plum_db are started, because we are
     %% modifying their application environments.
     ok = bondy_config:init(Args),
 
@@ -104,16 +104,20 @@ start(_Type, Args) ->
         router_vsn => vsn()
     }}),
 
+    %% We wait for plum_db partitions to be up, we now need to do this before
+    %% we start the supervisor
+    ok = maybe_wait_for_plum_db_partitions(),
+
     %% Finally we start the supervisor
     case bondy_sup:start_link() of
         {ok, Pid} ->
+
             %% Please do not change the order of this function calls
             %% unless, of course, you know exactly what you are doing.
             ok = setup_commons(),
             ok = bondy_sysmon_handler:add_handler(),
             ok = bondy_router_worker:start_pool(),
             ok = setup_event_handlers(),
-            ok = maybe_wait_for_plum_db_partitions(),
             ok = configure_services(),
             ok = init_registry(),
             ok = setup_wamp_subscriptions(),

apps/bondy_broker_bridge/src/bondy_broker_bridge.app.src

@@ -2,7 +2,7 @@
     {description,
         "Bondy Broker Bridge is an application that is part of Bondy and provides a way to integrate Events with external brokers and systems."
     },
-    {vsn, "1.0.0-rc.27"},
+    {vsn, "1.0.0-rc.28"},
     {registered, []},
     {mod, {bondy_broker_bridge_app, []}},
     {applications, [

rebar.config

@@ -52,11 +52,13 @@
         {branch, "master"}
     }},
     %% Leapsight utility library
-    {utils, {
-        git,
-        "https://github.com/leapsight/utils.git",
-        {tag, "1.3.7"}
-    }},
+    {utils,
+        {git, "https://github.com/leapsight/utils.git", {tag, "1.3.9"}}
+    },
+    {memory,
+        {git, "https://github.com/Leapsight/memory.git", {branch, "master"}}
+    },
+    resulto,
     lrw,
     %% -------------------------------------------------------------------------
     %% Concurrency|Load|Traffic Management
@@ -72,10 +74,9 @@
     %% -------------------------------------------------------------------------
     %% Instrumentation/Debugging
     %% -------------------------------------------------------------------------
-    bear,
-    {observer_cli, "1.7.5"},
+    {observer_cli, "1.8.0"},
     %% Exposes metrics to Promethues
-    {prometheus, "4.10.0"},
+    {prometheus, "4.11.0"},
     {prometheus_cowboy, "0.1.8"},
     {telemetry, "1.3.0"},
     {riak_sysmon,
@@ -104,7 +105,7 @@
     %% Stores data in ets and leveldb, also performs active anti-entropy
     %% exchanges to keep all nodes in sync.
     {plum_db, {
-        git, "https://github.com/Leapsight/plum_db.git", {tag, "2.0.0"}
+        git, "https://github.com/Leapsight/plum_db.git", {tag, "2.1.2"}
     }},
     %% A partial implementation of an Adaptive Radix Trie.
     %% We use it to store the procedure and topic tries.
@@ -130,7 +131,7 @@
 
 
 {relx, [
-    {release, {bondy, "1.0.0-rc.27"},[
+    {release, {bondy, "1.0.0-rc.28"},[
         %% Erlang/OTP
         crypto,
         inets,
@@ -149,12 +150,10 @@
         %% Utils
         uuid,
         lrw,
-        resulto,
         %% Concurrency|Load|Traffic Management
         jobs,
         sidejob,
         %% Instrumentation/Debugging
-        bear,
         observer_cli,
         riak_sysmon,
         prometheus,
@@ -169,6 +168,8 @@
         mops,
         utils,
         wamp,
+        memory,
+        resulto,
         {tuplespace, load},
         %% From plum_db 1.0.0-beta.48 partisan is loaded but not started (as a
         %% result is not defined in the plum_db.app.src file, so we need to

rebar.lock

@@ -15,7 +15,6 @@
   {git,"https://gitlab.com/leapsight/base62.git",
        {ref,"6e1c622c2e9bba51fadba44fa050d4b4ae706890"}},
   2},
- {<<"bear">>,{pkg,<<"bear">>,<<"1.0.0">>},0},
  {<<"bert">>,{pkg,<<"bert">>,<<"0.1.0">>},0},
  {<<"brod">>,{pkg,<<"brod">>,<<"4.1.0">>},0},
  {<<"certifi">>,{pkg,<<"certifi">>,<<"2.12.0">>},1},
@@ -62,14 +61,18 @@
   {git,"https://github.com/Leapsight/maps_utils.git",
        {ref,"afa2da62e0e691ce33d1008cc424c994fff339bf"}},
   1},
+ {<<"memory">>,
+  {git,"https://github.com/Leapsight/memory.git",
+       {ref,"b378f96b1fd35727b1d21865cbb5c390bba7f452"}},
+  0},
  {<<"metrics">>,{pkg,<<"metrics">>,<<"1.0.1">>},1},
  {<<"mimerl">>,{pkg,<<"mimerl">>,<<"1.3.0">>},1},
  {<<"mops">>,
   {git,"https://gitlab.com/leapsight/mops.git",
        {ref,"3955142d3720dc5b7a481e28124a2c5421dcd078"}},
   0},
  {<<"msgpack">>,{pkg,<<"msgpack">>,<<"0.7.0">>},0},
- {<<"observer_cli">>,{pkg,<<"observer_cli">>,<<"1.7.5">>},0},
+ {<<"observer_cli">>,{pkg,<<"observer_cli">>,<<"1.8.0">>},0},
  {<<"opentelemetry_api">>,{pkg,<<"opentelemetry_api">>,<<"1.2.1">>},1},
  {<<"opentelemetry_semantic_conventions">>,
   {pkg,<<"opentelemetry_semantic_conventions">>,<<"0.2.0">>},
@@ -82,16 +85,16 @@
   0},
  {<<"plum_db">>,
   {git,"https://github.com/Leapsight/plum_db.git",
-       {ref,"10687f0d61faa3cf787842ecd85eef1bd3cf4672"}},
+       {ref,"5d13de90d5011871325b88016fa801646c88daa2"}},
   0},
- {<<"prometheus">>,{pkg,<<"prometheus">>,<<"4.10.0">>},0},
+ {<<"prometheus">>,{pkg,<<"prometheus">>,<<"4.11.0">>},0},
  {<<"prometheus_cowboy">>,{pkg,<<"prometheus_cowboy">>,<<"0.1.8">>},0},
  {<<"prometheus_httpd">>,{pkg,<<"prometheus_httpd">>,<<"2.1.11">>},1},
  {<<"quantile_estimator">>,{pkg,<<"quantile_estimator">>,<<"0.2.1">>},1},
  {<<"quickrand">>,{pkg,<<"quickrand">>,<<"2.0.7">>},1},
  {<<"ranch">>,{pkg,<<"ranch">>,<<"1.8.0">>},1},
- {<<"recon">>,{pkg,<<"recon">>,<<"2.5.5">>},1},
- {<<"resulto">>,{pkg,<<"resulto">>,<<"0.1.1">>},0},
+ {<<"recon">>,{pkg,<<"recon">>,<<"2.5.6">>},1},
+ {<<"resulto">>,{pkg,<<"resulto">>,<<"0.2.1">>},0},
  {<<"riak_sysmon">>,
   {git,"https://github.com/Leapsight/riak_sysmon.git",
        {ref,"726df1f4c31108bb9366fb767b480f286e51f7fc"}},
@@ -111,7 +114,7 @@
  {<<"unicode_util_compat">>,{pkg,<<"unicode_util_compat">>,<<"0.7.0">>},1},
  {<<"utils">>,
   {git,"https://github.com/leapsight/utils.git",
-       {ref,"641bd36d997970d355a700009bbaa6b84f0bd987"}},
+       {ref,"cd1de141f8816803b65072d318d6a735aaccd601"}},
   0},
  {<<"uuid">>,{pkg,<<"uuid_erl">>,<<"2.0.7">>},0},
  {<<"wamp">>,
@@ -124,7 +127,6 @@
  {<<"acceptor_pool">>, <<"43C20D2ACAE35F0C2BCD64F9D2BDE267E459F0F3FD23DAB26485BF518C281B21">>},
  {<<"backoff">>, <<"83B72ED2108BA1EE8F7D1C22E0B4A00CFE3593A67DBC792799E8CCE9F42F796B">>},
  {<<"base16">>, <<"283644E2B21BD5915ACB7178BED7851FB07C6E5749B8FAD68A53C501092176D9">>},
- {<<"bear">>, <<"430419C1126B477686CDE843E88BA0F2C7DC5CDF0881C677500074F704339A99">>},
  {<<"bert">>, <<"A87D6693515070A9B287C1043CB7E5B2406BE0357685022764BFBD2609703555">>},
  {<<"brod">>, <<"88141FDAB3DB47E0BEA4325760FF886F3DB0339052899C2B1A86EDE353C7CD19">>},
  {<<"certifi">>, <<"2D1CCA2EC95F59643862AF91F001478C9863C2AC9CB6E2F89780BFD8DE987329">>},
@@ -146,19 +148,19 @@
  {<<"metrics">>, <<"25F094DEA2CDA98213CECC3AEFF09E940299D950904393B2A29D191C346A8486">>},
  {<<"mimerl">>, <<"D0CD9FC04B9061F82490F6581E0128379830E78535E017F7780F37FEA7545726">>},
  {<<"msgpack">>, <<"128AE0A2227C7E7A2847C0F0F73551C268464F8C1EE96BFFB920BC0A5712B295">>},
- {<<"observer_cli">>, <<"CF73407C40BA3933A4BE8BE5CDBFCD647A7EC24B49F1D75E912AE1F2E58BC5D4">>},
+ {<<"observer_cli">>, <<"1359409C4B25B11360DB56BC3103CFB51F3A4B3AEA76EC58C7B8595FEB5D6019">>},
  {<<"opentelemetry_api">>, <<"7B69ED4F40025C005DE0B74FCE8C0549625D59CB4DF12D15C32FE6DC5076FF42">>},
  {<<"opentelemetry_semantic_conventions">>, <<"B67FE459C2938FCAB341CB0951C44860C62347C005ACE1B50F8402576F241435">>},
  {<<"p1_utils">>, <<"2D39B5015A567BBD2CC7033EEB93A7C60D8C84EFE1EF69A3473FAA07FA268187">>},
  {<<"parse_trans">>, <<"6E6AA8167CB44CC8F39441D05193BE6E6F4E7C2946CB2759F015F8C56B76E5FF">>},
- {<<"prometheus">>, <<"792ADBF0130FF61B5FA8826F013772AF24B6E57B984445C8D602C8A0355704A1">>},
+ {<<"prometheus">>, <<"B95F8DE8530F541BD95951E18E355A840003672E5EDA4788C5FA6183406BA29A">>},
  {<<"prometheus_cowboy">>, <<"CFCE0BC7B668C5096639084FCD873826E6220EA714BF60A716F5BD080EF2A99C">>},
  {<<"prometheus_httpd">>, <<"F616ED9B85B536B195D94104063025A91F904A4CFC20255363F49A197D96C896">>},
  {<<"quantile_estimator">>, <<"EF50A361F11B5F26B5F16D0696E46A9E4661756492C981F7B2229EF42FF1CD15">>},
  {<<"quickrand">>, <<"D2BD76676A446E6A058D678444B7FDA1387B813710D1AF6D6E29BB92186C8820">>},
  {<<"ranch">>, <<"8C7A100A139FD57F17327B6413E4167AC559FBC04CA7448E9BE9057311597A1D">>},
- {<<"recon">>, <<"C108A4C406FA301A529151A3BB53158CADC4064EC0C5F99B03DDB8C0E4281BDF">>},
- {<<"resulto">>, <<"81A22FA01BBE17C238D0670579ADD6661CCB54F3A9EA921FF6EA3F9500E9C19D">>},
+ {<<"recon">>, <<"9052588E83BFEDFD9B72E1034532AEE2A5369D9D9343B61AEB7FBCE761010741">>},
+ {<<"resulto">>, <<"6F87E9878C308CC6706B275D4D6A5CDF890940E23024274225B6C456DD00F926">>},
  {<<"rocksdb">>, <<"0AE072F9818DAC03E18BA0E4B436450D24040DFB1A526E2198B451FD9FA0284F">>},
  {<<"setup">>, <<"05F69185A5EB71474C9BC6BA892565651EC7507791F85632B7B914DBFE130510">>},
  {<<"sext">>, <<"1DBF44C7797A369B41E40D098DD9EC295BFD0076AB112AB96C4EB666F7F0F6EF">>},
@@ -174,7 +176,6 @@
  {<<"acceptor_pool">>, <<"0CBCD83FDC8B9AD2EEE2067EF8B91A14858A5883CB7CD800E6FCD5803E158788">>},
  {<<"backoff">>, <<"CF0CFFF8995FB20562F822E5CC47D8CCF664C5ECDC26A684CBE85C225F9D7C39">>},
  {<<"base16">>, <<"02AFD0827E61A7B07093873E063575CA3A2B07520567C7F8CEC7C5D42F052D76">>},
- {<<"bear">>, <<"157B67901ADF84FF0DA6EAE035CA1292A0AC18AA55148154D8C582B2C68959DB">>},
  {<<"bert">>, <<"2A561521EC3529B248658A3E2D3D4BFE6729B0AB8291C701BF15EF413EDA1506">>},
  {<<"brod">>, <<"389F459B1D59662C1ACDD9C39D54DDBD45645B4AC619F3BC6F467FCFBF7FB413">>},
  {<<"certifi">>, <<"EE68D85DF22E554040CDB4BE100F33873AC6051387BAF6A8F6CE82272340FF1C">>},
@@ -196,19 +197,19 @@
  {<<"metrics">>, <<"69B09ADDDC4F74A40716AE54D140F93BEB0FB8978D8636EADED0C31B6F099F16">>},
  {<<"mimerl">>, <<"A1E15A50D1887217DE95F0B9B0793E32853F7C258A5CD227650889B38839FE9D">>},
  {<<"msgpack">>, <<"4649353DA003E6F438D105E4B1E0F17757F6F5EC8687A6F30875FF3AC4CE2A51">>},
- {<<"observer_cli">>, <<"872CF8E833A3A71EBD05420692678EC8AAEDE8FD96C805A4687398F6B23A3014">>},
+ {<<"observer_cli">>, <<"9842759B11360819DD0E6E60173C39C1E6AAEF4B20FA6FE9B4700E3E02911B83">>},
  {<<"opentelemetry_api">>, <<"6D7A27B7CAD2AD69A09CABF6670514CAFCEC717C8441BEB5C96322BAC3D05350">>},
  {<<"opentelemetry_semantic_conventions">>, <<"D61FA1F5639EE8668D74B527E6806E0503EFC55A42DB7B5F39939D84C07D6895">>},
  {<<"p1_utils">>, <<"9219214428F2C6E5D3187FF8EB9A8783695C2427420BE9A259840E07ADA32847">>},
  {<<"parse_trans">>, <<"620A406CE75DADA827B82E453C19CF06776BE266F5A67CFF34E1EF2CBB60E49A">>},
- {<<"prometheus">>, <<"2A99BB6DCE85E238C7236FDE6B0064F9834DC420DDBD962AAC4EA2A3C3D59384">>},
+ {<<"prometheus">>, <<"719862351AABF4DF7079B05DC085D2BBCBE3AC0AC3009E956671B1D5AB88247D">>},
  {<<"prometheus_cowboy">>, <<"BA286BECA9302618418892D37BCD5DC669A6CC001F4EB6D6AF85FF81F3F4F34C">>},
  {<<"prometheus_httpd">>, <<"0BBE831452CFDF9588538EB2F570B26F30C348ADAE5E95A7D87F35A5910BCF92">>},
  {<<"quantile_estimator">>, <<"282A8A323CA2A845C9E6F787D166348F776C1D4A41EDE63046D72D422E3DA946">>},
  {<<"quickrand">>, <<"B8ACBF89A224BC217C3070CA8BEBC6EB236DBE7F9767993B274084EA044D35F0">>},
  {<<"ranch">>, <<"49FBCFD3682FAB1F5D109351B61257676DA1A2FDBE295904176D5E521A2DDFE5">>},
- {<<"recon">>, <<"632A6F447DF7CCC1A4A10BDCFCE71514412B16660FE59DECA0FCF0AA3C054404">>},
- {<<"resulto">>, <<"B2D55EB62782980668E152D8488126B1669785E2130195F450D0048D63796D25">>},
+ {<<"recon">>, <<"96C6799792D735CC0F0FD0F86267E9D351E63339CBE03DF9D162010CEFC26BB0">>},
+ {<<"resulto">>, <<"F464FE18C20DEE644D0D0B68E67329FDF94319C3BC36B569FB1FEFA7A6C16170">>},
  {<<"rocksdb">>, <<"185E645EA480E9325D5EFE362BF3D2A38EDFC31B5145031B0CBEED978E89523C">>},
  {<<"setup">>, <<"EFD072578F0CF85BEA96CAAFFC7ADB0992398272522660A136E10567377071C5">>},
  {<<"sext">>, <<"2FEA5B8C41FBDF05C3058149B0CF38A03CC79E1430C861CD425F99840E018755">>},