Skip to content

Commit

Permalink
Merge pull request #25 from marianoguerra/update-deps
Browse files Browse the repository at this point in the history
Update deps
  • Loading branch information
yurrriq committed Jan 21, 2020
2 parents 364b024 + cadd1d1 commit 2660783
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 35 deletions.
10 changes: 5 additions & 5 deletions rebar.config
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{deps, [{accept, "0.3.3"},
{prometheus, "3.4.0"}]}.
{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_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"}]}]}
]}.

Expand Down
6 changes: 2 additions & 4 deletions rebar.lock
Original file line number Diff line number Diff line change
@@ -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">>}]}
].
52 changes: 26 additions & 26 deletions test/elli_prometheus_tests.erl
Original file line number Diff line number Diff line change
Expand Up @@ -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"))).
Expand Down

0 comments on commit 2660783

Please sign in to comment.