Use maps for global metric labels

Author: mkuratczyk

deps/rabbit/test/amqp_client_SUITE.erl

@@ -6911,11 +6911,11 @@ formatted_state(Pid) ->
     proplists:get_value("State", L2).
 
 get_global_counters(Config) ->
-    get_global_counters0(Config, [{protocol, amqp10}]).
+    get_global_counters0(Config, #{protocol => amqp10}).
 
 get_global_counters(Config, QType) ->
-    get_global_counters0(Config, [{protocol, amqp10},
-                                  {queue_type, QType}]).
+    get_global_counters0(Config, #{protocol => amqp10,
+                                   queue_type => QType}).
 
 get_global_counters0(Config, Key) ->
     Overview = rpc(Config, rabbit_global_counters, overview, []),

deps/rabbit/test/dead_lettering_SUITE.erl

@@ -1928,7 +1928,7 @@ counted(Metric, Config) ->
         metric(QueueType, Strategy, Metric, OldCounters).
 
 metric(QueueType, Strategy, Metric, Counters) ->
-    Metrics = maps:get([{queue_type, QueueType}, {dead_letter_strategy, Strategy}], Counters),
+    Metrics = maps:get(#{queue_type => QueueType, dead_letter_strategy => Strategy}, Counters),
     maps:get(Metric, Metrics).
 
 group_name(Config) ->

deps/rabbit/test/queue_type_SUITE.erl

@@ -162,7 +162,7 @@ smoke(Config) ->
     ok = publish_and_confirm(Ch, <<"non-existent_queue">>, <<"msg4">>),
     ConsumerTag3 = <<"ctag3">>,
     ok = subscribe(Ch, QName, ConsumerTag3),
-    ProtocolCounters = maps:get([{protocol, amqp091}], get_global_counters(Config)),
+    ProtocolCounters = maps:get(#{protocol => amqp091}, get_global_counters(Config)),
     ?assertEqual(#{
                    messages_confirmed_total => 4,
                    messages_received_confirm_total => 4,
@@ -177,7 +177,7 @@ smoke(Config) ->
                   "rabbit_" ++
                   binary_to_list(?config(queue_type, Config)) ++
                   "_queue"),
-    ProtocolQueueTypeCounters = maps:get([{protocol, amqp091}, {queue_type, QueueType}],
+    ProtocolQueueTypeCounters = maps:get(#{protocol => amqp091, queue_type => QueueType},
                                          get_global_counters(Config)),
     ?assertEqual(#{
                    messages_acknowledged_total => 3,
@@ -196,7 +196,7 @@ smoke(Config) ->
     ?assertMatch(
        #{consumers := 0,
          publishers := 0},
-       maps:get([{protocol, amqp091}], get_global_counters(Config))),
+       maps:get(#{protocol => amqp091}, get_global_counters(Config))),
 
     ok.
 

deps/rabbit/test/rabbit_fifo_dlx_integration_SUITE.erl

@@ -991,5 +991,5 @@ counted(Metric, Config) ->
     metric(Metric, OldCounters).
 
 metric(Metric, Counters) ->
-    Metrics = maps:get([{queue_type, rabbit_quorum_queue}, {dead_letter_strategy, at_least_once}], Counters),
+    Metrics = maps:get(#{queue_type => rabbit_quorum_queue, dead_letter_strategy => at_least_once}, Counters),
     maps:get(Metric, Metrics).

deps/rabbitmq_mqtt/test/mqtt_shared_SUITE.erl

@@ -696,7 +696,7 @@ global_counters(Config) ->
                    messages_delivered_get_manual_ack_total => 0,
                    messages_get_empty_total => 0,
                    messages_redelivered_total => 0},
-                 get_global_counters(Config, ProtoVer, 0, [{queue_type, rabbit_classic_queue}])),
+                 get_global_counters(Config, ProtoVer, 0, #{queue_type => rabbit_classic_queue})),
     ?assertEqual(#{messages_delivered_total => 1,
                    messages_acknowledged_total => 0,
                    messages_delivered_consume_auto_ack_total => 1,
@@ -705,7 +705,7 @@ global_counters(Config) ->
                    messages_delivered_get_manual_ack_total => 0,
                    messages_get_empty_total => 0,
                    messages_redelivered_total => 0},
-                 get_global_counters(Config, ProtoVer, 0, [{queue_type, rabbit_mqtt_qos0_queue}])),
+                 get_global_counters(Config, ProtoVer, 0, #{queue_type => rabbit_mqtt_qos0_queue})),
 
     {ok, _, _} = emqtt:unsubscribe(C, Topic1),
     ?assertEqual(1, maps:get(consumers, get_global_counters(Config, ProtoVer))),

deps/rabbitmq_mqtt/test/reader_SUITE.erl

@@ -255,11 +255,11 @@ rabbit_mqtt_qos0_queue_overflow(Config) ->
     QType = rabbit_mqtt_qos0_queue,
 
     #{
-      [{protocol, ProtoVer}, {queue_type, QType}] :=
+      #{protocol => ProtoVer, queue_type => QType} :=
       #{messages_delivered_total := 0,
         messages_delivered_consume_auto_ack_total := 0},
 
-      [{queue_type, QType}, {dead_letter_strategy, disabled}] :=
+      #{queue_type => QType, dead_letter_strategy => disabled} :=
       #{messages_dead_lettered_maxlen_total := NumDeadLettered}
      } = rabbit_ct_broker_helpers:rpc(Config, rabbit_global_counters, overview, []),
 
@@ -314,11 +314,11 @@ rabbit_mqtt_qos0_queue_overflow(Config) ->
     ExpectedNumDeadLettered = NumDeadLettered + NumDropped,
     ?assertMatch(
        #{
-         [{protocol, ProtoVer}, {queue_type, QType}] :=
+         #{protocol => ProtoVer, queue_type => QType} :=
          #{messages_delivered_total := NumReceived,
            messages_delivered_consume_auto_ack_total := NumReceived},
 
-         [{queue_type, QType}, {dead_letter_strategy, disabled}] :=
+         #{queue_type => QType, dead_letter_strategy => disabled} :=
          #{messages_dead_lettered_maxlen_total := ExpectedNumDeadLettered}
         },
        rabbit_ct_broker_helpers:rpc(Config, rabbit_global_counters, overview, [])),

