From 098d8eacb7311910228c6901bce1546086144bf4 Mon Sep 17 00:00:00 2001 From: Shawn <506895667@qq.com> Date: Tue, 7 Dec 2021 09:26:09 +0800 Subject: [PATCH] fix(metrics): update testcases for plugin_libs_metrics --- apps/emqx_bridge/src/emqx_bridge_schema.erl | 2 +- .../test/emqx_plugin_libs_metrics_SUITE.erl | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/emqx_bridge/src/emqx_bridge_schema.erl b/apps/emqx_bridge/src/emqx_bridge_schema.erl index 2038e6c04..ec875d0a4 100644 --- a/apps/emqx_bridge/src/emqx_bridge_schema.erl +++ b/apps/emqx_bridge/src/emqx_bridge_schema.erl @@ -26,7 +26,7 @@ get_response() -> connector_name() -> {connector, - sc(binary(), + mk(binary(), #{ nullable => false , desc =>""" The connector name to be used for this bridge. diff --git a/apps/emqx_plugin_libs/test/emqx_plugin_libs_metrics_SUITE.erl b/apps/emqx_plugin_libs/test/emqx_plugin_libs_metrics_SUITE.erl index 3a74cd232..3f8a63f25 100644 --- a/apps/emqx_plugin_libs/test/emqx_plugin_libs_metrics_SUITE.erl +++ b/apps/emqx_plugin_libs/test/emqx_plugin_libs_metrics_SUITE.erl @@ -24,7 +24,7 @@ all() -> [ {group, metrics} - , {group, speed} ]. + , {group, rate} ]. suite() -> [{ct_hooks, [cth_surefire]}, {timetrap, {seconds, 30}}]. @@ -34,8 +34,8 @@ groups() -> [ t_rule , t_no_creation_1 ]}, - {speed, [sequence], - [ rule_speed + {rate, [sequence], + [ rule_rate ]} ]. @@ -74,7 +74,7 @@ t_rule(_) -> ok = emqx_plugin_libs_metrics:clear_metrics(?NAME, <<"rule1">>), ok = emqx_plugin_libs_metrics:clear_metrics(?NAME, <<"rule2">>). -rule_speed(_) -> +rule_rate(_) -> ok = emqx_plugin_libs_metrics:create_metrics(?NAME, <<"rule1">>), ok = emqx_plugin_libs_metrics:create_metrics(?NAME, <<"rule:2">>), ok = emqx_plugin_libs_metrics:inc(?NAME, <<"rule1">>, 'rules.matched'), @@ -83,11 +83,11 @@ rule_speed(_) -> ?assertEqual(2, emqx_plugin_libs_metrics:get(?NAME, <<"rule1">>, 'rules.matched')), ct:sleep(1000), ?LET(#{max := Max, current := Current}, - emqx_plugin_libs_metrics:get_speed(?NAME, <<"rule1">>), + emqx_plugin_libs_metrics:get_rate(?NAME, <<"rule1">>), {?assert(Max =< 2), ?assert(Current =< 2)}), ct:sleep(2100), - ?LET(#{max := Max, current := Current, last5m := Last5Min}, emqx_plugin_libs_metrics:get_speed(?NAME, <<"rule1">>), + ?LET(#{max := Max, current := Current, last5m := Last5Min}, emqx_plugin_libs_metrics:get_rate(?NAME, <<"rule1">>), {?assert(Max =< 2), ?assert(Current == 0), ?assert(Last5Min =< 0.67)}),