+woody +ranch 2 support (#6)

elvis.config

@@ -33,7 +33,7 @@
                     {elvis_text_style, line_length, #{limit => 120, skip_comments => false}},
                     {elvis_text_style, no_tabs},
                     {elvis_text_style, no_trailing_whitespace},
-                    {elvis_project, no_deps_master_rebar, #{ignore => [genlib, how_are_you]}}
+                    {elvis_project, no_deps_master_rebar, #{ignore => [genlib, how_are_you, woody]}}
                 ]
             },
             #{

rebar.config

@@ -26,7 +26,7 @@
 
 %% Common project dependencies.
 {deps, [
-    {ranch, "1.8.0"},
+    {woody, {git, "https://github.com/rbkmoney/woody_erlang.git", {branch, "master"}}},
     {genlib, {git, "https://github.com/rbkmoney/genlib.git", {branch, "master"}}},
     {how_are_you, {git, "https://github.com/rbkmoney/how_are_you.git", {branch, "master"}}}
 ]}.

rebar.lock

@@ -1,9 +1,13 @@
 {"1.2.0",
 [{<<"bear">>,{pkg,<<"bear">>,<<"0.9.0">>},2},
+ {<<"cache">>,{pkg,<<"cache">>,<<"2.3.3">>},1},
+ {<<"certifi">>,{pkg,<<"certifi">>,<<"2.6.1">>},2},
  {<<"cg_mon">>,
   {git,"https://github.com/rbkmoney/cg_mon.git",
        {ref,"5a87a37694e42b6592d3b4164ae54e0e87e24e18"}},
   1},
+ {<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.9.0">>},1},
+ {<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.11.0">>},2},
  {<<"folsom">>,
   {git,"https://github.com/folsom-project/folsom.git",
        {ref,"62fd0714e6f0b4e7833880afe371a9c882ea0fc2"}},
@@ -12,16 +16,60 @@
   {git,"https://github.com/rbkmoney/genlib.git",
        {ref,"2bbc54d4abe0f779d57c8f5911dce64d295b1cd1"}},
   0},
+ {<<"gproc">>,{pkg,<<"gproc">>,<<"0.9.0">>},1},
+ {<<"hackney">>,{pkg,<<"hackney">>,<<"1.17.4">>},1},
  {<<"how_are_you">>,
   {git,"https://github.com/rbkmoney/how_are_you.git",
        {ref,"2fd8013420328464c2c84302af2781b86577b39f"}},
   0},
- {<<"ranch">>,{pkg,<<"ranch">>,<<"1.8.0">>},0}]}.
+ {<<"idna">>,{pkg,<<"idna">>,<<"6.1.1">>},2},
+ {<<"metrics">>,{pkg,<<"metrics">>,<<"1.0.1">>},2},
+ {<<"mimerl">>,{pkg,<<"mimerl">>,<<"1.2.0">>},2},
+ {<<"parse_trans">>,{pkg,<<"parse_trans">>,<<"3.3.1">>},2},
+ {<<"ranch">>,{pkg,<<"ranch">>,<<"1.8.0">>},2},
+ {<<"snowflake">>,
+  {git,"https://github.com/rbkmoney/snowflake.git",
+       {ref,"de159486ef40cec67074afe71882bdc7f7deab72"}},
+  1},
+ {<<"ssl_verify_fun">>,{pkg,<<"ssl_verify_fun">>,<<"1.1.6">>},2},
+ {<<"thrift">>,
+  {git,"https://github.com/rbkmoney/thrift_erlang.git",
+       {ref,"846a0819d9b6d09d0c31f160e33a78dbad2067b4"}},
+  1},
+ {<<"unicode_util_compat">>,{pkg,<<"unicode_util_compat">>,<<"0.7.0">>},2},
+ {<<"woody">>,
+  {git,"https://github.com/rbkmoney/woody_erlang.git",
+       {ref,"330bdcf71e99c2ea7aed424cd718939cb360ec1c"}},
+  0}]}.
 [
 {pkg_hash,[
  {<<"bear">>, <<"A31CCF5361791DD5E708F4789D67E2FEF496C4F05935FC59ADC11622F834D128">>},
- {<<"ranch">>, <<"8C7A100A139FD57F17327B6413E4167AC559FBC04CA7448E9BE9057311597A1D">>}]},
+ {<<"cache">>, <<"B23A5FE7095445A88412A6E614C933377E0137B44FFED77C9B3FEF1A731A20B2">>},
+ {<<"certifi">>, <<"DBAB8E5E155A0763EEA978C913CA280A6B544BFA115633FA20249C3D396D9493">>},
+ {<<"cowboy">>, <<"865DD8B6607E14CF03282E10E934023A1BD8BE6F6BACF921A7E2A96D800CD452">>},
+ {<<"cowlib">>, <<"0B9FF9C346629256C42EBE1EEB769A83C6CB771A6EE5960BD110AB0B9B872063">>},
+ {<<"gproc">>, <<"853CCB7805E9ADA25D227A157BA966F7B34508F386A3E7E21992B1B484230699">>},
+ {<<"hackney">>, <<"99DA4674592504D3FB0CFEF0DB84C3BA02B4508BAE2DFF8C0108BAA0D6E0977C">>},
+ {<<"idna">>, <<"8A63070E9F7D0C62EB9D9FCB360A7DE382448200FBBD1B106CC96D3D8099DF8D">>},
+ {<<"metrics">>, <<"25F094DEA2CDA98213CECC3AEFF09E940299D950904393B2A29D191C346A8486">>},
+ {<<"mimerl">>, <<"67E2D3F571088D5CFD3E550C383094B47159F3EEE8FFA08E64106CDF5E981BE3">>},
+ {<<"parse_trans">>, <<"16328AB840CC09919BD10DAB29E431DA3AF9E9E7E7E6F0089DD5A2D2820011D8">>},
+ {<<"ranch">>, <<"8C7A100A139FD57F17327B6413E4167AC559FBC04CA7448E9BE9057311597A1D">>},
+ {<<"ssl_verify_fun">>, <<"CF344F5692C82D2CD7554F5EC8FD961548D4FD09E7D22F5B62482E5AEAEBD4B0">>},
+ {<<"unicode_util_compat">>, <<"BC84380C9AB48177092F43AC89E4DFA2C6D62B40B8BD132B1059ECC7232F9A78">>}]},
 {pkg_hash_ext,[
  {<<"bear">>, <<"47F71F098F2E3CD05E124A896C5EC2F155967A2B6FF6731E0D627312CCAB7E28">>},
- {<<"ranch">>, <<"49FBCFD3682FAB1F5D109351B61257676DA1A2FDBE295904176D5E521A2DDFE5">>}]}
+ {<<"cache">>, <<"44516CE6FA03594D3A2AF025DD3A87BFE711000EB730219E1DDEFC816E0AA2F4">>},
+ {<<"certifi">>, <<"524C97B4991B3849DD5C17A631223896272C6B0AF446778BA4675A1DFF53BB7E">>},
+ {<<"cowboy">>, <<"2C729F934B4E1AA149AFF882F57C6372C15399A20D54F65C8D67BEF583021BDE">>},
+ {<<"cowlib">>, <<"2B3E9DA0B21C4565751A6D4901C20D1B4CC25CBB7FD50D91D2AB6DD287BC86A9">>},
+ {<<"gproc">>, <<"587E8AF698CCD3504CF4BA8D90F893EDE2B0F58CABB8A916E2BF9321DE3CF10B">>},
+ {<<"hackney">>, <<"DE16FF4996556C8548D512F4DBE22DD58A587BF3332E7FD362430A7EF3986B16">>},
+ {<<"idna">>, <<"92376EB7894412ED19AC475E4A86F7B413C1B9FBB5BD16DCCD57934157944CEA">>},
+ {<<"metrics">>, <<"69B09ADDDC4F74A40716AE54D140F93BEB0FB8978D8636EADED0C31B6F099F16">>},
+ {<<"mimerl">>, <<"F278585650AA581986264638EBF698F8BB19DF297F66AD91B18910DFC6E19323">>},
+ {<<"parse_trans">>, <<"07CD9577885F56362D414E8C4C4E6BDF10D43A8767ABB92D24CBE8B24C54888B">>},
+ {<<"ranch">>, <<"49FBCFD3682FAB1F5D109351B61257676DA1A2FDBE295904176D5E521A2DDFE5">>},
+ {<<"ssl_verify_fun">>, <<"BDB0D2471F453C88FF3908E7686F86F9BE327D065CC1EC16FA4540197EA04680">>},
+ {<<"unicode_util_compat">>, <<"25EEE6D67DF61960CF6A794239566599B09E17E668D3700247BC498638152521">>}]}
 ].

