From 9fb6688801223347e7fc266faf6b0e2913d5ab18 Mon Sep 17 00:00:00 2001
From: William Yang <mscame@gmail.com>
Date: Wed, 24 Jan 2024 21:36:25 +0100
Subject: [PATCH] fix(quic): Per listener conn count

---
 apps/emqx/rebar.config.script    | 2 +-
 apps/emqx/src/emqx_listeners.erl | 8 +++-----
 mix.exs                          | 2 +-
 rebar.config.erl                 | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/apps/emqx/rebar.config.script b/apps/emqx/rebar.config.script
index 5f5ce18ba..812aeae46 100644
--- a/apps/emqx/rebar.config.script
+++ b/apps/emqx/rebar.config.script
@@ -24,7 +24,7 @@ IsQuicSupp = fun() ->
 end,
 
 Bcrypt = {bcrypt, {git, "https://github.com/emqx/erlang-bcrypt.git", {tag, "0.6.0"}}},
-Quicer = {quicer, {git, "https://github.com/emqx/quic.git", {tag, "0.0.312"}}}.
+Quicer = {quicer, {git, "https://github.com/emqx/quic.git", {tag, "0.0.313"}}}.
 
 Dialyzer = fun(Config) ->
     {dialyzer, OldDialyzerConfig} = lists:keyfind(dialyzer, 1, Config),
diff --git a/apps/emqx/src/emqx_listeners.erl b/apps/emqx/src/emqx_listeners.erl
index 95815dacd..1875fbc90 100644
--- a/apps/emqx/src/emqx_listeners.erl
+++ b/apps/emqx/src/emqx_listeners.erl
@@ -182,11 +182,9 @@ current_conns(Type, Name, ListenOn) when Type == tcp; Type == ssl ->
     esockd:get_current_connections({listener_id(Type, Name), ListenOn});
 current_conns(Type, Name, _ListenOn) when Type =:= ws; Type =:= wss ->
     proplists:get_value(all_connections, ranch:info(listener_id(Type, Name)));
-current_conns(quic, _Name, _ListenOn) ->
-    case quicer:perf_counters() of
-        {ok, PerfCnts} -> proplists:get_value(conn_active, PerfCnts);
-        _ -> 0
-    end;
+current_conns(quic, Name, _ListenOn) ->
+    {ok, LPid} = quicer:listener(listener_id(quic, Name)),
+    quicer_listener:count_conns(LPid);
 current_conns(_, _, _) ->
     {error, not_support}.
 
diff --git a/mix.exs b/mix.exs
index 7389cb0f9..77b7d42ec 100644
--- a/mix.exs
+++ b/mix.exs
@@ -795,7 +795,7 @@ defmodule EMQXUmbrella.MixProject do
   defp quicer_dep() do
     if enable_quicer?(),
       # in conflict with emqx and emqtt
-      do: [{:quicer, github: "emqx/quic", tag: "0.0.312", override: true}],
+      do: [{:quicer, github: "emqx/quic", tag: "0.0.313", override: true}],
       else: []
   end
 
diff --git a/rebar.config.erl b/rebar.config.erl
index e374959dc..4b7917f01 100644
--- a/rebar.config.erl
+++ b/rebar.config.erl
@@ -36,7 +36,7 @@ assert_otp() ->
     end.
 
 quicer() ->
-    {quicer, {git, "https://github.com/emqx/quic.git", {tag, "0.0.312"}}}.
+    {quicer, {git, "https://github.com/emqx/quic.git", {tag, "0.0.313"}}}.
 
 jq() ->
     {jq, {git, "https://github.com/emqx/jq", {tag, "v0.3.12"}}}.