Merge pull request #3637 from esl/perf/origin_stanza_acc

Skip pretty-printing of unused accumulator field
esl · Apr 26, 2022 · c53ce7a · c53ce7a
2 parents f5b511c + 6189d6d
commit c53ce7a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 15 deletions.
diff --git a/src/mongoose_acc.erl b/src/mongoose_acc.erl
@@ -81,7 +81,6 @@
         timestamp := integer(), %microsecond
         origin_pid := pid(),
         origin_location := location(),
-        origin_stanza := binary() | undefined,
         stanza := stanza_metadata() | undefined,
         lserver := jid:lserver(),
         host_type := binary() | undefined,
@@ -124,19 +123,17 @@
 
 -spec new(Params :: new_acc_params()) -> t().
 new(#{ location := Location, lserver := LServer } = Params) ->
-    {ElementBin, Stanza} =
-    case maps:get(element, Params, undefined) of
-        undefined -> {undefined, undefined};
-        Element -> {exml:to_binary(Element), stanza_from_params(Params)}
-    end,
+    Stanza = case maps:get(element, Params, undefined) of
+                 undefined -> undefined;
+                 _Element -> stanza_from_params(Params)
+             end,
     HostType = get_host_type(Params),
     #{
       mongoose_acc => true,
       ref => make_ref(),
       timestamp => os:system_time(microsecond),
       origin_pid => self(),
       origin_location => Location,
-      origin_stanza => ElementBin,
       stanza => Stanza,
       lserver => LServer,
       host_type => HostType,
@@ -341,7 +338,6 @@ default_non_strippable() ->
      timestamp,
      origin_pid,
      origin_location,
-     origin_stanza,
      stanza,
      lserver,
      host_type,

diff --git a/test/json_formatter_SUITE.erl b/test/json_formatter_SUITE.erl
@@ -346,21 +346,18 @@ large_event_dont_crash_formatter(_Config) ->
 %%
 
 example_acc(Body) ->
+    Elem = {xmlel, <<"message">>,
+            [{<<"type">>, <<"chat">>}, {<<"id">>, <<"1111">>}],
+            [{xmlel, <<"body">>,[], [{xmlcdata, Body}]}]},
     #{lserver => <<"localhost">>,
       mongoose_acc => true,
       non_strippable => [],
       origin_location => #{file => "/Users/user/MongooseIM/src/ejabberd_router.erl",
                            line => 116,
                            mfa => {ejabberd_router,route,3}},
       origin_pid => self(),
-      origin_stanza => <<"<message type='chat' id='1111'><body>",
-                         Body/binary,
-                         "</body></message>">>,
       ref => make_ref(),
-      stanza => #{element => {xmlel,<<"message">>,
-                              [{<<"type">>,<<"chat">>},{<<"id">>,<<"1111">>}],
-                              [{xmlel,<<"body">>,[],
-                                [{xmlcdata,Body}]}]},
+      stanza => #{element => Elem,
                   from_jid => {jid,<<"userA">>,<<"localhost">>,<<>>,<<"usera">>,<<"localhost">>,<<>>},
                   name => <<"message">>,
                   ref => make_ref(),