X-Git-Url: https://git.xandkar.net/?p=beam_stats.git;a=blobdiff_plain;f=test%2Fbeam_stats_consumer_statsd_SUITE.erl;h=88f82e77ffe37a565514434c6a279edb7d0f4bb6;hp=43c1a1f816a9ffe4a5defb7dfb22d96eb97311ff;hb=b2c364fd163d74df4914b6d4d5da42dec28368af;hpb=697c496d9970a9855c4e6b9ff9212564051b8290

diff --git a/test/beam_stats_consumer_statsd_SUITE.erl b/test/beam_stats_consumer_statsd_SUITE.erl
index 43c1a1f..88f82e7 100644
--- a/test/beam_stats_consumer_statsd_SUITE.erl
+++ b/test/beam_stats_consumer_statsd_SUITE.erl
@@ -38,11 +38,7 @@ groups() ->
 
 t_full_cycle(_Cfg) ->
     meck:new(beam_stats_source),
-    BEAMStatsExpected = meck_expect_beam_stats(),
-    BEAMStatsComputed = beam_stats_state:export(beam_stats_state:new()),
-    ct:log("BEAMStatsExpected: ~p~n", [BEAMStatsExpected]),
-    ct:log("BEAMStatsComputed: ~p~n", [BEAMStatsComputed]),
-    BEAMStatsExpected = BEAMStatsComputed,
+    _BEAMStatsExpected = meck_expect_beam_stats(),
 
     {ok,[hope,beam_stats]} = application:ensure_all_started(beam_stats),
     ct:log("beam_stats started~n"),
@@ -93,46 +89,46 @@ t_full_cycle(_Cfg) ->
         >>,
     ct:log("PacketsCombined: ~n~s~n", [PacketsCombined]),
     MsgsExpected =
