From 4d5adda5bc133eb7085d71baf79e32037d0e2399 Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Tue, 21 Jan 2020 14:39:36 +0100 Subject: [PATCH 1/4] move prometheus dependency to test profile --- rebar.config | 4 ++-- rebar.lock | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/rebar.config b/rebar.config index 9de40d8..7373969 100644 --- a/rebar.config +++ b/rebar.config @@ -1,11 +1,11 @@ -{deps, [{accept, "0.3.3"}, - {prometheus, "3.4.0"}]}. +{deps, [{accept, "0.3.3"}]}. {xref_checks, [undefined_function_calls,locals_not_used]}. {dialyzer, [{base_plt_apps, [elli]}]}. {profiles, [{test, [{deps, [{elli, "2.0.1"}, + {prometheus, "3.4.0"}, {prometheus_process_collector, "1.0.2"}]}]}, {docs, [{deps, [{elli, "2.0.1"}, {edown, "0.8.1"}]}]} diff --git a/rebar.lock b/rebar.lock index 004016e..c3999dd 100644 --- a/rebar.lock +++ b/rebar.lock @@ -1,8 +1,6 @@ {"1.1.0", -[{<<"accept">>,{pkg,<<"accept">>,<<"0.3.3">>},0}, - {<<"prometheus">>,{pkg,<<"prometheus">>,<<"3.4.0">>},0}]}. +[{<<"accept">>,{pkg,<<"accept">>,<<"0.3.3">>},0}]}. [ {pkg_hash,[ - {<<"accept">>, <<"548EBB6FB2E8B0D170E75BB6123AEA6CEECB0189BB1231EEADF52EAC08384A97">>}, - {<<"prometheus">>, <<"91759726F2E384DF2EF48DAF039D506705A7AA81DCBBB2DBFFEE1FD0C5431D32">>}]} + {<<"accept">>, <<"548EBB6FB2E8B0D170E75BB6123AEA6CEECB0189BB1231EEADF52EAC08384A97">>}]} ]. From ff331fae64774213b392d03061acc68d6ebef248 Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Tue, 21 Jan 2020 14:39:50 +0100 Subject: [PATCH 2/4] fix tests --- test/elli_prometheus_tests.erl | 52 +++++++++++++++++----------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/test/elli_prometheus_tests.erl b/test/elli_prometheus_tests.erl index 46f1809..85a9623 100644 --- a/test/elli_prometheus_tests.erl +++ b/test/elli_prometheus_tests.erl @@ -4,43 +4,43 @@ -define(README, "README.md"). --define(EMPTY_SCRAPE_TEXT, - "# TYPE http_client_closed_total counter +-define(EMPTY_SCRAPE_TEXT, "# HELP elli_up Elli is up? +# HELP http_bad_requests_total HTTP request \"bad_request\" errors count # HELP http_client_closed_total HTTP request \"client_closed\" errors count -# TYPE http_requests_failed_total counter -# HELP http_requests_failed_total HTTP request failed total count. -# TYPE http_client_timeout_total counter # HELP http_client_timeout_total HTTP request \"client_timeout\" errors count -# TYPE http_bad_requests_total counter -# HELP http_bad_requests_total HTTP request \"bad_request\" errors count -# TYPE http_requests_total counter -# HELP http_requests_total HTTP request request count -# TYPE http_request_duration_microseconds histogram +# HELP http_request_body_microseconds HTTP request time spent receiving and parsing body # HELP http_request_duration_microseconds HTTP request latencies in microseconds -# TYPE http_request_headers_microseconds histogram # HELP http_request_headers_microseconds HTTP request time spent receiving and parsing headers -# TYPE http_request_user_microseconds histogram # HELP http_request_user_microseconds HTTP request time spent in user callback -# TYPE http_response_send_microseconds histogram +# HELP http_requests_failed_total HTTP request failed total count. +# HELP http_requests_total HTTP request request count +# HELP http_response_body_size_bytes HTTP request response body size +# HELP http_response_headers_size_bytes HTTP request response headers size # HELP http_response_send_microseconds HTTP request time spent sending reply +# HELP http_response_size_bytes HTTP request total response size +# HELP telemetry_scrape_duration_seconds Scrape duration +# HELP telemetry_scrape_encoded_size_bytes Scrape size, encoded +# HELP telemetry_scrape_size_bytes Scrape size, not encoded +# TYPE elli_up gauge +# TYPE http_bad_requests_total counter +# TYPE http_client_closed_total counter +# TYPE http_client_timeout_total counter # TYPE http_request_body_microseconds histogram -# HELP http_request_body_microseconds HTTP request time spent receiving and parsing body +# TYPE http_request_duration_microseconds histogram +# TYPE http_request_headers_microseconds histogram +# TYPE http_request_user_microseconds histogram +# TYPE http_requests_failed_total counter +# TYPE http_requests_total counter # TYPE http_response_body_size_bytes summary -# HELP http_response_body_size_bytes HTTP request response body size -# TYPE telemetry_scrape_duration_seconds summary -# HELP telemetry_scrape_duration_seconds Scrape duration +# TYPE http_response_headers_size_bytes summary +# TYPE http_response_send_microseconds histogram # TYPE http_response_size_bytes summary -# HELP http_response_size_bytes HTTP request total response size -# TYPE telemetry_scrape_size_bytes summary -# HELP telemetry_scrape_size_bytes Scrape size, not encoded +# TYPE telemetry_scrape_duration_seconds summary # TYPE telemetry_scrape_encoded_size_bytes summary -# HELP telemetry_scrape_encoded_size_bytes Scrape size, encoded -# TYPE http_response_headers_size_bytes summary -# HELP http_response_headers_size_bytes HTTP request response headers size - -"). +# TYPE telemetry_scrape_size_bytes summary +elli_up 1"). --define(EMPTY_SCRAPE_SIZE, 1876). +-define(EMPTY_SCRAPE_SIZE, 1934). normalize_text_scrape(Scrape) -> lists:sort(lists:map(fun string:strip/1, string:tokens(Scrape, "\n"))). From 2f3f6572302ce84fae2b8d2e692bb8145449edce Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Tue, 21 Jan 2020 14:51:29 +0100 Subject: [PATCH 3/4] update deps, eunit, lint and dialyzer pass (on test profile) --- rebar.config | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rebar.config b/rebar.config index 7373969..af733fd 100644 --- a/rebar.config +++ b/rebar.config @@ -1,13 +1,13 @@ -{deps, [{accept, "0.3.3"}]}. +{deps, [{accept, "0.3.5"}]}. {xref_checks, [undefined_function_calls,locals_not_used]}. {dialyzer, [{base_plt_apps, [elli]}]}. -{profiles, [{test, [{deps, [{elli, "2.0.1"}, - {prometheus, "3.4.0"}, - {prometheus_process_collector, "1.0.2"}]}]}, - {docs, [{deps, [{elli, "2.0.1"}, +{profiles, [{test, [{deps, [{elli, "3.2.0"}, + {prometheus, "4.4.1"}, + {prometheus_process_collector, "1.4.5"}]}]}, + {docs, [{deps, [{elli, "3.2.0"}, {edown, "0.8.1"}]}]} ]}. @@ -27,7 +27,7 @@ {project_plugins, [ {coveralls, "1.3.0"}, - {rebar3_lint, "0.1.7"} + {rebar3_lint, "0.1.11"} ]}. {provider_hooks, [{pre, [{eunit, lint}]}]}. From cadd1d1732d0b6dda3e5bbe0937a84b3ab376c1e Mon Sep 17 00:00:00 2001 From: Mariano Guerra Date: Tue, 21 Jan 2020 15:26:05 +0100 Subject: [PATCH 4/4] revert rebar3_lint version update --- rebar.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rebar.config b/rebar.config index af733fd..382f86f 100644 --- a/rebar.config +++ b/rebar.config @@ -27,7 +27,7 @@ {project_plugins, [ {coveralls, "1.3.0"}, - {rebar3_lint, "0.1.11"} + {rebar3_lint, "0.1.7"} ]}. {provider_hooks, [{pre, [{eunit, lint}]}]}.