src/woody_api_hay.app.src

@@ -5,7 +5,7 @@
         kernel,
         stdlib,
         genlib,
-        ranch
+        woody
     ]},
     {env, []},
     {maintainers, [

src/woody_api_hay.erl

@@ -62,10 +62,22 @@ create_server_metrics({Ref, Nconns}) when is_tuple(Ref) ->
 create_server_metrics({Ref, Nconns}) ->
     gauge([woody, server, Ref, active_connections], Nconns).
 
-get_ranch_info() ->
-    ranch:info().
-
 get_active_connections() ->
+    get_active_connections(ranch:info()).
+
+-dialyzer({no_match, get_active_connections/1}).
+
+%% ranch 2x
+get_active_connections(#{} = RanchInfo) ->
+    F = fun
+        (Ref, #{active_connections := N}) ->
+            {Ref, N};
+        (_Ref, _Info) ->
+            0
+    end,
+    [F(Ref, maps:get(Ref, RanchInfo)) || Ref <- maps:keys(RanchInfo)];
+%% ranch 1x
+get_active_connections(RanchInfo) ->
     F = fun({Ref, Info}) ->
         Nconns =
             case lists:keyfind(active_connections, 1, Info) of
@@ -74,7 +86,7 @@ get_active_connections() ->
             end,
         {Ref, Nconns}
     end,
-    lists:map(F, get_ranch_info()).
+    lists:map(F, RanchInfo).
 
 -spec gauge(metric_key(), metric_value()) -> metric().
 gauge(Key, Value) ->