Pass seshat labels as maps

Author: mkuratczyk

deps/rabbit/src/rabbit_global_counters.erl

@@ -132,46 +132,46 @@
 boot_step() ->
     [begin
          %% Protocol counters
-         Protocol = {protocol, Proto},
-         init([Protocol]),
+         Protocol = #{protocol => Proto},
+         init(Protocol),
          rabbit_msg_size_metrics:init(Proto),
 
          %% Protocol & Queue Type counters
-         init([Protocol, {queue_type, rabbit_classic_queue}]),
-         init([Protocol, {queue_type, rabbit_quorum_queue}]),
-         init([Protocol, {queue_type, rabbit_stream_queue}])
+         init(Protocol#{queue_type => rabbit_classic_queue}),
+         init(Protocol#{queue_type => rabbit_quorum_queue}),
+         init(Protocol#{queue_type => rabbit_stream_queue})
      end || Proto <- [amqp091, amqp10]],
 
     %% Dead Letter counters
     %%
     %% Streams never dead letter.
     %%
     %% Source classic queue dead letters.
-    init([{queue_type, rabbit_classic_queue}, {dead_letter_strategy, disabled}],
+    init(#{queue_type => rabbit_classic_queue, dead_letter_strategy => disabled},
          [?MESSAGES_DEAD_LETTERED_MAXLEN_COUNTER,
           ?MESSAGES_DEAD_LETTERED_EXPIRED_COUNTER,
           ?MESSAGES_DEAD_LETTERED_REJECTED_COUNTER]),
-    init([{queue_type, rabbit_classic_queue}, {dead_letter_strategy, at_most_once}],
+    init(#{queue_type => rabbit_classic_queue, dead_letter_strategy => at_most_once},
          [?MESSAGES_DEAD_LETTERED_MAXLEN_COUNTER,
           ?MESSAGES_DEAD_LETTERED_EXPIRED_COUNTER,
           ?MESSAGES_DEAD_LETTERED_REJECTED_COUNTER]),
     %%
     %% Source quorum queue dead letters.
     %% Only quorum queues can dead letter due to delivery-limit exceeded.
     %% Only quorum queues support dead letter strategy at-least-once.
-    init([{queue_type, rabbit_quorum_queue}, {dead_letter_strategy, disabled}],
+    init(#{queue_type => rabbit_quorum_queue, dead_letter_strategy => disabled},
          [?MESSAGES_DEAD_LETTERED_MAXLEN_COUNTER,
           ?MESSAGES_DEAD_LETTERED_EXPIRED_COUNTER,
           ?MESSAGES_DEAD_LETTERED_REJECTED_COUNTER,
           ?MESSAGES_DEAD_LETTERED_DELIVERY_LIMIT_COUNTER
          ]),
-    init([{queue_type, rabbit_quorum_queue}, {dead_letter_strategy, at_most_once}],
+    init(#{queue_type => rabbit_quorum_queue, dead_letter_strategy => at_most_once},
          [?MESSAGES_DEAD_LETTERED_MAXLEN_COUNTER,
           ?MESSAGES_DEAD_LETTERED_EXPIRED_COUNTER,
           ?MESSAGES_DEAD_LETTERED_REJECTED_COUNTER,
           ?MESSAGES_DEAD_LETTERED_DELIVERY_LIMIT_COUNTER
          ]),
-    init([{queue_type, rabbit_quorum_queue}, {dead_letter_strategy, at_least_once}],
+    init(#{queue_type => rabbit_quorum_queue, dead_letter_strategy => at_least_once},
          [?MESSAGES_DEAD_LETTERED_CONFIRMED_COUNTER,
           ?MESSAGES_DEAD_LETTERED_EXPIRED_COUNTER,
           ?MESSAGES_DEAD_LETTERED_REJECTED_COUNTER,
@@ -181,15 +181,15 @@ boot_step() ->
 init(Labels) ->
     init(Labels, []).
 
-init(Labels = [{protocol, Protocol}, {queue_type, QueueType}], Extra) ->
+init(Labels = #{protocol := Protocol, queue_type := QueueType}, Extra) ->
     _ = seshat:new_group(?MODULE),
     Counters = seshat:new(?MODULE, Labels, ?PROTOCOL_QUEUE_TYPE_COUNTERS ++ Extra, Labels),
     persistent_term:put({?MODULE, Protocol, QueueType}, Counters);
-init(Labels = [{protocol, Protocol}], Extra) ->
+init(Labels = #{protocol := Protocol}, Extra) ->
     _ = seshat:new_group(?MODULE),
     Counters = seshat:new(?MODULE, Labels, ?PROTOCOL_COUNTERS ++ Extra, Labels),
     persistent_term:put({?MODULE, Protocol}, Counters);
-init(Labels = [{queue_type, QueueType}, {dead_letter_strategy, DLS}], DeadLetterCounters) ->
+init(Labels = #{queue_type := QueueType, dead_letter_strategy := DLS}, DeadLetterCounters) ->
     _ = seshat:new_group(?MODULE),
     Counters = seshat:new(?MODULE, Labels, DeadLetterCounters, Labels),
     persistent_term:put({?MODULE, QueueType, DLS}, Counters).

deps/rabbitmq_mqtt/src/rabbit_mqtt.erl

@@ -80,15 +80,15 @@ init_global_counters() ->
     lists:foreach(fun init_global_counters/1, [?MQTT_PROTO_V3,
                                                ?MQTT_PROTO_V4,
                                                ?MQTT_PROTO_V5]),
-    rabbit_global_counters:init([{queue_type, ?QUEUE_TYPE_QOS_0}, {dead_letter_strategy, disabled}],
+    rabbit_global_counters:init(#{queue_type => ?QUEUE_TYPE_QOS_0, dead_letter_strategy => disabled},
                                 [?MESSAGES_DEAD_LETTERED_MAXLEN_COUNTER]).
 
 init_global_counters(ProtoVer) ->
-    Proto = {protocol, ProtoVer},
-    rabbit_global_counters:init([Proto]),
-    rabbit_global_counters:init([Proto, {queue_type, rabbit_classic_queue}]),
-    rabbit_global_counters:init([Proto, {queue_type, rabbit_quorum_queue}]),
-    rabbit_global_counters:init([Proto, {queue_type, ?QUEUE_TYPE_QOS_0}]),
+    Proto = #{protocol => ProtoVer},
+    rabbit_global_counters:init(Proto),
+    rabbit_global_counters:init(Proto#{queue_type => rabbit_classic_queue}),
+    rabbit_global_counters:init(Proto#{queue_type => rabbit_quorum_queue}),
+    rabbit_global_counters:init(Proto#{queue_type => ?QUEUE_TYPE_QOS_0}),
     rabbit_msg_size_metrics:init(ProtoVer).
 
 persist_static_configuration() ->

deps/rabbitmq_stream/src/rabbit_stream.erl

@@ -40,10 +40,10 @@
 
 start(_Type, _Args) ->
     rabbit_stream_metrics:init(),
-    rabbit_global_counters:init([{protocol, stream}],
+    rabbit_global_counters:init(#{protocol => stream},
                                 ?PROTOCOL_COUNTERS),
-    rabbit_global_counters:init([{protocol, stream},
-                                 {queue_type, ?STREAM_QUEUE_TYPE}]),
+    rabbit_global_counters:init(#{protocol => stream,
+                                 queue_type => ?STREAM_QUEUE_TYPE}),
     rabbit_stream_sup:start_link().
 
 tls_host() ->