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=33d78c9bbecdf0a2ed68304dc3c8985009f75cab;hb=b2c364fd163d74df4914b6d4d5da42dec28368af;hpb=c2d1e9edd58faa8bd5668a08d3cf9c2ff8f22ef4 diff --git a/test/beam_stats_consumer_statsd_SUITE.erl b/test/beam_stats_consumer_statsd_SUITE.erl index 33d78c9..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:3|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_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.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_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.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_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 - , <<"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_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 = @@ -158,6 +154,7 @@ meck_expect_beam_stats(Overrides) -> 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 @@ -206,21 +203,38 @@ meck_expect_beam_stats(Overrides) -> , 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 @@ -229,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, @@ -250,20 +271,25 @@ 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, - 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, @@ -304,6 +330,21 @@ meck_expect_beam_stats(Overrides) -> ; 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 ), #beam_stats @@ -315,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 }.