-        [ <<"beam_stats.node_foo_host_bar.io.bytes_in:3|g">>
-        , <<"beam_stats.node_foo_host_bar.io.bytes_out:7|g">>
-        , <<"beam_stats.node_foo_host_bar.context_switches:5|g">>
-        , <<"beam_stats.node_foo_host_bar.reductions:9|g">>
-        , <<"beam_stats.node_foo_host_bar.run_queue:17|g">>
-        , <<"beam_stats.node_foo_host_bar.memory.mem_type_foo:1|g">>
-        , <<"beam_stats.node_foo_host_bar.memory.mem_type_bar:2|g">>
-        , <<"beam_stats.node_foo_host_bar.memory.mem_type_baz:3|g">>
-        , <<"beam_stats.node_foo_host_bar.ets_table.size.foo.foo:5|g">>
-        , <<"beam_stats.node_foo_host_bar.ets_table.memory.foo.foo:40|g">>
-        , <<"beam_stats.node_foo_host_bar.ets_table.size.bar.37:8|g">>
-        , <<"beam_stats.node_foo_host_bar.ets_table.memory.bar.37:64|g">>
+        [ <<"beam_stats_v0.node_foo_host_bar.io.bytes_in:3|g">>
+        , <<"beam_stats_v0.node_foo_host_bar.io.bytes_out:7|g">>
+        , <<"beam_stats_v0.node_foo_host_bar.context_switches:5|g">>
+        , <<"beam_stats_v0.node_foo_host_bar.reductions:9|g">>
+        , <<"beam_stats_v0.node_foo_host_bar.run_queue:17|g">>
+        , <<"beam_stats_v0.node_foo_host_bar.memory.mem_type_foo:1|g">>
+        , <<"beam_stats_v0.node_foo_host_bar.memory.mem_type_bar:2|g">>
+        , <<"beam_stats_v0.node_foo_host_bar.memory.mem_type_baz:3|g">>
+        , <<"beam_stats_v0.node_foo_host_bar.ets_table.size.foo.NAMED:5|g">>
+        , <<"beam_stats_v0.node_foo_host_bar.ets_table.memory.foo.NAMED:40|g">>
+        , <<"beam_stats_v0.node_foo_host_bar.ets_table.size.bar.TID:16|g">>
+        , <<"beam_stats_v0.node_foo_host_bar.ets_table.memory.bar.TID:128|g">>
 
         % Processes totals
-        , <<"beam_stats.node_foo_host_bar.processes_count_all:4|g">>
-        , <<"beam_stats.node_foo_host_bar.processes_count_exiting:0|g">>
-        , <<"beam_stats.node_foo_host_bar.processes_count_garbage_collecting:0|g">>
-        , <<"beam_stats.node_foo_host_bar.processes_count_registered:1|g">>
-        , <<"beam_stats.node_foo_host_bar.processes_count_runnable:0|g">>
-        , <<"beam_stats.node_foo_host_bar.processes_count_running:3|g">>
-        , <<"beam_stats.node_foo_host_bar.processes_count_suspended:0|g">>
-        , <<"beam_stats.node_foo_host_bar.processes_count_waiting:1|g">>
+        , <<"beam_stats_v0.node_foo_host_bar.processes_count_all:4|g">>
+        , <<"beam_stats_v0.node_foo_host_bar.processes_count_exiting:0|g">>
+        , <<"beam_stats_v0.node_foo_host_bar.processes_count_garbage_collecting:0|g">>
+        , <<"beam_stats_v0.node_foo_host_bar.processes_count_registered:1|g">>
+        , <<"beam_stats_v0.node_foo_host_bar.processes_count_runnable:0|g">>
+        , <<"beam_stats_v0.node_foo_host_bar.processes_count_running:3|g">>
+        , <<"beam_stats_v0.node_foo_host_bar.processes_count_suspended:0|g">>
+        , <<"beam_stats_v0.node_foo_host_bar.processes_count_waiting:1|g">>
 
         % Process 1
-        , <<"beam_stats.node_foo_host_bar.process_memory.named--reg_name_foo:15|g">>
-        , <<"beam_stats.node_foo_host_bar.process_total_heap_size.named--reg_name_foo:25|g">>
-        , <<"beam_stats.node_foo_host_bar.process_stack_size.named--reg_name_foo:10|g">>
-        , <<"beam_stats.node_foo_host_bar.process_message_queue_len.named--reg_name_foo:0|g">>
+        , <<"beam_stats_v0.node_foo_host_bar.process_memory.named--reg_name_foo:15|g">>
+        , <<"beam_stats_v0.node_foo_host_bar.process_total_heap_size.named--reg_name_foo:25|g">>
+        , <<"beam_stats_v0.node_foo_host_bar.process_stack_size.named--reg_name_foo:10|g">>
+        , <<"beam_stats_v0.node_foo_host_bar.process_message_queue_len.named--reg_name_foo:0|g">>
 
         % Process 2
-        , <<"beam_stats.node_foo_host_bar.process_memory.spawned-via--bar_mod-bar_fun-1--NONE--NONE:25|g">>
-        , <<"beam_stats.node_foo_host_bar.process_total_heap_size.spawned-via--bar_mod-bar_fun-1--NONE--NONE:35|g">>
-        , <<"beam_stats.node_foo_host_bar.process_stack_size.spawned-via--bar_mod-bar_fun-1--NONE--NONE:40|g">>
-        , <<"beam_stats.node_foo_host_bar.process_message_queue_len.spawned-via--bar_mod-bar_fun-1--NONE--NONE:5|g">>
+        , <<"beam_stats_v0.node_foo_host_bar.process_memory.spawned-via--bar_mod-bar_fun-1--NONE--NONE:25|g">>
+        , <<"beam_stats_v0.node_foo_host_bar.process_total_heap_size.spawned-via--bar_mod-bar_fun-1--NONE--NONE:35|g">>
+        , <<"beam_stats_v0.node_foo_host_bar.process_stack_size.spawned-via--bar_mod-bar_fun-1--NONE--NONE:40|g">>
+        , <<"beam_stats_v0.node_foo_host_bar.process_message_queue_len.spawned-via--bar_mod-bar_fun-1--NONE--NONE:5|g">>
 
         % Process 3 and 4, aggregated by origin
-        , <<"beam_stats.node_foo_host_bar.process_memory.spawned-via--baz_mod-baz_fun-3--baz_otp_mod-baz_otp_fun-2--0_0_0-0_1_0:30|g">>
-        , <<"beam_stats.node_foo_host_bar.process_total_heap_size.spawned-via--baz_mod-baz_fun-3--baz_otp_mod-baz_otp_fun-2--0_0_0-0_1_0:45|g">>
-        , <<"beam_stats.node_foo_host_bar.process_stack_size.spawned-via--baz_mod-baz_fun-3--baz_otp_mod-baz_otp_fun-2--0_0_0-0_1_0:55|g">>
-        , <<"beam_stats.node_foo_host_bar.process_message_queue_len.spawned-via--baz_mod-baz_fun-3--baz_otp_mod-baz_otp_fun-2--0_0_0-0_1_0:1|g">>
+        , <<"beam_stats_v0.node_foo_host_bar.process_memory.spawned-via--baz_mod-baz_fun-3--baz_otp_mod-baz_otp_fun-2--PID-PID:30|g">>
+        , <<"beam_stats_v0.node_foo_host_bar.process_total_heap_size.spawned-via--baz_mod-baz_fun-3--baz_otp_mod-baz_otp_fun-2--PID-PID:45|g">>
+        , <<"beam_stats_v0.node_foo_host_bar.process_stack_size.spawned-via--baz_mod-baz_fun-3--baz_otp_mod-baz_otp_fun-2--PID-PID:55|g">>
+        , <<"beam_stats_v0.node_foo_host_bar.process_message_queue_len.spawned-via--baz_mod-baz_fun-3--baz_otp_mod-baz_otp_fun-2--PID-PID:1|g">>
         ],
     MsgsReceived = binary:split(PacketsCombined, <<"\n">>, [global, trim]),
     RemoveExpectedFromReceived =
@@ -247,13 +243,20 @@ meck_expect_beam_stats(Overrides) ->
         , size   = 5
         , memory = 40
         },
