refactor(core) using new events library

.ci/setup_env_github.sh

@@ -10,6 +10,7 @@ LUAROCKS=$(dep_version RESTY_LUAROCKS_VERSION)
 OPENSSL=$(dep_version RESTY_OPENSSL_VERSION)
 PCRE=$(dep_version RESTY_PCRE_VERSION)
 RESTY_LMDB=$(dep_version RESTY_LMDB_VERSION)
+RESTY_EVENTS=$(dep_version RESTY_EVENTS_VERSION)
 
 
 #---------
@@ -34,6 +35,7 @@ kong-ngx-build \
     --luarocks $LUAROCKS \
     --openssl $OPENSSL \
     --resty-lmdb $RESTY_LMDB \
+    --resty-events $RESTY_EVENTS \
     --pcre $PCRE \
     --debug
 

.github/workflows/build_and_test.yml

@@ -31,7 +31,7 @@ jobs:
       with:
         repository: Kong/kong-build-tools
         path: kong-build-tools
-        ref: master
+        ref: feat/new_resty_events
 
     - name: Checkout go-pluginserver
       if: steps.cache-deps.outputs.cache-hit != 'true'

.requirements

@@ -7,6 +7,7 @@ RESTY_LUAROCKS_VERSION=3.8.0
 RESTY_OPENSSL_VERSION=1.1.1n
 RESTY_PCRE_VERSION=8.45
 RESTY_LMDB_VERSION=master
+RESTY_EVENTS_VERSION=feat/rebased_new_apis # main refresh cache
 LIBYAML_VERSION=0.2.5
 KONG_BUILD_TOOLS_VERSION=4.25.3
 KONG_NGINX_MODULE_BRANCH=0.2.1

Makefile

@@ -34,7 +34,8 @@ RESTY_VERSION ?= `grep RESTY_VERSION $(KONG_SOURCE_LOCATION)/.requirements | awk
 RESTY_LUAROCKS_VERSION ?= `grep RESTY_LUAROCKS_VERSION $(KONG_SOURCE_LOCATION)/.requirements | awk -F"=" '{print $$2}'`
 RESTY_OPENSSL_VERSION ?= `grep RESTY_OPENSSL_VERSION $(KONG_SOURCE_LOCATION)/.requirements | awk -F"=" '{print $$2}'`
 RESTY_PCRE_VERSION ?= `grep RESTY_PCRE_VERSION $(KONG_SOURCE_LOCATION)/.requirements | awk -F"=" '{print $$2}'`
-KONG_BUILD_TOOLS ?= `grep KONG_BUILD_TOOLS_VERSION $(KONG_SOURCE_LOCATION)/.requirements | awk -F"=" '{print $$2}'`
+#KONG_BUILD_TOOLS ?= `grep KONG_BUILD_TOOLS_VERSION $(KONG_SOURCE_LOCATION)/.requirements | awk -F"=" '{print $$2}'`
+KONG_BUILD_TOOLS ?= feat/new_resty_events
 GRPCURL_VERSION ?= 1.8.5
 OPENRESTY_PATCHES_BRANCH ?= master
 KONG_NGINX_MODULE_BRANCH ?= master

kong-2.8.0-0.rockspec

@@ -484,6 +484,9 @@ build = {
     ["kong.plugins.azure-functions.handler"] = "kong/plugins/azure-functions/handler.lua",
     ["kong.plugins.azure-functions.schema"]  = "kong/plugins/azure-functions/schema.lua",
 
+    -- XXX: test only
+    ["kong.resty.healthcheck"] = "kong/resty/healthcheck.lua",
+
     ["kong.vaults.env"] = "kong/vaults/env/init.lua",
     ["kong.vaults.env.schema"] = "kong/vaults/env/schema.lua",
   }

kong/conf_loader/init.lua

@@ -660,6 +660,8 @@ local CONF_INFERENCES = {
 
   lmdb_environment_path = { typ = "string" },
   lmdb_map_size = { typ = "string" },
+
+  events_mechanism = { typ = "string" },
 }
 
 

kong/global.lua

@@ -167,16 +167,43 @@ end
 function _GLOBAL.init_worker_events()
   -- Note: worker_events will not work correctly if required at the top of the file.
   --       It must be required right here, inside the init function
-  local worker_events = require "resty.worker.events"
+  local worker_events
+  local opts
 
-  local ok, err = worker_events.configure {
-    shm = "kong_process_events", -- defined by "lua_shared_dict"
-    timeout = 5,            -- life time of event data in shm
-    interval = 1,           -- poll interval (seconds)
+  local singletons = require "kong.singletons"
 
-    wait_interval = 0.010,  -- wait before retry fetching event data
-    wait_max = 0.5,         -- max wait time before discarding event
-  }
+  if singletons.configuration and
+     singletons.configuration.events_mechanism == "shared_dict" then
+
+    opts = {
+      shm = "kong_process_events", -- defined by "lua_shared_dict"
+      timeout = 5,            -- life time of event data in shm
+      interval = 1,           -- poll interval (seconds)
+
+      wait_interval = 0.010,  -- wait before retry fetching event data
+      wait_max = 0.5,         -- max wait time before discarding event
+    }
+
+    worker_events = require "resty.worker.events"
+
+  else
+    local sock_name = "worker_events.sock"
+    if ngx.config.subsystem == "stream" then
+      sock_name = "stream_" .. sock_name
+    end
+
+    opts = {
+      unique_timeout = 5,     -- life time of unique event data in lrucache
+      broker_id = 0,          -- broker server runs in nginx worker #0
+      listening = "unix:" ..  -- unix socket for broker listening
+                  ngx.config.prefix() .. sock_name,
+    }
+
+    --worker_events = require "resty.events"
+    worker_events = require "resty.events.compat"
+  end
+
+  local ok, err = worker_events.configure(opts)
   if not ok then
     return nil, err
   end