feat(tools): add get_updated_now() in time tools

kong/cluster_events/init.lua

@@ -10,7 +10,7 @@ local insert    = table.insert
 local ngx_log   = ngx.log
 local ngx_now   = ngx.now
 local timer_at  = ngx.timer.at
-local ngx_update_time = ngx.update_time
+local now_updated = require("kong.tools.time").get_updated_now
 
 local knode = kong and kong.node or require "kong.pdk.node".new()
 local concurrency = require "kong.concurrency"
@@ -245,8 +245,7 @@ local function process_event(self, row, local_start_time)
     local delay
 
     if row.nbf and row.now then
-      ngx_update_time()
-      local now = row.now + max(ngx_now() - local_start_time, 0)
+      local now = row.now + max(now_updated() - local_start_time, 0)
       delay = max(row.nbf - now, 0)
     end
 
@@ -308,8 +307,7 @@ local function poll(self)
       end
     end
 
-    ngx_update_time()
-    local local_start_time = ngx_now()
+    local local_start_time = now_updated()
     for i = 1, count do
       local ok, err = process_event(self, rows[i], local_start_time)
       if not ok then

kong/clustering/control_plane.lua

@@ -27,13 +27,13 @@ local exiting = ngx.worker.exiting
 local worker_id = ngx.worker.id
 local ngx_time = ngx.time
 local ngx_now = ngx.now
-local ngx_update_time = ngx.update_time
 local ngx_var = ngx.var
 local table_insert = table.insert
 local table_remove = table.remove
 local sub = string.sub
 local isempty = require("table.isempty")
 local sleep = ngx.sleep
+local now_updated = require("kong.tools.time").get_updated_now
 
 
 local plugins_list_to_map = compat.plugins_list_to_map
@@ -173,8 +173,7 @@ function _M:push_config()
     n = n + 1
   end
 
-  ngx_update_time()
-  local duration = ngx_now() - start
+  local duration = now_updated() - start
   ngx_log(ngx_DEBUG, _log_prefix, "config pushed to ", n, " data-plane nodes in ", duration, " seconds")
 end
 

kong/db/strategies/postgres/connector.lua

@@ -19,7 +19,6 @@ local floor        = math.floor
 local type         = type
 local ngx          = ngx
 local timer_every  = ngx.timer.every
-local update_time  = ngx.update_time
 local get_phase    = ngx.get_phase
 local null         = ngx.null
 local now          = ngx.now
@@ -31,6 +30,7 @@ local utils_toposort = db_utils.topological_sort
 local insert       = table.insert
 local table_merge  = require("kong.tools.table").table_merge
 local strip        = require("kong.tools.string").strip
+local now_updated  = require("kong.tools.time").get_updated_now
 
 
 local WARN                          = ngx.WARN
@@ -54,12 +54,6 @@ local ADMIN_API_PHASE = kong_global.phases.admin_api
 local CORE_ENTITIES = constants.CORE_ENTITIES
 
 
-local function now_updated()
-  update_time()
-  return now()
-end
-
-
 local function iterator(rows)
   local i = 0
   return function()

kong/db/strategies/postgres/init.lua

@@ -12,7 +12,6 @@ local decode_base64 = ngx.decode_base64
 local encode_array  = arrays.encode_array
 local encode_json   = json.encode_json
 local setmetatable  = setmetatable
-local update_time   = ngx.update_time
 local get_phase     = ngx.get_phase
 local tonumber      = tonumber
 local concat        = table.concat
@@ -27,12 +26,12 @@ local null          = ngx.null
 local type          = type
 local load          = load
 local find          = string.find
-local now           = ngx.now
 local fmt           = string.format
 local rep           = string.rep
 local sub           = string.sub
 local log           = ngx.log
 local cycle_aware_deep_copy = require("kong.tools.table").cycle_aware_deep_copy
+local now_updated   = require("kong.tools.time").get_updated_now
 
 
 local NOTICE        = ngx.NOTICE
@@ -45,12 +44,6 @@ local function noop(...)
 end
 
 
-local function now_updated()
-  update_time()
-  return now()
-end
-
-
 -- @param name Query name, for debugging purposes
 -- @param query A string describing an array of single-quoted strings which
 -- contain parts of an SQL query including numeric placeholders like $0, $1, etc.

kong/tools/time.lua

@@ -78,6 +78,11 @@ do
   local start_time      = ngx.req.start_time
   local monotonic_msec  = require("resty.core.time").monotonic_msec
 
+  function _M.get_updated_now()
+    update_time()
+    return now()        -- time is kept in seconds with millisecond resolution.
+  end
+
   function _M.get_now_ms()
     return now() * 1000 -- time is kept in seconds with millisecond resolution.
   end