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

diff --git a/test/beam_stats_consumer_statsd_SUITE.erl b/test/beam_stats_consumer_statsd_SUITE.erl
index 16cb5fc..43c1a1f 100644
--- a/test/beam_stats_consumer_statsd_SUITE.erl
+++ b/test/beam_stats_consumer_statsd_SUITE.erl
@@ -13,8 +13,7 @@
 
 %% Test cases
 -export(
-    [ t_send/1
-    , t_collect/1
+    [ t_full_cycle/1
     ]).
 
 -define(GROUP, beam_stats_consumer_statsd).
@@ -28,8 +27,7 @@ all() ->
 
 groups() ->
     Tests =
-        [ t_send
-        , t_collect
+        [ t_full_cycle
         ],
     Properties = [],
     [{?GROUP, Properties, Tests}].
@@ -38,109 +36,42 @@ groups() ->
 %%  Test cases
 %% ============================================================================
 
-t_send(_Cfg) ->
-    Pid0 = list_to_pid("<0.0.0>"),
-    Pid1 = list_to_pid("<0.1.0>"),
-    Pid2 = list_to_pid("<0.2.0>"),
-    Pid3 = list_to_pid("<0.3.0>"),
-    Process1 =
-        #beam_stats_process
-        { pid               = Pid1
-        , registered_name   = {some, reg_name_foo}
-        , ancestry =
-              #beam_stats_process_ancestry
-              { raw_initial_call  = {foo_mod, foo_fun, 2}
-              , otp_initial_call  = none
-              , otp_ancestors     = none
-              }
-        , status            = running
-        , memory            = 15
-        , total_heap_size   = 25
-        , stack_size        = 10
-        , message_queue_len = 0
-        },
-    Process2 =
-        #beam_stats_process
-        { pid               = Pid2
-        , registered_name   = none
-        , ancestry =
-              #beam_stats_process_ancestry
-              { raw_initial_call  = {bar_mod, bar_fun, 1}
-              , otp_initial_call  = none
-              , otp_ancestors     = none
-              }
-        , status            = running
-        , memory            = 25
-        , total_heap_size   = 35
-        , stack_size        = 40
-        , message_queue_len = 5
-        },
-    Process3 =
-        #beam_stats_process
-        { pid               = Pid3
-        , registered_name   = none
-        , ancestry =
-              #beam_stats_process_ancestry
-              { raw_initial_call  = {baz_mod, baz_fun, 3}
-              , otp_initial_call  = {some, {baz_otp_mod, baz_otp_fun, 2}}
-              , otp_ancestors     = {some, [Pid0, Pid1]}
-              }
-        , status            = running
-        , memory            = 25
-        , total_heap_size   = 35
-        , stack_size        = 40
-        , message_queue_len = 1
-        },
-    Processes =
-        #beam_stats_processes
-        { individual_stats =
-            [ Process1
-            , Process2
-            , Process3
-            ]
-        , count_all                = 3
-        , count_exiting            = 0
-        , count_garbage_collecting = 0
-        , count_registered         = 1
-        , count_runnable           = 0
-        , count_running            = 3
-        , count_suspended          = 0
-        , count_waiting            = 0
-        },
-    ETSTableStatsFoo =
-        #beam_stats_ets_table
-        { id     = foo
-        , name   = foo
-        , size   = 5
-        , memory = 25
-        },
-    ETSTableStatsBar =
-        #beam_stats_ets_table
-        { id     = 37
-        , name   = bar
-        , size   = 8
-        , memory = 38
-        },
-    % TODO: Indent #beam_stats as #beam_stats_ets_table
-    BEAMStats = #beam_stats
-    { timestamp = {1, 2, 3}
-    , node_id   = 'node_foo@host_bar'
-    , memory    = [{mem_type_foo, 1}, {mem_type_bar, 2}, {mem_type_baz, 3}]
-    , io_bytes_in  = 3
-    , io_bytes_out = 7
-    , context_switches = 5
-    , reductions       = 9
-    , run_queue        = 17
-    , ets              = [ETSTableStatsFoo, ETSTableStatsBar]
-    , processes        = Processes
-    },
+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,
+
+    {ok,[hope,beam_stats]} = application:ensure_all_started(beam_stats),
+    ct:log("beam_stats started~n"),
     ServerPort = 8125,
     {ok, ServerSocket} = gen_udp:open(ServerPort, [binary, {active, false}]),
-    BEAMStatsQ = queue:in(BEAMStats, queue:new()),
-    Options = [{dst_port, ServerPort}],
-    {_, State1} = beam_stats_consumer_statsd:init(Options),
-    State2 = beam_stats_consumer_statsd:consume(BEAMStatsQ, State1),
-    {} = beam_stats_consumer_statsd:terminate(State2),
+    ct:log("UDP server started started~n"),
+    {ok, _} = beam_stats_consumer:add(beam_stats_consumer_statsd,
+        [ {consumption_interval , 60000}
+        , {dst_host             , "localhost"}
+        , {dst_port             , ServerPort}
+        , {src_port             , 8124}
+        , {num_msgs_per_packet  , 10}
+        ]
+    ),
+    ct:log("consumer added~n"),
+    _ = meck_expect_beam_stats(
+        % Double the original values, so that deltas will equal originals after
+        % 1 update of new beam_stats_state:t()
+        [ {io_bytes_in      , 6}
+        , {io_bytes_out     , 14}
+        , {context_switches , 10}
+        ]
+    ),
+    ct:log("meck_expect_beam_stats ok~n"),
+    {} = beam_stats_producer:sync_produce_consume(),
+    ct:log("produced and consumed~n"),
+    ok = application:stop(beam_stats),
+    ct:log("beam_stats stopped~n"),
+
     ResultOfReceive1 = gen_udp:recv(ServerSocket, 0),
     ResultOfReceive2 = gen_udp:recv(ServerSocket, 0),
     ResultOfReceive3 = gen_udp:recv(ServerSocket, 0),
@@ -171,37 +102,37 @@ t_send(_Cfg) ->
         , <<"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:25|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:38|g">>
+        , <<"beam_stats.node_foo_host_bar.ets_table.memory.bar.37:64|g">>
 
         % Processes totals
-        , <<"beam_stats.node_foo_host_bar.processes_count_all:3|g">>
+        , <<"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:0|g">>
+        , <<"beam_stats.node_foo_host_bar.processes_count_waiting:1|g">>
 
         % Process 1
-        , <<"beam_stats.node_foo_host_bar.process_memory.reg_name_foo.0_1_0:15|g">>
-        , <<"beam_stats.node_foo_host_bar.process_total_heap_size.reg_name_foo.0_1_0:25|g">>
-        , <<"beam_stats.node_foo_host_bar.process_stack_size.reg_name_foo.0_1_0:10|g">>
-        , <<"beam_stats.node_foo_host_bar.process_message_queue_len.reg_name_foo.0_1_0:0|g">>
+        , <<"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">>
 
         % Process 2
-        , <<"beam_stats.node_foo_host_bar.process_memory.bar_mod-bar_fun-1--NONE--NONE.0_2_0:25|g">>
-        , <<"beam_stats.node_foo_host_bar.process_total_heap_size.bar_mod-bar_fun-1--NONE--NONE.0_2_0:35|g">>
-        , <<"beam_stats.node_foo_host_bar.process_stack_size.bar_mod-bar_fun-1--NONE--NONE.0_2_0:40|g">>
-        , <<"beam_stats.node_foo_host_bar.process_message_queue_len.bar_mod-bar_fun-1--NONE--NONE.0_2_0:5|g">>
+        , <<"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">>
 
-        % Process 3
-        , <<"beam_stats.node_foo_host_bar.process_memory.baz_mod-baz_fun-3--baz_otp_mod-baz_otp_fun-2--0_0_0-0_1_0.0_3_0:25|g">>
-        , <<"beam_stats.node_foo_host_bar.process_total_heap_size.baz_mod-baz_fun-3--baz_otp_mod-baz_otp_fun-2--0_0_0-0_1_0.0_3_0:35|g">>
-        , <<"beam_stats.node_foo_host_bar.process_stack_size.baz_mod-baz_fun-3--baz_otp_mod-baz_otp_fun-2--0_0_0-0_1_0.0_3_0:40|g">>
-        , <<"beam_stats.node_foo_host_bar.process_message_queue_len.baz_mod-baz_fun-3--baz_otp_mod-baz_otp_fun-2--0_0_0-0_1_0.0_3_0:1|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">>
         ],
     MsgsReceived = binary:split(PacketsCombined, <<"\n">>, [global, trim]),
     RemoveExpectedFromReceived =
@@ -213,13 +144,21 @@ t_send(_Cfg) ->
             true = lists:member(Expected, Received),
             Received -- [Expected]
         end,
-    [] = lists:foldl(RemoveExpectedFromReceived, MsgsReceived, MsgsExpected).
+    [] = lists:foldl(RemoveExpectedFromReceived, MsgsReceived, MsgsExpected),
+    meck:unload(beam_stats_source).
+
+meck_expect_beam_stats() ->
+    meck_expect_beam_stats([]).
 
-t_collect(_Cfg) ->
+meck_expect_beam_stats(Overrides) ->
+    IOBytesIn       = hope_kv_list:get(Overrides, io_bytes_in , 3),
+    IOBytesOut      = hope_kv_list:get(Overrides, io_bytes_out, 7),
+    ContextSwitches = hope_kv_list:get(Overrides, context_switches, 5),
     Pid0 = list_to_pid("<0.0.0>"),
     Pid1 = list_to_pid("<0.1.0>"),
     Pid2 = list_to_pid("<0.2.0>"),
     Pid3 = list_to_pid("<0.3.0>"),
+    Pid4 = list_to_pid("<0.4.0>"),
     Process1 =
         #beam_stats_process
         { pid               = Pid1
@@ -268,21 +207,38 @@ t_collect(_Cfg) ->
         , stack_size        = 40
         , message_queue_len = 1
         },
+    Process4 =
+        #beam_stats_process
+        { pid               = Pid4
+        , registered_name   = none
+        , ancestry =
+              #beam_stats_process_ancestry
+              { raw_initial_call  = {baz_mod, baz_fun, 3}
+              , otp_initial_call  = {some, {baz_otp_mod, baz_otp_fun, 2}}
+              , otp_ancestors     = {some, [Pid0, Pid1]}
+              }
+        , status            = waiting
+        , memory            = 5
+        , total_heap_size   = 10
+        , stack_size        = 15
+        , message_queue_len = 0
+        },
     Processes =
         #beam_stats_processes
         { individual_stats =
             [ Process1
             , Process2
             , Process3
+            , Process4
             ]
-        , count_all                = 3
+        , count_all                = 4
         , count_exiting            = 0
         , count_garbage_collecting = 0
         , count_registered         = 1
         , count_runnable           = 0
         , count_running            = 3
         , count_suspended          = 0
-        , count_waiting            = 0
+        , count_waiting            = 1
         },
     ETSTableStatsFoo =
         #beam_stats_ets_table
@@ -298,7 +254,6 @@ t_collect(_Cfg) ->
         , size   = 8
         , memory = 64
         },
