update deps, explicitly register collectors

Author: deadtrickster

src/collectors/prometheus_rabbitmq_exchanges_collector.erl

@@ -19,8 +19,6 @@
 
 -define(METRIC_NAME_PREFIX, "rabbitmq_exchange_").
 
--define(EXCHANGE_METRIC_NAME(S), ?METRIC_NAME_PREFIX ++ atom_to_list(S)).
-
 -define(EXCHANGE_GAUGES, []).
 
 -define(EXCHANGE_COUNTERS, []).
@@ -39,8 +37,8 @@ deregister_cleanup(_) -> ok.
 
 collect_mf(_Registry, Callback) ->
   AllQueues = lists:merge([[Exchange || Exchange <- list_exchanges(VHost)] || [{name, VHost}] <- rabbit_vhost:info_all([name])]),
-  [Callback(create_gauge(?EXCHANGE_METRIC_NAME(QueueKey), Help, {QueueKey, AllQueues})) || {QueueKey, Help} <- ?EXCHANGE_GAUGES],
-  [Callback(create_counter(?EXCHANGE_METRIC_NAME(QueueKey), Help, {QueueKey, AllQueues})) || {QueueKey, Help} <- ?EXCHANGE_COUNTERS],
+  [Callback(create_gauge(?METRIC_NAME(QueueKey), Help, {QueueKey, AllQueues})) || {QueueKey, Help} <- ?EXCHANGE_GAUGES],
+  [Callback(create_counter(?METRIC_NAME(QueueKey), Help, {QueueKey, AllQueues})) || {QueueKey, Help} <- ?EXCHANGE_COUNTERS],
 
   case prometheus_rabbitmq_exporter_config:exchange_messages_stat() of
     [] ->
@@ -65,7 +63,7 @@ labels(Exchange) ->
    {type, exchange_type(Exchange)}].
 
 collect_messages_stat(Callback, AllQueues, MessagesStat) ->
-  [Callback(create_counter(?EXCHANGE_METRIC_NAME(MetricName), Help, {messages_stat, MSKey, AllQueues}))
+  [Callback(create_counter(?METRIC_NAME(MetricName), Help, {messages_stat, MSKey, AllQueues}))
    || {MSKey, MetricName, Help} <- prometheus_rabbitmq_message_stats:metrics(), lists:member(MetricName, MessagesStat)].
 
 %% emit_counter_metric_if_defined(Exchange, Value) ->

src/collectors/prometheus_rabbitmq_mnesia_tables_collector.erl

@@ -40,8 +40,6 @@
 
 -define(METRIC_NAME_PREFIX, "rabbitmq_mnesia_table_").
 
--define(METRIC_NAME(S), ?METRIC_NAME_PREFIX ++ atom_to_list(S)).
-
 %% metric {Key, Type, Help, &optional Fun}
 -define(METRICS, [{read_only, untyped, "Access mode of the table, 1 if table is read_only or 0 otherwise.",
                    fun(_T, Info) ->

src/collectors/prometheus_rabbitmq_overview_collector.erl

@@ -19,7 +19,7 @@
 -behaviour(prometheus_collector).
 
 -define(METRIC_NAME_PREFIX, "rabbitmq_").
--define(METRIC_NAME(S), ?METRIC_NAME_PREFIX ++ atom_to_list(S)).
+
 -define(MESSAGE_STAT, [{queues_disk_reads, counter, "Total number of times messages have been read from disk by all queues.",
                         fun (Stat) ->
                             proplists:get_value(disk_reads, Stat)

src/collectors/prometheus_rabbitmq_queues_collector.erl

@@ -21,8 +21,6 @@
 
 -define(METRIC_NAME_PREFIX, "rabbitmq_queue_").
 
--define(METRIC_NAME(S), ?METRIC_NAME_PREFIX ++ atom_to_list(S)).
-
 -define(METRICS, [{durable, boolean, "Whether or not the queue survives server restarts."},
                   {auto_delete, boolean, "Whether the queue will be deleted automatically when no longer used."},
                   {exclusive, boolean, "True if queue is exclusive (i.e. has owner_pid), false otherwise."},

src/prometheus_rabbitmq_exporter.erl

@@ -6,6 +6,11 @@
 
 dispatcher() ->
   {ok, _} = application:ensure_all_started(prometheus),
+  prometheus_registry:register_collector(prometheus_rabbitmq_exchanges_collector),
+  prometheus_registry:register_collector(prometheus_rabbitmq_mnesia_tables_collector),
+  prometheus_registry:register_collector(prometheus_rabbitmq_nodes_collector),
+  prometheus_registry:register_collector(prometheus_rabbitmq_overview_collector),
+  prometheus_registry:register_collector(prometheus_rabbitmq_queues_collector),
   Path = prometheus_rabbitmq_exporter_config:path(),
   Registry = default,