modify changelog, replace the wait loop with ngx.sleep() and append i…

…t to the first test case

CHANGELOG.md

@@ -112,7 +112,7 @@
   [#9877](https://github.com/Kong/kong/pull/9877)
 - **JWT**: Deny requests that have different tokens in the jwt token search locations. Thanks Jackson 'Che-Chun' Kuo from Latacora for reporting this issue.
   [#9946](https://github.com/Kong/kong/pull/9946)
-- **Statsd**: Fix a bug that the batch queue in statsd can't get the right result when processing batch entries produced by this plugin.
+- **Statsd**: Fix a bug in the StatsD plugin batch queue processing where metrics are published multiple times.
   [#10052](https://github.com/Kong/kong/pull/10052)
 
 ### Dependencies

spec/03-plugins/06-statsd/01-log_spec.lua

@@ -500,6 +500,15 @@ for _, strategy in helpers.each_strategy() do
         },
       }
 
+      bp.key_auth_plugins:insert { route = { id = routes[31].id } }
+      bp.statsd_plugins:insert {
+        route = { id = routes[31].id },
+        config     = {
+          host     = "127.0.0.1",
+          port     = UDP_PORT,
+        },
+      }
+
       for i = 100, 103 do
         local service = bp.services:insert {
           protocol = helpers.mock_upstream_protocol,
@@ -637,15 +646,6 @@ for _, strategy in helpers.each_strategy() do
         },
       }
 
-      bp.key_auth_plugins:insert { route = { id = routes[31].id } }
-      bp.statsd_plugins:insert {
-        route = { id = routes[31].id },
-        config     = {
-          host     = "127.0.0.1",
-          port     = UDP_PORT,
-        },
-      }
-
       assert(helpers.start_kong({
         database   = strategy,
         nginx_conf = "spec/fixtures/custom_nginx.template",
@@ -683,17 +683,7 @@ for _, strategy in helpers.each_strategy() do
         local ok, metrics, err = thread:join()
         assert(ok, metrics)
         assert(#metrics == metrics_count, err)
-      end)
-
-      -- wait until shdict metrics could be sent again
-      -- so that next test case can pass
-      it("wait until shdict metrics could be sent again", function()
-        local t1 = ngx.now()
-        repeat
-          ngx.sleep(10)
-          ngx.update_time()
-          local t2 = ngx.now() - t1
-        until t2 > DEFAULT_SHDICT_METRICS_SEND_THRESHOLD + 1
+        ngx.sleep(DEFAULT_SHDICT_METRICS_SEND_THRESHOLD + 1)
       end)
 
       it("logs over UDP with default metrics", function()