-    meck:new(beam_stats_source),
     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,
@@ -306,8 +261,8 @@ t_collect(_Cfg) ->
     meck:expect(beam_stats_source, erlang_registered,
         fun () -> [reg_name_foo] end),
     meck:expect(beam_stats_source, erlang_statistics,
-        fun (io              ) -> {{input, 3}, {output, 7}}
-        ;   (context_switches) -> {5, 0}
+        fun (io              ) -> {{input, IOBytesIn}, {output, IOBytesOut}}
+        ;   (context_switches) -> {ContextSwitches, 0}
         ;   (reductions      ) -> {0, 9} % 1st element is unused
         ;   (run_queue       ) -> 17
         end
@@ -326,7 +281,7 @@ t_collect(_Cfg) ->
         end
     ),
     meck:expect(beam_stats_source, erlang_processes,
-        fun () -> [Pid1, Pid2, Pid3] end),
+        fun () -> [Pid1, Pid2, Pid3, Pid4] end),
     meck:expect(beam_stats_source, os_timestamp,
         fun () -> {1, 2, 3} end),
     meck:expect(beam_stats_source, erlang_process_info,
@@ -367,23 +322,32 @@ t_collect(_Cfg) ->
                 ;   stack_size        -> {K, 40}
                 ;   message_queue_len -> {K, 1}
                 end
+        ;   (P, K) when P == Pid4 ->
+                Dict =
+                    [ {'$initial_call', {baz_otp_mod, baz_otp_fun, 2}}
+                    , {'$ancestors'   , [Pid0, Pid1]}
+                    ],
+                case K
+                of  dictionary        -> {K, Dict}
+                ;   initial_call      -> {K, {baz_mod, baz_fun, 3}}
+                ;   registered_name   -> []
+                ;   status            -> {K, waiting}
+                ;   memory            -> {K, 5}
+                ;   total_heap_size   -> {K, 10}
+                ;   stack_size        -> {K, 15}
+                ;   message_queue_len -> {K, 0}
+                end
         end
     ),