-    ETSTableStatsBar =
+    ETSTableStatsBarA =
         #beam_stats_ets_table
         { id     = 37
         , name   = bar
         , size   = 8
         , memory = 64
         },
+    ETSTableStatsBarB =
+        #beam_stats_ets_table
+        { id     = 38
+        , name   = bar
+        , size   = 8
+        , memory = 64
+        },
     meck:expect(beam_stats_source, erlang_memory,
         fun () -> [{mem_type_foo, 1}, {mem_type_bar, 2}, {mem_type_baz, 3}] end),
     meck:expect(beam_stats_source, erlang_node,
@@ -268,16 +271,21 @@ meck_expect_beam_stats(Overrides) ->
         end
     ),
     meck:expect(beam_stats_source, ets_all,
-        fun () -> [foo, 37] end),
+        fun () -> [foo, 37, 38] end),
     meck:expect(beam_stats_source, erlang_system_info,
         fun (wordsize) -> 8 end),
     meck:expect(beam_stats_source, ets_info,
         fun (foo, memory) -> 5
         ;   (foo, name  ) -> foo
         ;   (foo, size  ) -> 5
+
         ;   (37 , memory) -> 8
         ;   (37 , name  ) -> bar
         ;   (37 , size  ) -> 8
+
+        ;   (38 , memory) -> 8
+        ;   (38 , name  ) -> bar
+        ;   (38 , size  ) -> 8
         end
     ),
     meck:expect(beam_stats_source, erlang_processes,
@@ -348,6 +356,6 @@ meck_expect_beam_stats(Overrides) ->
     , context_switches = ContextSwitches
     , reductions       = 9
     , run_queue        = 17
-    , ets              = [ETSTableStatsFoo, ETSTableStatsBar]
+    , ets              = [ETSTableStatsFoo, ETSTableStatsBarA, ETSTableStatsBarB]
     , processes        = Processes
     }.