Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/system_metrics/mongoose_system_metrics_collector.erl
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@

-export_type([report_struct/0]).

-export([collect/1]).
-export([collect/2]).

collect(PrevReport) ->
collect(PrevReport, ExometerEnabled) ->
ReportResults = [ get_reports(RGetter) || RGetter <- report_getters()],
StanzasCount = get_xmpp_stanzas_count(PrevReport),
StanzasCount = get_xmpp_stanzas_count(PrevReport, ExometerEnabled),
lists:flatten(ReportResults ++ StanzasCount).

-spec get_reports(fun(() -> [report_struct()])) -> [report_struct()].
Expand Down Expand Up @@ -180,7 +180,9 @@
[#{name => outgoing_pool,
params => #{value => Type}} || #{type := Type} <- OutgoingPools].

get_xmpp_stanzas_count(PrevReport) ->
get_xmpp_stanzas_count(_PrevReport, false = _ExometerEnabled) ->
[];

Check warning on line 184 in src/system_metrics/mongoose_system_metrics_collector.erl

View check run for this annotation

Codecov / codecov/patch

src/system_metrics/mongoose_system_metrics_collector.erl#L184

Added line #L184 was not covered by tests
get_xmpp_stanzas_count(PrevReport, true) ->
StanzaTypes = [xmppMessageSent, xmppMessageReceived, xmppIqSent,
xmppIqReceived, xmppPresenceSent, xmppPresenceReceived],
NewCount = [count_stanzas(StanzaType) || StanzaType <- StanzaTypes],
Expand Down
17 changes: 14 additions & 3 deletions src/system_metrics/service_mongoose_system_metrics.erl
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
{report_after :: non_neg_integer(),
reporter_monitor = none :: none | reference(),
reporter_pid = none :: none | pid(),
exometer_enabled = false :: boolean(),
prev_report = [] :: [mongoose_system_metrics_collector:report_struct()],
tracking_ids :: [tracking_id()]}).

Expand Down Expand Up @@ -103,21 +104,24 @@
#{initial_report := InitialReport, periodic_report := PeriodicReport} = Opts,
TrackingIds = tracking_ids(Opts),
erlang:send_after(InitialReport, self(), spawn_reporter),
ExometerEnabled = exometer_loaded(),
{ok, #system_metrics_state{report_after = PeriodicReport,
tracking_ids = TrackingIds}}
tracking_ids = TrackingIds,
exometer_enabled = ExometerEnabled}}
end.

handle_info(spawn_reporter, #system_metrics_state{report_after = ReportAfter,
reporter_monitor = none,
reporter_pid = none,
prev_report = PrevReport,
tracking_ids = TrackingIds} = State) ->
tracking_ids = TrackingIds,
exometer_enabled = ExometerEnabled} = State) ->
ServicePid = self(),
case get_client_id() of
{ok, ClientId} ->
{Pid, Monitor} = spawn_monitor(
fun() ->
Reports = mongoose_system_metrics_collector:collect(PrevReport),
Reports = mongoose_system_metrics_collector:collect(PrevReport, ExometerEnabled),
mongoose_system_metrics_sender:send(ClientId, Reports, TrackingIds),
mongoose_system_metrics_file:save(Reports),
ServicePid ! {prev_report, Reports}
Expand Down Expand Up @@ -208,3 +212,10 @@
" https://esl.github.io/MongooseDocs/latest/operation-and-maintenance/System-Metrics-Privacy-Policy/ \n"
"- MongooseIM GitHub page - https://github.com/esl/MongooseIM \n"
"The last sent report is also written to a file ~s">>.

-spec exometer_loaded() -> boolean().
exometer_loaded() ->
case mongoose_config:lookup_opt([instrumentation, exometer]) of
{ok, _} -> true;
_ -> false

Check warning on line 220 in src/system_metrics/service_mongoose_system_metrics.erl

View check run for this annotation

Codecov / codecov/patch

src/system_metrics/service_mongoose_system_metrics.erl#L220

Added line #L220 was not covered by tests
end.