Merge pull request #5695 from rabbitmq/mergify/bp/v3.11.x/pr-5693

Upgrade MQTT Erlang client (backport #5693)
rabbitmq · Aug 31, 2022 · 8ee6de7 · 8ee6de7
2 parents e92305c + e6d23fa
commit 8ee6de7
Show file tree

Hide file tree

Showing 9 changed files with 299 additions and 305 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -100,8 +100,20 @@ erlang_app(
 )
 
 erlang_package.git_package(
-    repository = "rabbitmq/emqttc",
-    branch = "remove-logging",
+    name = "emqtt",
+    repository = "ansd/emqtt",
+    commit = "f6d7ddd391890f4db5f77c775e83cf0ffe3d2d76",
+    build_file_content = """load("@rules_erlang//:erlang_app.bzl", "erlang_app")
+
+erlang_app(
+    app_name = "emqtt",
+    erlc_opts = [
+        "+deterministic",
+        "+debug_info",
+        "-DBUILD_WITHOUT_QUIC",
+    ],
+)
+""",
 )
 
 erlang_package.hex_package(
@@ -277,7 +289,7 @@ use_repo(
     "ct_helper",
     "cuttlefish",
     "eetcd",
-    "emqttc",
+    "emqtt",
     "gen_batch_server",
     "gun",
     "inet_tcp_proxy_dist",

diff --git a/deps/rabbitmq_mqtt/BUILD.bazel b/deps/rabbitmq_mqtt/BUILD.bazel
@@ -105,7 +105,7 @@ suites = [
         ],
         flaky = True,
         runtime_deps = [
-            "@emqttc//:erlang_app",
+            "@emqtt//:erlang_app",
         ],
     ),
     rabbitmq_integration_suite(
@@ -114,14 +114,14 @@ suites = [
         size = "large",
         flaky = True,
         runtime_deps = [
-            "@emqttc//:erlang_app",
+            "@emqtt//:erlang_app",
         ],
     ),
     rabbitmq_integration_suite(
         PACKAGE,
         name = "command_SUITE",
         runtime_deps = [
-            "@emqttc//:erlang_app",
+            "@emqtt//:erlang_app",
         ],
     ),
     rabbitmq_integration_suite(
@@ -153,14 +153,14 @@ suites = [
         PACKAGE,
         name = "reader_SUITE",
         runtime_deps = [
-            "@emqttc//:erlang_app",
+            "@emqtt//:erlang_app",
         ],
     ),
     rabbitmq_integration_suite(
         PACKAGE,
         name = "retainer_SUITE",
         runtime_deps = [
-            "@emqttc//:erlang_app",
+            "@emqtt//:erlang_app",
         ],
     ),
     rabbitmq_suite(

diff --git a/deps/rabbitmq_mqtt/Makefile b/deps/rabbitmq_mqtt/Makefile
@@ -31,11 +31,15 @@ define PROJECT_APP_EXTRA_KEYS
 	{broker_version_requirements, []}
 endef
 
+# We do not need QUIC as dependency of emqtt.
+BUILD_WITHOUT_QUIC=1
+export BUILD_WITHOUT_QUIC
+
 DEPS = ranch rabbit_common rabbit amqp_client ra
-TEST_DEPS = emqttc ct_helper rabbitmq_ct_helpers rabbitmq_ct_client_helpers
+TEST_DEPS = emqtt ct_helper rabbitmq_ct_helpers rabbitmq_ct_client_helpers
 
 dep_ct_helper = git https://github.com/extend/ct_helper.git master
-dep_emqttc = git https://github.com/rabbitmq/emqttc.git remove-logging
+dep_emqtt = git https://github.com/ansd/emqtt.git f6d7ddd391890f4db5f77c775e83cf0ffe3d2d76
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk