From db713cb65615fda7be6fe15cc4b70ce9ccd7ef25 Mon Sep 17 00:00:00 2001 From: Ilya Averyanov Date: Tue, 28 May 2024 12:47:04 +0300 Subject: [PATCH] chore(bridges): increase log level for bridge buffer overflow reports Co-authored-by: Andrew Mayorov --- apps/emqx_conf/src/emqx_conf_schema.erl | 3 ++- apps/emqx_resource/src/emqx_resource.app.src | 2 +- apps/emqx_resource/src/emqx_resource_buffer_worker.erl | 4 ++-- changes/ce/feat-13144.en.md | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 changes/ce/feat-13144.en.md diff --git a/apps/emqx_conf/src/emqx_conf_schema.erl b/apps/emqx_conf/src/emqx_conf_schema.erl index d5b902ba4..d538c7368 100644 --- a/apps/emqx_conf/src/emqx_conf_schema.erl +++ b/apps/emqx_conf/src/emqx_conf_schema.erl @@ -85,7 +85,8 @@ cannot_publish_to_topic_due_to_quota_exceeded, connection_rejected_due_to_license_limit_reached, dropped_msg_due_to_mqueue_is_full, - socket_receive_paused_by_rate_limit + socket_receive_paused_by_rate_limit, + data_bridge_buffer_overflow ]). %% Callback to upgrade config after loaded from config file but before validation. diff --git a/apps/emqx_resource/src/emqx_resource.app.src b/apps/emqx_resource/src/emqx_resource.app.src index 913cc5e8c..39b8ec8d1 100644 --- a/apps/emqx_resource/src/emqx_resource.app.src +++ b/apps/emqx_resource/src/emqx_resource.app.src @@ -1,7 +1,7 @@ %% -*- mode: erlang -*- {application, emqx_resource, [ {description, "Manager for all external resources"}, - {vsn, "0.1.29"}, + {vsn, "0.1.30"}, {registered, []}, {mod, {emqx_resource_app, []}}, {applications, [ diff --git a/apps/emqx_resource/src/emqx_resource_buffer_worker.erl b/apps/emqx_resource/src/emqx_resource_buffer_worker.erl index 5f269c112..b0db3ca20 100644 --- a/apps/emqx_resource/src/emqx_resource_buffer_worker.erl +++ b/apps/emqx_resource/src/emqx_resource_buffer_worker.erl @@ -1777,8 +1777,8 @@ append_queue(Id, Index, Q, Queries) -> ok = replayq:ack(Q1, QAckRef), Dropped = length(Items2), Counters = #{dropped_queue_full => Dropped}, - ?SLOG(info, #{ - msg => "buffer_worker_overflow", + ?SLOG_THROTTLE(warning, #{ + msg => data_bridge_buffer_overflow, resource_id => Id, worker_index => Index, dropped => Dropped diff --git a/changes/ce/feat-13144.en.md b/changes/ce/feat-13144.en.md new file mode 100644 index 000000000..48b9b0f29 --- /dev/null +++ b/changes/ce/feat-13144.en.md @@ -0,0 +1 @@ +Emit a `warning` level throttled log when bridge buffers are overflown and messages get dropped. Previously, the log events had `info` level and were not visible with the default log level.