chore: use json module instead of jsx, update CI to use OTP 27

id · id · commit 03d419e940ad · 2025-07-07T14:40:50.000+02:00
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -9,9 +9,9 @@ jobs:
       fail-fast: false
       matrix:
         otp:
-          - 26.2.5-1
+          - 27.2-3
         elixir:
-          - 1.15.7
+          - 1.18.3
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
@@ -39,25 +39,28 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
-            FROM=ghcr.io/emqx/emqx-builder/5.3-7:${{ matrix.elixir }}-${{ matrix.otp }}-debian12
+            FROM=ghcr.io/emqx/emqx-builder/5.5-2:${{ matrix.elixir }}-${{ matrix.otp }}-debian12
 
   linux:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.arch == 'arm64' && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
     strategy:
       fail-fast: false
       matrix:
         otp:
-          - 26.2.5-1
+          - 27.2-3
         elixir:
-          - 1.15.7
+          - 1.18.3
         quic_support:
           - true
           - false
         os:
-          - ubuntu22.04
+          - ubuntu24.04
+        arch:
+          - amd64
+          - arm64
 
     container:
-      image: ghcr.io/emqx/emqx-builder/5.3-7:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}
+      image: ghcr.io/emqx/emqx-builder/5.5-2:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -88,9 +91,9 @@ jobs:
       fail-fast: false
       matrix:
         macos:
-          - macos-14
+          - macos-15
         otp:
-          - 26.2.5-1
+          - 27.2-3
 
     runs-on: ${{ matrix.macos }}
 
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -20,9 +20,9 @@ jobs:
       fail-fast: false
       matrix:
         otp:
-          - 26.2.5-1
+          - 27.2-3
         elixir:
-          - 1.15.7
+          - 1.18.3
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
@@ -52,20 +52,21 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
-            FROM=ghcr.io/emqx/emqx-builder/5.3-7:${{ matrix.elixir }}-${{ matrix.otp }}-debian12
+            FROM=ghcr.io/emqx/emqx-builder/5.5-2:${{ matrix.elixir }}-${{ matrix.otp }}-debian12
 
   linux:
     strategy:
       fail-fast: false
       matrix:
         otp:
-          - 26.2.5.2-3
+          - 27.2-3
         elixir:
-          - 1.15.7
+          - 1.18.3
         quic_support:
           - true
           - false
         os:
+          - ubuntu24.04
           - ubuntu22.04
           - ubuntu20.04
           - debian12
@@ -76,11 +77,11 @@ jobs:
           - amzn2
           - amzn2023
         arch:
-          - ""
-          - "-arm"
-    runs-on: ubuntu-22.04${{ matrix.arch }}
+          - amd64
+          - arm64
+    runs-on: ${{ matrix.arch == 'arm64' && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
     env:
-      IMAGE: ghcr.io/emqx/emqx-builder/5.4-4:1.15.7-${{ matrix.otp }}-${{ matrix.os }}
+      IMAGE: ghcr.io/emqx/emqx-builder/5.5-2:1.15.7-${{ matrix.otp }}-${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -118,18 +119,18 @@ jobs:
           popd
       - uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
         with:
-          name: "emqtt-bench-${{ matrix.os }}-${{ matrix.otp }}-${{ matrix.elixir }}-${{ matrix.quic_support }}${{ matrix.arch }}"
+          name: "emqtt-bench-${{ matrix.os }}-${{ matrix.otp }}-${{ matrix.elixir }}-${{ matrix.quic_support }}-${{ matrix.arch }}"
           path: ./*.tar.gz
 
   mac:
     strategy:
       fail-fast: false
       matrix:
         macos:
-          - macos-13
           - macos-14
+          - macos-15
         otp:
-          - 26.2.5-1
+          - 27.2-3
 
     runs-on: ${{ matrix.macos }}
 
diff --git a/.tool-versions b/.tool-versions
@@ -1 +1 @@
-erlang 27.1-1
+erlang 27.2-3
diff --git a/rebar.config b/rebar.config
@@ -1,6 +1,6 @@
 %% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*-
 %% ex: ts=4 sw=4 ft=erlang et
-{minimum_otp_vsn, "23.2"}.
+{minimum_otp_vsn, "27.2"}.
 
 {erl_opts, [debug_info,
             warn_export_all,
@@ -15,11 +15,12 @@
 {validate_app_modules, true}.
 
 {deps, [
-  {getopt, {git, "https://github.com/zmstone/getopt", {tag, "v1.0.2.1"}}},
-  {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.14.0"}}},
+  {getopt, "1.0.2"},
+  {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.14.5"}}},
   {prometheus, {git, "https://github.com/emqx/prometheus.erl", {tag, "v4.10.0.2"}}},
-  {cowboy, "2.9.0"},
-  {jsx, "3.1.0"}
+  {cowlib, "2.14.0"},
+  {ranch, {git, "https://github.com/emqx/ranch", {tag, "1.8.1-emqx-1"}}},
+  {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.13.0-emqx-2"}}}
 ]}.
 
 {escript_name, emqtt_bench}.
diff --git a/rebar.config.script b/rebar.config.script
@@ -25,7 +25,6 @@ Profiles = {profiles,[ {escript, []}
                                                                 , getopt
                                                                 , cowboy
                                                                 , prometheus
-                                                                , jsx
                                                                   | [ quicer || IsQuicSupp ]
                                                                 ] }
                                 , {overlay_vars_values, [ {runner_root_dir, "$(cd $(dirname $(readlink $0 || echo $0))/..; pwd -P)"}
diff --git a/src/emqtt_bench.app.src b/src/emqtt_bench.app.src
@@ -8,7 +8,6 @@
                   getopt,
                   gun,
                   cowlib,
-                  jsx,
                   prometheus,
                   quantile_estimator,
                   cowboy
diff --git a/src/emqtt_bench.erl b/src/emqtt_bench.erl
@@ -870,7 +870,7 @@ publish_topic(Client, Topic, #{ name := Topic
                 end,
    NewPayload =
       case PayloadEncoding of
-         json -> jsx:encode(Payload1);
+         json -> json:encode(Payload1);
          eterm -> maybe_prefix_payload(term_to_binary(Payload1), ClientOpts)
       end,
    update_publish_start_at(Topic),
@@ -1468,7 +1468,7 @@ parse_topics_payload(Opts) ->
       undefined -> undefined;
       Filename ->
          {ok, Content} = file:read_file(Filename),
-         #{<<"topics">> := TopicSpecs} = jsx:decode(Content),
+         #{<<"topics">> := TopicSpecs} = json:decode(Content),
          lists:foldl(fun(#{ <<"name">> := TopicName,
                             <<"inject_timestamp">> := WithTS,
                             <<"interval_ms">> := IntervalMS,
