Adds support for prometheus woody metrics (#32)

* Adds support for prometheus woody metrics * Bumps CI wf * Ignore accidental god-module `lim_turnover_SUITE`
2024-11-06 00:55:22 +00:00 · 2024-10-31 13:47:43 +03:00 · 2024-10-31 13:47:43 +03:00 · 553e18d59b
commit 553e18d59b
parent 0fc3b48a18
6 changed files with 47 additions and 17 deletions
--- a/.github/workflows/erlang-checks.yml
+++ b/.github/workflows/erlang-checks.yml
@ -18,7 +18,7 @@ jobs:
      thrift-version: ${{ steps.thrift-version.outputs.version }}
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
      - run: grep -v '^#' .env >> $GITHUB_ENV
      - id: otp-version
        run: echo "::set-output name=version::$OTP_VERSION"
@ -30,7 +30,7 @@ jobs:
  run:
    name: Run checks
    needs: setup
-    uses: valitydev/erlang-workflows/.github/workflows/erlang-parallel-build.yml@v1.0.10
+    uses: valitydev/erlang-workflows/.github/workflows/erlang-parallel-build.yml@v1.0.15
    with:
      otp-version: ${{ needs.setup.outputs.otp-version }}
      rebar-version: ${{ needs.setup.outputs.rebar-version }}
--- a/apps/limiter/src/limiter.app.src
+++ b/apps/limiter/src/limiter.app.src
@ -5,11 +5,13 @@
    {applications, [
        kernel,
        stdlib,
+        prometheus,
+        prometheus_cowboy,
+        scoper,  % should be before any scoper event handler usage
+        woody,
        limiter_proto,
        xrates_proto,
        machinery,
-        woody,
-        scoper,  % should be before any scoper event handler usage
        erl_health,
        dmt_client,
        opentelemetry_api,
--- a/apps/limiter/src/limiter.erl
+++ b/apps/limiter/src/limiter.erl
@ -17,6 +17,7 @@

 -spec start(normal, any()) -> {ok, pid()} | {error, any()}.
 start(_StartType, _StartArgs) ->
+    ok = setup_metrics(),
    supervisor:start_link({local, ?MODULE}, ?MODULE, []).

 -spec stop(any()) -> ok.
@ -152,3 +153,7 @@ get_service_client(ServiceID) ->
        Url ->
            lim_utils:get_woody_client(Url)
    end.
+
+setup_metrics() ->
+    ok = woody_ranch_prometheus_collector:setup(),
+    ok = woody_hackney_prometheus_collector:setup().
--- a/elvis.config
+++ b/elvis.config
@ -26,7 +26,13 @@
                    {elvis_style, used_ignored_variable, disable},
                    % Tests are usually more comprehensible when a bit more verbose.
                    {elvis_style, dont_repeat_yourself, #{min_complexity => 20}},
-                    {elvis_style, god_modules, #{limit => 50}}
+                    {elvis_style, god_modules, #{
+                        limit => 50,
+                        ignore => [
+                            % NOTE Maybe refactor testsuite by moving helpers to according ct-modules
+                            lim_turnover_SUITE
+                        ]
+                    }}
                ]
            },
            #{
--- a/rebar.config
+++ b/rebar.config
@ -26,6 +26,8 @@

 %% Common project dependencies.
 {deps, [
+    {prometheus, "4.8.1"},
+    {prometheus_cowboy, "0.1.8"},
    {damsel, {git, "https://github.com/valitydev/damsel.git", {branch, "master"}}},
    {limiter_proto, {git, "https://github.com/valitydev/limiter-proto.git", {branch, "master"}}},
    {xrates_proto, {git, "https://github.com/valitydev/xrates-proto.git", {branch, "master"}}},
@ -65,11 +67,6 @@
        {deps, [
            % for introspection on production
            {recon, "2.5.2"},
-            % Because of a dependency conflict, prometheus libs are only included in the prod profile for now
-            % https://github.com/project-fifo/rebar3_lint/issues/42
-            % https://github.com/valitydev/hellgate/pull/2/commits/884724c1799703cee4d1033850fe32c17f986d9e
-            {prometheus, "4.8.1"},
-            {prometheus_cowboy, "0.1.8"},
            {logger_logstash_formatter,
                {git, "https://github.com/valitydev/logger_logstash_formatter.git", {ref, "08a66a6"}}},
            {iosetopts, {git, "https://github.com/valitydev/iosetopts.git", {ref, "edb445c"}}}
@ -122,3 +119,11 @@
        "ct.coverdata"
    ]}
 ]}.
+
+%% NOTE
+%% It is needed to use rebar3 lint plugin
+{overrides, [
+    {del, accept, [{plugins, [{rebar3_archive_plugin, "0.0.2"}]}]},
+    {del, prometheus_cowboy, [{plugins, [{rebar3_archive_plugin, "0.0.1"}]}]},
+    {del, prometheus_httpd, [{plugins, [{rebar3_archive_plugin, "0.0.1"}]}]}
+]}.
--- a/rebar.lock
+++ b/rebar.lock
@ -1,5 +1,6 @@
 {"1.2.0",
-[{<<"acceptor_pool">>,{pkg,<<"acceptor_pool">>,<<"1.0.0">>},2},
+[{<<"accept">>,{pkg,<<"accept">>,<<"0.3.5">>},2},
+ {<<"acceptor_pool">>,{pkg,<<"acceptor_pool">>,<<"1.0.0">>},2},
 {<<"cache">>,{pkg,<<"cache">>,<<"2.3.3">>},1},
 {<<"certifi">>,{pkg,<<"certifi">>,<<"2.8.0">>},2},
 {<<"cg_mon">>,
@ -16,11 +17,11 @@
  0},
 {<<"dmt_client">>,
  {git,"https://github.com/valitydev/dmt_client.git",
-       {ref,"b8bc0281dbf1e55a1a67ef6da861e0353ff14913"}},
+       {ref,"d8a4f490d49c038d96f1cbc2a279164c6f4039f9"}},
  0},
 {<<"dmt_core">>,
  {git,"https://github.com/valitydev/dmt-core.git",
-       {ref,"75841332fe0b40a77da0c12ea8d5dbb994da8e82"}},
+       {ref,"19d8f57198f2cbe5b64aa4a923ba32774e505503"}},
  1},
 {<<"erl_health">>,
  {git,"https://github.com/valitydev/erlang-health.git",
@ -59,7 +60,10 @@
  {pkg,<<"opentelemetry_semantic_conventions">>,<<"0.2.0">>},
  1},
 {<<"parse_trans">>,{pkg,<<"parse_trans">>,<<"3.3.1">>},2},
- {<<"prometheus">>,{pkg,<<"prometheus">>,<<"4.6.0">>},1},
+ {<<"prometheus">>,{pkg,<<"prometheus">>,<<"4.8.1">>},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},
 {<<"ranch">>,{pkg,<<"ranch">>,<<"1.8.0">>},2},
 {<<"scoper">>,
  {git,"https://github.com/valitydev/scoper.git",
@ -80,7 +84,7 @@
 {<<"unicode_util_compat">>,{pkg,<<"unicode_util_compat">>,<<"0.7.0">>},2},
 {<<"woody">>,
  {git,"https://github.com/valitydev/woody_erlang.git",
-       {ref,"81219ba5408e1c67f5eaed3c7e566ede42da88d4"}},
+       {ref,"072825ee7179825a4078feb0649df71303c74157"}},
  0},
 {<<"xrates_proto">>,
  {git,"https://github.com/valitydev/xrates-proto.git",
@ -88,6 +92,7 @@
  0}]}.
 [
 {pkg_hash,[
+ {<<"accept">>, <<"B33B127ABCA7CC948BBE6CAA4C263369ABF1347CFA9D8E699C6D214660F10CD1">>},
 {<<"acceptor_pool">>, <<"43C20D2ACAE35F0C2BCD64F9D2BDE267E459F0F3FD23DAB26485BF518C281B21">>},
 {<<"cache">>, <<"B23A5FE7095445A88412A6E614C933377E0137B44FFED77C9B3FEF1A731A20B2">>},
 {<<"certifi">>, <<"D4FB0A6BB20B7C9C3643E22507E42F356AC090A1DCEA9AB99E27E0376D695EBA">>},
@ -108,12 +113,16 @@
 {<<"opentelemetry_exporter">>, <<"1D8809C0D4F4ACF986405F7700ED11992BCBDB6A4915DD11921E80777FFA7167">>},
 {<<"opentelemetry_semantic_conventions">>, <<"B67FE459C2938FCAB341CB0951C44860C62347C005ACE1B50F8402576F241435">>},
 {<<"parse_trans">>, <<"16328AB840CC09919BD10DAB29E431DA3AF9E9E7E7E6F0089DD5A2D2820011D8">>},
- {<<"prometheus">>, <<"20510F381DB1CCAB818B4CF2FAC5FA6AB5CC91BC364A154399901C001465F46F">>},
+ {<<"prometheus">>, <<"FA76B152555273739C14B06F09F485CF6D5D301FE4E9D31B7FF803D26025D7A0">>},
+ {<<"prometheus_cowboy">>, <<"CFCE0BC7B668C5096639084FCD873826E6220EA714BF60A716F5BD080EF2A99C">>},
+ {<<"prometheus_httpd">>, <<"F616ED9B85B536B195D94104063025A91F904A4CFC20255363F49A197D96C896">>},
+ {<<"quantile_estimator">>, <<"EF50A361F11B5F26B5F16D0696E46A9E4661756492C981F7B2229EF42FF1CD15">>},
 {<<"ranch">>, <<"8C7A100A139FD57F17327B6413E4167AC559FBC04CA7448E9BE9057311597A1D">>},
 {<<"ssl_verify_fun">>, <<"354C321CF377240C7B8716899E182CE4890C5938111A1296ADD3EC74CF1715DF">>},
 {<<"tls_certificate_check">>, <<"C76C4C5D79EE79A2B11C84F910C825D6F024A78427C854F515748E9BD025E987">>},
 {<<"unicode_util_compat">>, <<"BC84380C9AB48177092F43AC89E4DFA2C6D62B40B8BD132B1059ECC7232F9A78">>}]},
 {pkg_hash_ext,[
+ {<<"accept">>, <<"11B18C220BCC2EAB63B5470C038EF10EB6783BCB1FCDB11AA4137DEFA5AC1BB8">>},
 {<<"acceptor_pool">>, <<"0CBCD83FDC8B9AD2EEE2067EF8B91A14858A5883CB7CD800E6FCD5803E158788">>},
 {<<"cache">>, <<"44516CE6FA03594D3A2AF025DD3A87BFE711000EB730219E1DDEFC816E0AA2F4">>},
 {<<"certifi">>, <<"6AC7EFC1C6F8600B08D625292D4BBF584E14847CE1B6B5C44D983D273E1097EA">>},
@ -134,7 +143,10 @@
 {<<"opentelemetry_exporter">>, <<"2B40007F509D38361744882FD060A8841AF772AB83BB542AA5350908B303AD65">>},
 {<<"opentelemetry_semantic_conventions">>, <<"D61FA1F5639EE8668D74B527E6806E0503EFC55A42DB7B5F39939D84C07D6895">>},
 {<<"parse_trans">>, <<"07CD9577885F56362D414E8C4C4E6BDF10D43A8767ABB92D24CBE8B24C54888B">>},
- {<<"prometheus">>, <<"4905FD2992F8038ECCD7AA0CD22F40637ED618C0BED1F75C05AACEC15B7545DE">>},
+ {<<"prometheus">>, <<"6EDFBE928D271C7F657A6F2C46258738086584BD6CAE4A000B8B9A6009BA23A5">>},
+ {<<"prometheus_cowboy">>, <<"BA286BECA9302618418892D37BCD5DC669A6CC001F4EB6D6AF85FF81F3F4F34C">>},
+ {<<"prometheus_httpd">>, <<"0BBE831452CFDF9588538EB2F570B26F30C348ADAE5E95A7D87F35A5910BCF92">>},
+ {<<"quantile_estimator">>, <<"282A8A323CA2A845C9E6F787D166348F776C1D4A41EDE63046D72D422E3DA946">>},
 {<<"ranch">>, <<"49FBCFD3682FAB1F5D109351B61257676DA1A2FDBE295904176D5E521A2DDFE5">>},
 {<<"ssl_verify_fun">>, <<"FE4C190E8F37401D30167C8C405EDA19469F34577987C76DDE613E838BBC67F8">>},
 {<<"tls_certificate_check">>, <<"4083B4A298ADD534C96125337CB01161C358BB32DD870D5A893AAE685FD91D70">>},