Skip to content

Commit 5396599

Browse files
michaelklishinmergify[bot]
authored andcommitted
Assertions for #11743
(cherry picked from commit c361edd)
1 parent d1a7167 commit 5396599

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

deps/rabbitmq_prometheus/src/collectors/prometheus_rabbitmq_core_metrics_collector.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757

5858
-define(METRICS_RAW, [
5959

60-
%%% Those are global, i.e. they contain no reference to queue/vhost/channel
60+
%% Global metrics, as in, they contain no references to queues, virtual hosts or channel
6161
{connection_churn_metrics, [
6262
{2, undefined, connections_opened_total, counter, "Total number of connections opened"},
6363
{3, undefined, connections_closed_total, counter, "Total number of connections closed or terminated"},

deps/rabbitmq_prometheus/test/rabbit_prometheus_http_SUITE.erl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,10 @@ aggregated_metrics_test(Config) ->
381381
?assertEqual(match, re:run(Body, "^rabbitmq_queue_consumers ", [{capture, none}, multiline])),
382382
?assertEqual(match, re:run(Body, "TYPE rabbitmq_auth_attempts_total", [{capture, none}, multiline])),
383383
?assertEqual(nomatch, re:run(Body, "TYPE rabbitmq_auth_attempts_detailed_total", [{capture, none}, multiline])),
384+
%% Memory breakdown
385+
?assertEqual(match, re:run(Body, "^rabbitmq_memory_quorum_queue_erlang_process_bytes ", [{capture, none}, multiline])),
386+
?assertEqual(match, re:run(Body, "^rabbitmq_memory_classic_queue_erlang_process_bytes ", [{capture, none}, multiline])),
387+
?assertEqual(match, re:run(Body, "^rabbitmq_memory_binary_heap_bytes ", [{capture, none}, multiline])),
384388
%% Check the first metric value in each ETS table that requires converting
385389
?assertEqual(match, re:run(Body, "^rabbitmq_erlang_uptime_seconds ", [{capture, none}, multiline])),
386390
?assertEqual(match, re:run(Body, "^rabbitmq_io_read_time_seconds_total ", [{capture, none}, multiline])),

0 commit comments

Comments
 (0)