Upgrade grpcbox (#963)

* Upgrade grpcbox * Move chatterbox dep * Re order sup
helium · May 8, 2023 · d900088 · d900088
1 parent 62689e4
commit d900088
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 15 deletions.
diff --git a/config/sys.config b/config/sys.config
@@ -66,13 +66,17 @@
                     header_table_size => 4096,
                     enable_push => 1,
                     max_concurrent_streams => unlimited,
-                    initial_window_size => 65535,
+                    initial_window_size => 16777216,
                     max_frame_size => 16384,
                     max_header_list_size => unlimited
                 }
             }
         ]}
     ]},
+    {chatterbox, [
+        {client_initial_window_size, 16777216},
+        {server_initial_window_size, 16777216}
+    ]},
     {prometheus, [
         {collectors, [
             prometheus_boolean,

diff --git a/config/sys.config.src b/config/sys.config.src
@@ -95,13 +95,17 @@
                     header_table_size => 4096,
                     enable_push => 1,
                     max_concurrent_streams => unlimited,
-                    initial_window_size => 65535,
+                    initial_window_size => 16777216,
                     max_frame_size => 16384,
                     max_header_list_size => unlimited
                 }
             }
         ]}
     ]},
+    {chatterbox, [
+        {client_initial_window_size, 16777216},
+        {server_initial_window_size, 16777216}
+    ]},
     {prometheus, [
         {collectors, [
             prometheus_boolean,

diff --git a/config/test.config b/config/test.config
@@ -72,11 +72,15 @@
                     header_table_size => 4096,
                     enable_push => 1,
                     max_concurrent_streams => unlimited,
-                    initial_window_size => 65535,
+                    initial_window_size => 16777216,
                     max_frame_size => 16384,
                     max_header_list_size => unlimited
                 }
             }
         ]}
+    ]},
+    {chatterbox, [
+        {client_initial_window_size, 16777216},
+        {server_initial_window_size, 16777216}
     ]}
 ].
diff --git a/rebar.config b/rebar.config
@@ -28,7 +28,6 @@
     {bbmustache, {git, "https://github.com/helium/bbmustache", {branch, "data-fun"}}},
     {iso8601, {git, "https://github.com/erlsci/iso8601", {branch, "master"}}},
     {grpcbox, {git, "https://github.com/novalabsxyz/grpcbox.git", {branch, "adt/immediate-sends"}}},
-    {chatterbox, {git, "https://github.com/novalabsxyz/chatterbox.git", {branch, "adt/perf"}}},
     {inet_cidr, "1.1.0", {pkg, erl_cidr}},
     {throttle, "0.3.0", {pkg, lambda_throttle}},
     {e2qc, {git, "https://github.com/helium/e2qc.git", {branch, "master"}}},

