RMQ-1263: readd lost shovel_prometheus parts

Author: deadtrickster

deps/rabbitmq_shovel_prometheus/src/rabbit_shovel_prometheus_collector.erl

@@ -29,9 +29,9 @@ deregister_cleanup(_) -> ok.
 
 collect_mf(_Registry, Callback) ->
     Status = rabbit_shovel_status:status(500),
-    {StaticStatusGroups, DynamicStatusGroups} = lists:foldl(fun({_,static,{S, _}, _}, {SMap, DMap}) ->
+    {StaticStatusGroups, DynamicStatusGroups} = lists:foldl(fun({_,static,{S, _}, _, _}, {SMap, DMap}) ->
                                                                     {maps:update_with(S, fun(C) -> C + 1 end, 1, SMap), DMap};
-                                                               ({_,dynamic,{S, _}, _}, {SMap, DMap}) ->
+                                                               ({_,dynamic,{S, _}, _, _}, {SMap, DMap}) ->
                                                                     {SMap, maps:update_with(S, fun(C) -> C + 1 end, 1, DMap)}
                                                             end, {#{}, #{}}, Status),
 

deps/rabbitmq_shovel_prometheus/test/prometheus_rabbitmq_shovel_collector_SUITE.erl

@@ -226,10 +226,10 @@ await_shovel(Name, Type) ->
 
 shovels_from_status(ExpectedState, dynamic) ->
     S = rabbit_shovel_status:status(),
-    [N || {{<<"/">>, N}, dynamic, {State, _}, _} <- S, State == ExpectedState];
+    [N || {{<<"/">>, N}, dynamic, {State, _}, _,  _} <- S, State == ExpectedState];
 shovels_from_status(ExpectedState, static) ->
     S = rabbit_shovel_status:status(),
-    [N || {N, static, {State, _}, _} <- S, State == ExpectedState].
+    [N || {N, static, {State, _}, _,  _} <- S, State == ExpectedState].
 
 get_shovel_status(Config, Name) ->
     get_shovel_status(Config, 0, Name).