yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(bridge-mqtt): fix bad received metrics counting

This commit is contained in:
JianBo He 2021-01-23 18:46:53 +08:00 committed by turtleDeng
parent f3420e8810
commit 3de8fea435
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/emqx_bridge_mqtt/src/emqx_bridge_worker.erl
View File

@ -377,9 +377,14 @@ common(_StateName, {call, From}, {ensure_present, What, Topic}, State) ->
common(_StateName, {call, From}, {ensure_absent, What, Topic}, State) -> common(_StateName, {call, From}, {ensure_absent, What, Topic}, State) ->
{Result, NewState} = ensure_absent(What, Topic, State), {Result, NewState} = ensure_absent(What, Topic, State),
{keep_state, NewState, [{reply, From, Result}]}; {keep_state, NewState, [{reply, From, Result}]};
common(_StateName, info, {deliver, _, Msg}, #{replayq := Q, if_record_metrics := IfRecordMetric} = State) -> common(_StateName, info, {deliver, _, Msg},
bridges_metrics_inc(IfRecordMetric, 'bridge.mqtt.message_received'), State = #{replayq := Q, if_record_metrics := IfRecordMetric}) ->
NewQ = replayq:append(Q, collect([Msg])), Msgs = collect([Msg]),
bridges_metrics_inc(IfRecordMetric,
'bridge.mqtt.message_received',
length(Msgs)
),
NewQ = replayq:append(Q, Msgs),
{keep_state, State#{replayq => NewQ}, {next_event, internal, maybe_send}}; {keep_state, State#{replayq => NewQ}, {next_event, internal, maybe_send}};
common(_StateName, info, {'EXIT', _, _}, State) -> common(_StateName, info, {'EXIT', _, _}, State) ->
{keep_state, State}; {keep_state, State};
@ -586,3 +591,8 @@ bridges_metrics_inc(true, Metric) ->
emqx_metrics:inc(Metric); emqx_metrics:inc(Metric);
bridges_metrics_inc(_IsRecordMetric, _Metric) -> bridges_metrics_inc(_IsRecordMetric, _Metric) ->
ok. ok.
bridges_metrics_inc(true, Metric, Value) ->
emqx_metrics:inc(Metric, Value);
bridges_metrics_inc(_IsRecordMetric, _Metric, _Value) ->
ok.