diff --git a/rebar.lock b/rebar.lock
@@ -16,9 +16,9 @@
   0},
  {<<"certifi">>,{pkg,<<"certifi">>,<<"2.9.0">>},1},
  {<<"chatterbox">>,
-  {git,"https://github.com/novalabsxyz/chatterbox.git",
-       {ref,"a107c15af47bb71b9cdf2ce89a8ffc99610267d8"}},
-  0},
+  {git,"https://github.com/novalabsxyz/chatterbox",
+       {ref,"ea9a2bae639cf33355750e171ae4170293e5e985"}},
+  1},
  {<<"clique">>,
   {git,"https://github.com/helium/clique.git",
        {ref,"e4be0dae150061bec080502ed530091672880867"}},
@@ -77,7 +77,7 @@
  {<<"gproc">>,{pkg,<<"gproc">>,<<"0.8.0">>},1},
  {<<"grpcbox">>,
   {git,"https://github.com/novalabsxyz/grpcbox.git",
-       {ref,"f0a14c99a66f862cb5b71c856c3cb57e40a42813"}},
+       {ref,"d8d3c46e41368af56132c222e4cf8522178552d5"}},
   0},
  {<<"gun">>,
   {git,"https://github.com/emqx/gun",
@@ -92,7 +92,10 @@
   {git,"https://github.com/helium/proto.git",
        {ref,"3061e06dff4f4a643dd9e2bf98bc24b462071de3"}},
   0},
- {<<"hpack">>,{pkg,<<"hpack_erl">>,<<"0.2.3">>},1},
+ {<<"hpack">>,
+  {git,"https://github.com/novalabsxyz/hpack.git",
+       {ref,"291f83c8efbd50cf57ddcf311e5d9a4fbe2bb5cb"}},
+  2},
  {<<"httpc_aws">>,
   {git,"https://github.com/helium/httpc-aws.git",
        {ref,"a1d0228b49756ce5ce48eb400ccff3b22b57e3c1"}},
@@ -191,7 +194,6 @@
  {<<"goldrush">>, <<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>},
  {<<"gproc">>, <<"CEA02C578589C61E5341FCE149EA36CCEF236CC2ECAC8691FBA408E7EA77EC2F">>},
  {<<"hackney">>, <<"F48BF88F521F2A229FC7BAE88CF4F85ADC9CD9BCF23B5DC8EB6A1788C662C4F6">>},
- {<<"hpack">>, <<"17670F83FF984AE6CD74B1C456EDDE906D27FF013740EE4D9EFAA4F1BF999633">>},
  {<<"idna">>, <<"8A63070E9F7D0C62EB9D9FCB360A7DE382448200FBBD1B106CC96D3D8099DF8D">>},
  {<<"inert">>, <<"51586E4E77E3C5ABC00E3A12AEE829FB6E44D51E4C7957F7B97C4378A15985DD">>},
  {<<"inet_cidr">>, <<"A7D8299E3C4AAEA6BF8E1EB371BF2C79A2D3B04589CB8CC86F81DEDB9AA0E87A">>},
@@ -233,7 +235,6 @@
  {<<"goldrush">>, <<"99CB4128CFFCB3227581E5D4D803D5413FA643F4EB96523F77D9E6937D994CEB">>},
  {<<"gproc">>, <<"580ADAFA56463B75263EF5A5DF4C86AF321F68694E7786CB057FD805D1E2A7DE">>},
  {<<"hackney">>, <<"A4ECDAFF44297E9B5894AE499E9A070EA1888C84AFDD1FD9B7B2BC384950128E">>},
- {<<"hpack">>, <<"06F580167C4B8B8A6429040DF36CC93BBA6D571FAEAEC1B28816523379CBB23A">>},
  {<<"idna">>, <<"92376EB7894412ED19AC475E4A86F7B413C1B9FBB5BD16DCCD57934157944CEA">>},
  {<<"inert">>, <<"1C45F2043FD80B18D7C00410D8DF9B7CA463A3F7479CB4E3A2745C60C81EDDE7">>},
  {<<"inet_cidr">>, <<"BBEA0ABDF849D8F0884E59EB59FEE6FA2DD393C0D57EB0BCB5A8999DBDE6EB59">>},

diff --git a/src/router_sup.erl b/src/router_sup.erl
@@ -162,9 +162,6 @@ init([]) ->
     {ok,
         {?FLAGS,
             [
-                ?WORKER(router_ics_eui_worker, [ICSOpts]),
-                ?WORKER(router_ics_skf_worker, [ICSOpts]),
-                ?WORKER(router_ics_gateway_location_worker, [ICSOpts]),
                 ?WORKER(ru_poc_denylist, [POCDenyListArgs]),
                 ?WORKER(router_metrics, [MetricsOpts]),
                 ?WORKER(router_db, [DBOpts])
@@ -173,7 +170,10 @@ init([]) ->
                     ?WORKER(router_device_devaddr, [ICSOpts]),
                     ?SUP(router_devices_sup, []),
                     ?SUP(router_console_sup, []),
-                    ?SUP(router_decoder_sup, [])
+                    ?SUP(router_decoder_sup, []),
+                    ?WORKER(router_ics_eui_worker, [ICSOpts]),
+                    ?WORKER(router_ics_skf_worker, [ICSOpts]),
+                    ?WORKER(router_ics_gateway_location_worker, [ICSOpts])
                 ]}}.
 
 %%====================================================================