Collect ETS per-table memory and size.

[beam_stats.git] / src / beam_stats_consumer_statsd.erl

diff --git a/src/beam_stats_consumer_statsd.erl b/src/beam_stats_consumer_statsd.erl
index 97e458d..112bb91 100644 (file)
--- a/src/beam_stats_consumer_statsd.erl
+++ b/src/beam_stats_consumer_statsd.erl
@@ -1,6 +1,7 @@
 -module(beam_stats_consumer_statsd).
 
 -include("include/beam_stats.hrl").
+-include("include/beam_stats_ets_table.hrl").
 -include("beam_stats_logging.hrl").
 
 -behaviour(beam_stats_consumer).
@@ -16,15 +17,6 @@
     , terminate/1
     ]).
 
-%% Tests (to be run by CT):
--export(
-    [ ct_test__beam_stats_to_bins/1
-    , ct_test__memory_component_to_statsd_msg/1
-    , ct_test__statsd_msg_add_name_prefix/1
-    , ct_test__statsd_msg_to_bin/1
-    , ct_test__node_id_to_bin/1
-    ]).
-
 -type option() ::
       {consumption_interval , non_neg_integer()}
     | {dst_host             , inet:ip_address() | inet:hostname()}
@@ -151,13 +143,104 @@ beam_stats_queue_to_binary(Q) ->
 beam_stats_to_bins(#beam_stats
     { node_id = NodeID
     , memory  = Memory
+    , io_bytes_in  = IOBytesIn
+    , io_bytes_out = IOBytesOut
+    , context_switches = ContextSwitches
+    , reductions       = Reductions
+    , run_queue        = RunQueue
+    , ets              = ETS
     }
 ) ->
     NodeIDBin = node_id_to_bin(NodeID),
-    Msgs1 = memory_to_msgs(Memory),
+    Msgs1 =
+        [ io_bytes_in_to_msg(IOBytesIn)
+        , io_bytes_out_to_msg(IOBytesOut)
+        , context_switches_to_msg(ContextSwitches)
+        , reductions_to_msg(Reductions)
+        , run_queue_to_msg(RunQueue)
+        | memory_to_msgs(Memory)
+        ]
+        ++ ets_to_msgs(ETS),
     Msgs2 = [statsd_msg_add_name_prefix(M, NodeIDBin) || M <- Msgs1],
     [statsd_msg_to_bin(M) || M <- Msgs2].
 
+-spec run_queue_to_msg(non_neg_integer()) ->
+    statsd_msg().
+run_queue_to_msg(RunQueue) ->
+    #statsd_msg
+    { name  = <<"run_queue">>
+    , value = RunQueue
+    , type  = gauge
+    }.
+
+-spec reductions_to_msg(non_neg_integer()) ->
+    statsd_msg().
+reductions_to_msg(Reductions) ->
+    #statsd_msg
+    { name  = <<"reductions">>
+    , value = Reductions
+    , type  = gauge
+    }.
+
+-spec context_switches_to_msg(non_neg_integer()) ->
+    statsd_msg().
+context_switches_to_msg(ContextSwitches) ->
+    #statsd_msg
+    { name  = <<"context_switches">>
+    , value = ContextSwitches
+    , type  = gauge
+    }.
+
+-spec io_bytes_in_to_msg(non_neg_integer()) ->
+    statsd_msg().
+io_bytes_in_to_msg(IOBytesIn) ->
+    #statsd_msg
+    { name  = <<"io.bytes_in">>
+    , value = IOBytesIn
+    , type  = gauge
+    }.
+
+-spec io_bytes_out_to_msg(non_neg_integer()) ->
+    statsd_msg().
+io_bytes_out_to_msg(IOBytesOut) ->
+    #statsd_msg
+    { name  = <<"io.bytes_out">>
+    , value = IOBytesOut
+    , type  = gauge
+    }.
+
+-spec ets_to_msgs(beam_stats_ets:t()) ->
+    [statsd_msg()].
+ets_to_msgs(PerTableStats) ->
+    NestedMsgs = lists:map(fun ets_table_to_msgs/1, PerTableStats),
+    lists:append(NestedMsgs).
+
+-spec ets_table_to_msgs(beam_stats_ets_table:t()) ->
+    [statsd_msg()].
+ets_table_to_msgs(#beam_stats_ets_table
+    { id     = ID
+    , name   = Name
+    , size   = Size
+    , memory = Memory
+    }
+) ->
+    IDBin   = beam_stats_ets_table:id_to_bin(ID),
+    NameBin = atom_to_binary(Name, latin1),
+    NameAndID = <<NameBin/binary, ".", IDBin/binary>>,
+    SizeMsg =
+        #statsd_msg
+        { name  = <<"ets_table.size.", NameAndID/binary>>
+        , value = Size
+        , type  = gauge
+        },
+    MemoryMsg =
+        #statsd_msg
+        { name  = <<"ets_table.memory.", NameAndID/binary>>
+        , value = Memory
+        , type  = gauge
+        },
+    [SizeMsg, MemoryMsg].
+
 -spec memory_to_msgs([{atom(), non_neg_integer()}]) ->
     [statsd_msg()].
 memory_to_msgs(Memory) ->
@@ -166,8 +249,9 @@ memory_to_msgs(Memory) ->
 -spec memory_component_to_statsd_msg({atom(), non_neg_integer()}) ->
     statsd_msg().
 memory_component_to_statsd_msg({MemType, MemSize}) when MemSize >= 0 ->
+    MemTypeBin = atom_to_binary(MemType, latin1),
     #statsd_msg
-    { name  = atom_to_binary(MemType, latin1)
+    { name  = <<"memory.", MemTypeBin/binary>>
     , value = MemSize
     , type  = gauge
     }.
@@ -208,28 +292,3 @@ metric_type_to_bin(gauge) ->
 node_id_to_bin(NodeID) ->
     NodeIDBin = atom_to_binary(NodeID, utf8),
     re:replace(NodeIDBin, "[\@\.]", "_", [global, {return, binary}]).
-
-%% ============================================================================
-%% Tests
-%% ============================================================================
-
-ct_test__beam_stats_to_bins(_Cfg) ->
-    BEAMStats = #beam_stats{node_id = 'node@host.local', memory = [{foo,1}]},
-    [<<?PATH_PREFIX, ".node_host_local.foo:1|g\n">>] =
-        beam_stats_to_bins(BEAMStats).
-
-ct_test__memory_component_to_statsd_msg(_Cfg) ->
-    #statsd_msg{name = <<"foo">>, value = 1, type = gauge} =
-        memory_component_to_statsd_msg({foo, 1}).
-
-ct_test__statsd_msg_add_name_prefix(_Cfg) ->
-    Msg1 = #statsd_msg{name = <<"foo">>, value = 1, type = gauge},
-    Msg2 = statsd_msg_add_name_prefix(Msg1, <<"bar">>),
-    <<?PATH_PREFIX,".bar.foo">> = Msg2#statsd_msg.name.
-
-ct_test__statsd_msg_to_bin(_Cfg) ->
-    Msg = #statsd_msg{name = <<"foo">>, value = 1, type = gauge},
-    <<"foo:1|g\n">> = statsd_msg_to_bin(Msg).
-
-ct_test__node_id_to_bin(_Cfg) ->
-    <<"foo_bar_local">> = node_id_to_bin('foo@bar.local').