X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=test%2Fbeam_stats_consumer_statsd_SUITE.erl;h=ac21f7a8965defcaa468234a30a2c9dc8d478fbb;hb=7dbc59b67d2cebe0e498ac4fd167cbaabed0e55b;hp=2283ed912c7be5d2aeb2920b618d7a20fe54a171;hpb=8fe744e7d00da9039d59d3551d4f05a0e1b007d2;p=beam_stats.git diff --git a/test/beam_stats_consumer_statsd_SUITE.erl b/test/beam_stats_consumer_statsd_SUITE.erl index 2283ed9..ac21f7a 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"), @@ -64,6 +60,7 @@ t_full_cycle(_Cfg) -> [ {io_bytes_in , 6} , {io_bytes_out , 14} , {context_switches , 10} + , {reductions , 18} ] ), ct:log("meck_expect_beam_stats ok~n"), @@ -101,10 +98,10 @@ t_full_cycle(_Cfg) -> , <<"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.foo:5|g">> - , <<"beam_stats_v0.node_foo_host_bar.ets_table.memory.foo.foo:40|g">> - , <<"beam_stats_v0.node_foo_host_bar.ets_table.size.bar.37:8|g">> - , <<"beam_stats_v0.node_foo_host_bar.ets_table.memory.bar.37:64|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_v0.node_foo_host_bar.processes_count_all:4|g">> @@ -121,18 +118,21 @@ t_full_cycle(_Cfg) -> , <<"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">> + , <<"beam_stats_v0.node_foo_host_bar.process_reductions.named--reg_name_foo:0|g">> % Process 2 , <<"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">> + , <<"beam_stats_v0.node_foo_host_bar.process_reductions.spawned-via--bar_mod-bar_fun-1--NONE--NONE:0|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">> + , <<"beam_stats_v0.node_foo_host_bar.process_reductions.spawned-via--baz_mod-baz_fun-3--baz_otp_mod-baz_otp_fun-2--PID-PID:0|g">> ], MsgsReceived = binary:split(PacketsCombined, <<"\n">>, [global, trim]), RemoveExpectedFromReceived = @@ -144,7 +144,9 @@ t_full_cycle(_Cfg) -> true = lists:member(Expected, Received), Received -- [Expected] end, - [] = lists:foldl(RemoveExpectedFromReceived, MsgsReceived, MsgsExpected), + MsgsRemaining = lists:foldl(RemoveExpectedFromReceived, MsgsReceived, MsgsExpected), + ct:log("MsgsRemaining: ~p", [MsgsRemaining]), + [] = MsgsRemaining, meck:unload(beam_stats_source). meck_expect_beam_stats() -> @@ -154,6 +156,7 @@ 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), + Reductions = hope_kv_list:get(Overrides, reductions, 9), Pid0 = list_to_pid("<0.0.0>"), Pid1 = list_to_pid("<0.1.0>"), Pid2 = list_to_pid("<0.2.0>"), @@ -247,13 +250,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, @@ -263,21 +273,26 @@ meck_expect_beam_stats(Overrides) -> meck:expect(beam_stats_source, erlang_statistics, fun (io ) -> {{input, IOBytesIn}, {output, IOBytesOut}} ; (context_switches) -> {ContextSwitches, 0} - ; (reductions ) -> {0, 9} % 1st element is unused + ; (reductions ) -> {Reductions, undefined} % 2nd element is unused ; (run_queue ) -> 17 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, @@ -295,6 +310,7 @@ meck_expect_beam_stats(Overrides) -> ; total_heap_size -> {K, 25} ; stack_size -> {K, 10} ; message_queue_len -> {K, 0} + ; reductions -> {K, 1} end ; (P, K) when P == Pid2 -> case K @@ -306,6 +322,7 @@ meck_expect_beam_stats(Overrides) -> ; total_heap_size -> {K, 35} ; stack_size -> {K, 40} ; message_queue_len -> {K, 5} + ; reductions -> {K, 2} end ; (P, K) when P == Pid3 -> Dict = @@ -321,6 +338,7 @@ meck_expect_beam_stats(Overrides) -> ; total_heap_size -> {K, 35} ; stack_size -> {K, 40} ; message_queue_len -> {K, 1} + ; reductions -> {K, 3} end ; (P, K) when P == Pid4 -> Dict = @@ -336,6 +354,7 @@ meck_expect_beam_stats(Overrides) -> ; total_heap_size -> {K, 10} ; stack_size -> {K, 15} ; message_queue_len -> {K, 0} + ; reductions -> {K, 4} end end ), @@ -348,6 +367,6 @@ meck_expect_beam_stats(Overrides) -> , context_switches = ContextSwitches , reductions = 9 , run_queue = 17 - , ets = [ETSTableStatsFoo, ETSTableStatsBar] + , ets = [ETSTableStatsFoo, ETSTableStatsBarA, ETSTableStatsBarB] , processes = Processes }.