-    BEAMStatsExpected =
-        #beam_stats
-        { timestamp = {1, 2, 3}
-        , node_id   = 'node_foo@host_bar'
-        , memory    = [{mem_type_foo, 1}, {mem_type_bar, 2}, {mem_type_baz, 3}]
-        , io_bytes_in  = 3
-        , io_bytes_out = 7
-        , context_switches = 5
-        , reductions       = 9
-        , run_queue        = 17
-        , ets              = [ETSTableStatsFoo, ETSTableStatsBar]
-        , processes        = Processes
-        },
-    BEAMStatsComputed = beam_stats_state:export(beam_stats_state:new()),
-    ct:log("BEAMStatsExpected: ~p~n", [BEAMStatsExpected]),
-    ct:log("BEAMStatsComputed: ~p~n", [BEAMStatsComputed]),
-    BEAMStatsExpected = BEAMStatsComputed,
-    meck:unload(beam_stats_source).
+    #beam_stats
+    { timestamp = {1, 2, 3}
+    , node_id   = 'node_foo@host_bar'
+    , memory    = [{mem_type_foo, 1}, {mem_type_bar, 2}, {mem_type_baz, 3}]
+    , io_bytes_in  = IOBytesIn
+    , io_bytes_out = IOBytesOut
+    , context_switches = ContextSwitches
+    , reductions       = 9
+    , run_queue        = 17
+    , ets              = [ETSTableStatsFoo, ETSTableStatsBar]
+    , processes        = Processes
+    }.