Extract XML element measurements to a separate module

Author: chrzaszcz

src/c2s/mongoose_c2s.erl

@@ -1270,32 +1270,14 @@ merge_states(S0 = #c2s_data{}, S1 = #c2s_data{}) ->
 %% Instrumentation helpers
 
 -spec execute_element_event(mongoose_instrument:event_name(), exml:element(), data()) -> ok.
-execute_element_event(EventName, El, #c2s_data{host_type = HostType, jid = Jid}) ->
-    Metrics = measure_element(El#xmlel.name, exml_query:attr(El, <<"type">>)),
+execute_element_event(EventName, Element, #c2s_data{host_type = HostType, jid = Jid}) ->
+    Metrics = mongoose_measurements:measure_element(Element),
     Measurements = case Jid of
-                       undefined -> Metrics#{element => El};
-                       _ -> Metrics#{element => El, jid => Jid}
+                       undefined -> Metrics;
+                       _ -> Metrics#{Jid => Jid}
                    end,
     mongoose_instrument:execute(EventName, #{host_type => HostType}, Measurements).
 
--spec measure_element(binary(), binary() | undefined) -> mongoose_instrument:measurements().
-measure_element(<<"message">>, <<"error">>) ->
-    #{count => 1, stanza_count => 1, error_count => 1, message_error_count => 1};
-measure_element(<<"iq">>, <<"error">>) ->
-    #{count => 1, stanza_count => 1, error_count => 1, iq_error_count => 1};
-measure_element(<<"presence">>, <<"error">>) ->
-    #{count => 1, stanza_count => 1, error_count => 1, presence_error_count => 1};
-measure_element(<<"message">>, _Type) ->
-    #{count => 1, stanza_count => 1, message_count => 1};
-measure_element(<<"iq">>, _Type) ->
-    #{count => 1, stanza_count => 1, iq_count => 1};
-measure_element(<<"presence">>, _Type) ->
-    #{count => 1, stanza_count => 1, presence_count => 1};
-measure_element(<<"stream:error">>, _Type) ->
-    #{count => 1, error_count => 1};
-measure_element(_Name, _Type) ->
-    #{count => 1}.
-
 -spec labels() -> mongoose_instrument:labels().
 labels() ->
     #{connection_type => c2s}.

src/component/mongoose_component_connection.erl

@@ -86,9 +86,7 @@ handle_event(internal, #xmlel{name = <<"handshake">>} = El, wait_for_handshake,
 handle_event(internal, #xmlel{} = El, stream_established, StateData) ->
     execute_element_event(component_element_in, El, StateData),
     handle_stream_established(StateData, El);
-handle_event(internal, #xmlstreamend{name = Name}, _, StateData) ->
-    StreamEnd = #xmlel{name = Name},
-    execute_element_event(component_element_in, StreamEnd, StateData),
+handle_event(internal, #xmlstreamend{}, _, StateData) ->
     send_trailer(StateData),
     {stop, {shutdown, stream_end}};
 handle_event(internal, #xmlstreamstart{}, _, StateData) ->
@@ -203,7 +201,6 @@ handle_stream_start(S0, Attrs) ->
             IsSubdomain = <<"true">> =:= maps:get(<<"is_subdomain">>, Attrs, <<>>),
             S1 = S0#component_data{lserver = LServer, is_subdomain = IsSubdomain},
             send_header(S1),
-            execute_element_event(component_element_in, Attrs, S1),
             {next_state, wait_for_handshake, S1, state_timeout(S1)};
         {?NS_COMPONENT_ACCEPT, error} ->
             stream_start_error(S0, mongoose_xmpp_errors:host_unknown());
@@ -408,12 +405,12 @@ close_parser(#component_data{parser = Parser}) ->
 -spec send_xml(data(), exml_stream:element() | [exml_stream:element()]) -> maybe_ok().
 send_xml(Data, XmlElement) when is_tuple(XmlElement) ->
     send_xml(Data, [XmlElement]);
-send_xml(#component_data{lserver = LServer, socket = Socket} = StateData, XmlElements) when is_list(XmlElements) ->
-    [ begin
-          execute_element_event(component_element_out, El, StateData),
-          mongoose_instrument:execute(
-            xmpp_element_size_out, labels(), #{byte_size => exml:xml_size(El), lserver => LServer})
-      end || El <- XmlElements],
+send_xml(#component_data{lserver = LServer, socket = Socket}, XmlElements) when is_list(XmlElements) ->
+    [begin
+         execute_element_event(component_element_out, Element, LServer),
+         mongoose_instrument:execute(
+           xmpp_element_size_out, labels(), #{byte_size => exml:xml_size(Element), lserver => LServer})
+     end || Element = #xmlel{} <- XmlElements],
     mongoose_xmpp_socket:send_xml(Socket, XmlElements).
 
 state_timeout(#component_data{listener_opts = LOpts}) ->
@@ -443,35 +440,10 @@ unregister_routes(#component_data{component = Component}) ->
     mongoose_component:unregister_component(Component).
 
 %%% Instrumentation helpers
--spec execute_element_event(
-        mongoose_instrument:event_name(), exml:attrs() | exml_stream:element(), data()) -> ok.
-execute_element_event(EventName, #xmlel{name = Name} = El, #component_data{lserver = LServer}) ->
-    Metrics = measure_element(Name, exml_query:attr(El, <<"type">>)),
-    Measurements = Metrics#{element => El, lserver => LServer},
-    mongoose_instrument:execute(EventName, #{}, Measurements);
-execute_element_event(EventName, El, #component_data{lserver = LServer}) ->
-    Measurements = #{count => 1, element => El, lserver => LServer},
-    mongoose_instrument:execute(EventName, #{}, Measurements);
-execute_element_event(_, _, _) ->
-    ok.
-
--spec measure_element(binary(), binary() | undefined) -> mongoose_instrument:measurements().
-measure_element(<<"message">>, <<"error">>) ->
-    #{count => 1, stanza_count => 1, error_count => 1, message_error_count => 1};
-measure_element(<<"iq">>, <<"error">>) ->
-    #{count => 1, stanza_count => 1, error_count => 1, iq_error_count => 1};
-measure_element(<<"presence">>, <<"error">>) ->
-    #{count => 1, stanza_count => 1, error_count => 1, presence_error_count => 1};
-measure_element(<<"message">>, _Type) ->
-    #{count => 1, stanza_count => 1, message_count => 1};
-measure_element(<<"iq">>, _Type) ->
-    #{count => 1, stanza_count => 1, iq_count => 1};
-measure_element(<<"presence">>, _Type) ->
-    #{count => 1, stanza_count => 1, presence_count => 1};
-measure_element(<<"stream:error">>, _Type) ->
-    #{count => 1, error_count => 1};
-measure_element(_Name, _Type) ->
-    #{count => 1}.
+-spec execute_element_event(mongoose_instrument:event_name(), exml:element(), jid:lserver()) -> ok.
+execute_element_event(EventName, Element, LServer) ->
+    Measurements = mongoose_measurements:measure_element(Element),
+    mongoose_instrument:execute(EventName, #{}, Measurements#{lserver => LServer}).
 
 -spec labels() -> mongoose_instrument:labels().
 labels() ->

src/instrument/mongoose_measurements.erl

@@ -0,0 +1,28 @@
+-module(mongoose_measurements).
+
+-export([measure_element/1]).
+
+-include_lib("exml/include/exml.hrl").
+
+-spec measure_element(exml:element()) -> mongoose_instrument:measurements().
+measure_element(#xmlel{name = Name} = Element) ->
+    Metrics = measure_element(Name, exml_query:attr(Element, <<"type">>)),
+    Metrics#{element => Element}.
+
+-spec measure_element(binary(), binary() | undefined) -> mongoose_instrument:measurements().
+measure_element(<<"message">>, <<"error">>) ->
+    #{count => 1, stanza_count => 1, error_count => 1, message_error_count => 1};
+measure_element(<<"iq">>, <<"error">>) ->
+    #{count => 1, stanza_count => 1, error_count => 1, iq_error_count => 1};
+measure_element(<<"presence">>, <<"error">>) ->
+    #{count => 1, stanza_count => 1, error_count => 1, presence_error_count => 1};
+measure_element(<<"message">>, _Type) ->
+    #{count => 1, stanza_count => 1, message_count => 1};
+measure_element(<<"iq">>, _Type) ->
+    #{count => 1, stanza_count => 1, iq_count => 1};
+measure_element(<<"presence">>, _Type) ->
+    #{count => 1, stanza_count => 1, presence_count => 1};
+measure_element(<<"stream:error">>, _Type) ->
+    #{count => 1, error_count => 1};
+measure_element(_Name, _Type) ->
+    #{count => 1}.

src/s2s/mongoose_s2s_in.erl

@@ -528,31 +528,10 @@ send_xml(#s2s_data{myname = LServer, socket = Socket}, Elem) ->
        #{byte_size => exml:xml_size(Elem), lserver => LServer, pid => self(), module => ?MODULE}),
     mongoose_xmpp_socket:send_xml(Socket, Elem).
 
--spec execute_element_event(data(), exml_stream:element(), mongoose_instrument:event_name()) -> ok.
-execute_element_event(#s2s_data{myname = LServer}, #xmlel{name = Name} = El, EventName) ->
-    Metrics = measure_element(Name, exml_query:attr(El, <<"type">>)),
-    Measurements = Metrics#{element => El, lserver => LServer},
-    mongoose_instrument:execute(EventName, #{}, Measurements);
-execute_element_event(_, _, _) ->
-    ok.
-
--spec measure_element(binary(), binary() | undefined) -> mongoose_instrument:measurements().
-measure_element(<<"message">>, <<"error">>) ->
-    #{count => 1, stanza_count => 1, error_count => 1, message_error_count => 1};
-measure_element(<<"iq">>, <<"error">>) ->
-    #{count => 1, stanza_count => 1, error_count => 1, iq_error_count => 1};
-measure_element(<<"presence">>, <<"error">>) ->
-    #{count => 1, stanza_count => 1, error_count => 1, presence_error_count => 1};
-measure_element(<<"message">>, _Type) ->
-    #{count => 1, stanza_count => 1, message_count => 1};
-measure_element(<<"iq">>, _Type) ->
-    #{count => 1, stanza_count => 1, iq_count => 1};
-measure_element(<<"presence">>, _Type) ->
-    #{count => 1, stanza_count => 1, presence_count => 1};
-measure_element(<<"stream:error">>, _Type) ->
-    #{count => 1, error_count => 1};
-measure_element(_Name, _Type) ->
-    #{count => 1}.
+-spec execute_element_event(data(), exml:element(), mongoose_instrument:event_name()) -> ok.
+execute_element_event(#s2s_data{myname = LServer}, Element, EventName) ->
+    Measurements = mongoose_measurements:measure_element(Element),
+    mongoose_instrument:execute(EventName, #{}, Measurements#{lserver => LServer}).
 
 check_auth_domain(error, _) ->
     false;