Merge pull request #12546 from thalesmg/sync-r55-m-20240220

sync `release-55` to `master`
2024-02-21 09:09:07 +01:00 · 2024-02-21 09:09:07 +01:00 · 8e44c80dd0
parent 8ae58c8066 65cfece0a3
commit 8e44c80dd0
31 changed files with 34 additions and 30 deletions
--- a/apps/emqx/src/emqx.app.src
+++ b/apps/emqx/src/emqx.app.src
@ -2,7 +2,7 @@
 {application, emqx, [
    {id, "emqx"},
    {description, "EMQX Core"},
-    {vsn, "5.1.19"},
+    {vsn, "5.1.20"},
    {modules, []},
    {registered, []},
    {applications, [
--- a/apps/emqx_auth/src/emqx_auth.app.src
+++ b/apps/emqx_auth/src/emqx_auth.app.src
@ -1,7 +1,7 @@
 %% -*- mode: erlang -*-
 {application, emqx_auth, [
    {description, "EMQX Authentication and authorization"},
-    {vsn, "0.2.1"},
+    {vsn, "0.2.2"},
    {modules, []},
    {registered, [emqx_auth_sup]},
    {applications, [
--- a/apps/emqx_auth_mnesia/src/emqx_auth_mnesia.app.src
+++ b/apps/emqx_auth_mnesia/src/emqx_auth_mnesia.app.src
@ -1,7 +1,7 @@
 %% -*- mode: erlang -*-
 {application, emqx_auth_mnesia, [
    {description, "EMQX Buitl-in Database Authentication and Authorization"},
-    {vsn, "0.1.3"},
+    {vsn, "0.1.4"},
    {registered, []},
    {mod, {emqx_auth_mnesia_app, []}},
    {applications, [
--- a/apps/emqx_bridge/src/emqx_bridge.app.src
+++ b/apps/emqx_bridge/src/emqx_bridge.app.src
@ -1,7 +1,7 @@
 %% -*- mode: erlang -*-
 {application, emqx_bridge, [
    {description, "EMQX bridges"},
-    {vsn, "0.1.33"},
+    {vsn, "0.1.34"},
    {registered, [emqx_bridge_sup]},
    {mod, {emqx_bridge_app, []}},
    {applications, [
--- a/apps/emqx_bridge_greptimedb/src/emqx_bridge_greptimedb.app.src
+++ b/apps/emqx_bridge_greptimedb/src/emqx_bridge_greptimedb.app.src
@ -1,6 +1,6 @@
 {application, emqx_bridge_greptimedb, [
    {description, "EMQX GreptimeDB Bridge"},
-    {vsn, "0.1.7"},
+    {vsn, "0.1.8"},
    {registered, []},
    {applications, [
        kernel,
--- a/apps/emqx_bridge_http/src/emqx_bridge_http.app.src
+++ b/apps/emqx_bridge_http/src/emqx_bridge_http.app.src
@ -1,6 +1,6 @@
 {application, emqx_bridge_http, [
    {description, "EMQX HTTP Bridge and Connector Application"},
-    {vsn, "0.2.2"},
+    {vsn, "0.2.3"},
    {registered, []},
    {applications, [kernel, stdlib, emqx_resource, ehttpc]},
    {env, [{emqx_action_info_modules, [emqx_bridge_http_action_info]}]},
--- a/apps/emqx_bridge_http/src/emqx_bridge_http_connector.erl
+++ b/apps/emqx_bridge_http/src/emqx_bridge_http_connector.erl
@ -878,9 +878,9 @@ redact(Data) ->
 %% and we also can't know the body format and where the sensitive data will be
 %% so the easy way to keep data security is redacted the whole body
 redact_request({Path, Headers}) ->
-    {Path, Headers};
+    {Path, redact(Headers)};
 redact_request({Path, Headers, _Body}) ->
-    {Path, Headers, <<"******">>}.
+    {Path, redact(Headers), <<"******">>}.

 clientid(Msg) -> maps:get(clientid, Msg, undefined).

--- a/apps/emqx_bridge_kafka/src/emqx_bridge_kafka.app.src
+++ b/apps/emqx_bridge_kafka/src/emqx_bridge_kafka.app.src
@ -1,7 +1,7 @@
 %% -*- mode: erlang -*-
 {application, emqx_bridge_kafka, [
    {description, "EMQX Enterprise Kafka Bridge"},
-    {vsn, "0.2.1"},
+    {vsn, "0.2.2"},
    {registered, [emqx_bridge_kafka_consumer_sup]},
    {applications, [
        kernel,
--- a/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.app.src
+++ b/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.app.src
@ -1,7 +1,7 @@
 %% -*- mode: erlang -*-
 {application, emqx_bridge_mqtt, [
    {description, "EMQX MQTT Broker Bridge"},
-    {vsn, "0.1.8"},
+    {vsn, "0.1.9"},
    {registered, []},
    {applications, [
        kernel,
--- a/apps/emqx_conf/src/emqx_conf.app.src
+++ b/apps/emqx_conf/src/emqx_conf.app.src
@ -1,6 +1,6 @@
 {application, emqx_conf, [
    {description, "EMQX configuration management"},
-    {vsn, "0.1.34"},
+    {vsn, "0.1.35"},
    {registered, []},
    {mod, {emqx_conf_app, []}},
    {applications, [kernel, stdlib]},
--- a/apps/emqx_connector/src/emqx_connector.app.src
+++ b/apps/emqx_connector/src/emqx_connector.app.src
@ -1,7 +1,7 @@
 %% -*- mode: erlang -*-
 {application, emqx_connector, [
    {description, "EMQX Data Integration Connectors"},
-    {vsn, "0.1.38"},
+    {vsn, "0.1.39"},
    {registered, []},
    {mod, {emqx_connector_app, []}},
    {applications, [
--- a/apps/emqx_dashboard/src/emqx_dashboard.app.src
+++ b/apps/emqx_dashboard/src/emqx_dashboard.app.src
@ -2,7 +2,7 @@
 {application, emqx_dashboard, [
    {description, "EMQX Web Dashboard"},
    % strict semver, bump manually!
-    {vsn, "5.0.32"},
+    {vsn, "5.0.33"},
    {modules, []},
    {registered, [emqx_dashboard_sup]},
    {applications, [
--- a/apps/emqx_durable_storage/src/emqx_durable_storage.app.src
+++ b/apps/emqx_durable_storage/src/emqx_durable_storage.app.src
@ -2,7 +2,7 @@
 {application, emqx_durable_storage, [
    {description, "Message persistence and subscription replays for EMQX"},
    % strict semver, bump manually!
-    {vsn, "0.1.11"},
+    {vsn, "0.1.12"},
    {modules, []},
    {registered, []},
    {applications, [kernel, stdlib, rocksdb, gproc, mria, emqx_utils]},
--- a/apps/emqx_ft/src/emqx_ft.app.src
+++ b/apps/emqx_ft/src/emqx_ft.app.src
@ -1,6 +1,6 @@
 {application, emqx_ft, [
    {description, "EMQX file transfer over MQTT"},
-    {vsn, "0.1.13"},
+    {vsn, "0.1.14"},
    {registered, []},
    {mod, {emqx_ft_app, []}},
    {applications, [
--- a/apps/emqx_gateway/src/emqx_gateway.app.src
+++ b/apps/emqx_gateway/src/emqx_gateway.app.src
@ -1,7 +1,7 @@
 %% -*- mode: erlang -*-
 {application, emqx_gateway, [
    {description, "The Gateway management application"},
-    {vsn, "0.1.30"},
+    {vsn, "0.1.31"},
    {registered, []},
    {mod, {emqx_gateway_app, []}},
    {applications, [kernel, stdlib, emqx, emqx_auth, emqx_ctl]},
--- a/apps/emqx_gateway_exproto/src/emqx_gateway_exproto.app.src
+++ b/apps/emqx_gateway_exproto/src/emqx_gateway_exproto.app.src
@ -1,7 +1,7 @@
 %% -*- mode: erlang -*-
 {application, emqx_gateway_exproto, [
    {description, "ExProto Gateway"},
-    {vsn, "0.1.8"},
+    {vsn, "0.1.9"},
    {registered, []},
    {applications, [kernel, stdlib, grpc, emqx, emqx_gateway]},
    {env, []},
--- a/apps/emqx_gateway_ocpp/src/emqx_gateway_ocpp.app.src
+++ b/apps/emqx_gateway_ocpp/src/emqx_gateway_ocpp.app.src
@ -1,6 +1,6 @@
 {application, emqx_gateway_ocpp, [
    {description, "OCPP-J 1.6 Gateway for EMQX"},
-    {vsn, "0.1.2"},
+    {vsn, "0.1.3"},
    {registered, []},
    {applications, [kernel, stdlib, jesse, emqx, emqx_gateway]},
    {env, []},
--- a/apps/emqx_license/src/emqx_license.app.src
+++ b/apps/emqx_license/src/emqx_license.app.src
@ -1,6 +1,6 @@
 {application, emqx_license, [
    {description, "EMQX License"},
-    {vsn, "5.0.15"},
+    {vsn, "5.0.16"},
    {modules, []},
    {registered, [emqx_license_sup]},
    {applications, [kernel, stdlib, emqx_ctl]},
--- a/apps/emqx_machine/src/emqx_machine.app.src
+++ b/apps/emqx_machine/src/emqx_machine.app.src
@ -3,7 +3,7 @@
    {id, "emqx_machine"},
    {description, "The EMQX Machine"},
    % strict semver, bump manually!
-    {vsn, "0.2.18"},
+    {vsn, "0.2.19"},
    {modules, []},
    {registered, []},
    {applications, [kernel, stdlib, emqx_ctl]},
--- a/apps/emqx_management/src/emqx_management.app.src
+++ b/apps/emqx_management/src/emqx_management.app.src
@ -2,7 +2,7 @@
 {application, emqx_management, [
    {description, "EMQX Management API and CLI"},
    % strict semver, bump manually!
-    {vsn, "5.0.37"},
+    {vsn, "5.0.38"},
    {modules, []},
    {registered, [emqx_management_sup]},
    {applications, [
--- a/apps/emqx_modules/src/emqx_modules.app.src
+++ b/apps/emqx_modules/src/emqx_modules.app.src
@ -1,7 +1,7 @@
 %% -*- mode: erlang -*-
 {application, emqx_modules, [
    {description, "EMQX Modules"},
-    {vsn, "5.0.25"},
+    {vsn, "5.0.26"},
    {modules, []},
    {applications, [kernel, stdlib, emqx, emqx_ctl, observer_cli]},
    {mod, {emqx_modules_app, []}},
--- a/apps/emqx_mongodb/src/emqx_mongodb.app.src
+++ b/apps/emqx_mongodb/src/emqx_mongodb.app.src
@ -1,6 +1,6 @@
 {application, emqx_mongodb, [
    {description, "EMQX MongoDB Connector"},
-    {vsn, "0.1.5"},
+    {vsn, "0.1.6"},
    {registered, []},
    {applications, [
        kernel,
--- a/apps/emqx_mysql/src/emqx_mysql.app.src
+++ b/apps/emqx_mysql/src/emqx_mysql.app.src
@ -1,6 +1,6 @@
 {application, emqx_mysql, [
    {description, "EMQX MySQL Database Connector"},
-    {vsn, "0.1.7"},
+    {vsn, "0.1.8"},
    {registered, []},
    {applications, [
        kernel,
--- a/apps/emqx_postgresql/src/emqx_postgresql.app.src
+++ b/apps/emqx_postgresql/src/emqx_postgresql.app.src
@ -1,6 +1,6 @@
 {application, emqx_postgresql, [
    {description, "EMQX PostgreSQL Database Connector"},
-    {vsn, "0.1.2"},
+    {vsn, "0.1.3"},
    {registered, []},
    {applications, [
        kernel,
--- a/apps/emqx_prometheus/src/emqx_prometheus.app.src
+++ b/apps/emqx_prometheus/src/emqx_prometheus.app.src
@ -2,7 +2,7 @@
 {application, emqx_prometheus, [
    {description, "Prometheus for EMQX"},
    % strict semver, bump manually!
-    {vsn, "5.0.19"},
+    {vsn, "5.0.20"},
    {modules, []},
    {registered, [emqx_prometheus_sup]},
    {applications, [kernel, stdlib, prometheus, emqx, emqx_auth, emqx_resource, emqx_management]},
--- 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.27"},
+    {vsn, "0.1.28"},
    {registered, []},
    {mod, {emqx_resource_app, []}},
    {applications, [
--- a/apps/emqx_retainer/src/emqx_retainer.app.src
+++ b/apps/emqx_retainer/src/emqx_retainer.app.src
@ -2,7 +2,7 @@
 {application, emqx_retainer, [
    {description, "EMQX Retainer"},
    % strict semver, bump manually!
-    {vsn, "5.0.20"},
+    {vsn, "5.0.21"},
    {modules, []},
    {registered, [emqx_retainer_sup]},
    {applications, [kernel, stdlib, emqx, emqx_ctl]},
--- a/apps/emqx_rule_engine/src/emqx_rule_engine.app.src
+++ b/apps/emqx_rule_engine/src/emqx_rule_engine.app.src
@ -2,7 +2,7 @@
 {application, emqx_rule_engine, [
    {description, "EMQX Rule Engine"},
    % strict semver, bump manually!
-    {vsn, "5.0.32"},
+    {vsn, "5.0.33"},
    {modules, []},
    {registered, [emqx_rule_engine_sup, emqx_rule_engine]},
    {applications, [
--- a/apps/emqx_utils/src/emqx_utils.app.src
+++ b/apps/emqx_utils/src/emqx_utils.app.src
@ -2,7 +2,7 @@
 {application, emqx_utils, [
    {description, "Miscellaneous utilities for EMQX apps"},
    % strict semver, bump manually!
-    {vsn, "5.0.15"},
+    {vsn, "5.0.16"},
    {modules, [
        emqx_utils,
        emqx_utils_api,
--- a/changes/ce/fix-12542.en.md
+++ b/changes/ce/fix-12542.en.md
@ -0,0 +1 @@
+Redacted authorization headers from debug logs from HTTP bridge.
--- a/changes/ee/perf-12497.en.md
+++ b/changes/ee/perf-12497.en.md
@ -0,0 +1,3 @@
+Improve MongoDB connector performance.
+
+- [mongodb-erlang PR](https://github.com/emqx/mongodb-erlang/pull/41)
				`@ -0,0 +1 @@`
				`Redacted authorization headers from debug logs from HTTP bridge.`