deps/rabbitmq_mqtt/test/util.erl

@@ -76,16 +76,16 @@ get_global_counters(Config, ProtoVer) ->
     get_global_counters(Config, ProtoVer, 0).
 
 get_global_counters(Config, ProtoVer, Node) ->
-    get_global_counters(Config, ProtoVer, Node, []).
-
-get_global_counters(Config, v3, Node, QType) ->
-    get_global_counters(Config, ?MQTT_PROTO_V3, Node, QType);
-get_global_counters(Config, v4, Node, QType) ->
-    get_global_counters(Config, ?MQTT_PROTO_V4, Node, QType);
-get_global_counters(Config, v5, Node, QType) ->
-    get_global_counters(Config, ?MQTT_PROTO_V5, Node, QType);
-get_global_counters(Config, Proto, Node, QType) ->
-    maps:get([{protocol, Proto}] ++ QType,
+    get_global_counters(Config, ProtoVer, Node, #{}).
+
+get_global_counters(Config, v3, Node, Labels) ->
+    get_global_counters(Config, ?MQTT_PROTO_V3, Node, Labels);
+get_global_counters(Config, v4, Node, Labels) ->
+    get_global_counters(Config, ?MQTT_PROTO_V4, Node, Labels);
+get_global_counters(Config, v5, Node, Labels) ->
+    get_global_counters(Config, ?MQTT_PROTO_V5, Node, Labels);
+get_global_counters(Config, Proto, Node, Labels) ->
+    maps:get(Labels#{protocol => Proto},
              rabbit_ct_broker_helpers:rpc(Config, Node, rabbit_global_counters, overview, [])).
 
 get_events(Node) ->

deps/rabbitmq_mqtt/test/v5_SUITE.erl

@@ -2161,7 +2161,7 @@ dead_letter_metric(Metric, Config) ->
 
 dead_letter_metric(Metric, Config, Strategy) ->
     Counters = rpc(Config, rabbit_global_counters, overview, []),
-    Map = maps:get([{queue_type, rabbit_classic_queue}, {dead_letter_strategy, Strategy}], Counters),
+    Map = maps:get(#{queue_type => rabbit_classic_queue, dead_letter_strategy => Strategy}, Counters),
     maps:get(Metric, Map).
 
 assert_nothing_received() ->

deps/rabbitmq_prometheus/src/collectors/prometheus_rabbitmq_raft_metrics_collector.erl

@@ -35,7 +35,7 @@ collect_mf(_Registry, Callback) ->
                 create_mf(?METRIC_NAME(Name),
                           Help,
                           Type,
-                          maps:to_list(Values)))
+                          Values))
       end,
       seshat:format(ra, [term,
 			 snapshot_index,

deps/rabbitmq_stream/test/rabbit_stream_SUITE.erl

@@ -1627,7 +1627,7 @@ get_osiris_counters(Config) ->
                                  []).
 
 get_global_counters(Config) ->
-    maps:get([{protocol, stream}],
+    maps:get(#{protocol => stream},
              rabbit_ct_broker_helpers:rpc(Config,
                                           0,
                                           rabbit_global_counters,