chore(datadog) use kong pdk

bungle · bungle · commit 3651424410c2 · 2020-01-29T17:32:00.000+02:00
### Summary

Change `datadog` plugin to use Kong PDK.
diff --git a/kong/plugins/datadog/handler.lua b/kong/plugins/datadog/handler.lua
@@ -1,27 +1,23 @@
-local basic_serializer = require "kong.plugins.log-serializers.basic"
-local statsd_logger    = require "kong.plugins.datadog.statsd_logger"
+local serializer = require "kong.plugins.log-serializers.basic"
+local statsd_logger = require "kong.plugins.datadog.statsd_logger"
 
 
-local ngx_log       = ngx.log
-local ngx_timer_at  = ngx.timer.at
-local string_gsub   = string.gsub
-local pairs         = pairs
-local NGX_ERR       = ngx.ERR
-
-
-local DatadogHandler    = {}
-DatadogHandler.PRIORITY = 10
-DatadogHandler.VERSION = "3.0.0"
+local kong     = kong
+local ngx      = ngx
+local timer_at = ngx.timer.at
+local insert   = table.insert
+local gsub     = string.gsub
+local pairs    = pairs
 
 
 local get_consumer_id = {
   consumer_id = function(consumer)
-    return consumer and string_gsub(consumer.id, "-", "_")
+    return consumer and gsub(consumer.id, "-", "_")
   end,
-  custom_id   = function(consumer)
+  custom_id = function(consumer)
     return consumer and consumer.custom_id
   end,
-  username    = function(consumer)
+  username = function(consumer)
     return consumer and consumer.username
   end
 }
@@ -30,11 +26,11 @@ local get_consumer_id = {
 local function compose_tags(service_name, status, consumer_id, tags)
   local result = {"name:" ..service_name, "status:"..status}
   if consumer_id ~= nil then
-    table.insert(result, "consumer:" ..consumer_id)
+    insert(result, "consumer:" ..consumer_id)
   end
   if tags ~= nil then
     for _, v in pairs(tags) do
-      table.insert(result, v)
+      insert(result, v)
     end
   end
   return result
@@ -46,9 +42,9 @@ local function log(premature, conf, message)
     return
   end
 
-  local name = string_gsub(message.service.name ~= ngx.null and
-                           message.service.name or message.service.host,
-                           "%.", "_")
+  local name = gsub(message.service.name ~= ngx.null and
+                    message.service.name or message.service.host,
+                    "%.", "_")
 
   local stat_name  = {
     request_size     = "request.size",
@@ -69,7 +65,7 @@ local function log(premature, conf, message)
 
   local logger, err = statsd_logger:new(conf)
   if err then
-    ngx_log(NGX_ERR, "failed to create Statsd logger: ", err)
+    kong.log.err("failed to create Statsd logger: ", err)
     return
   end
 
@@ -90,17 +86,23 @@ local function log(premature, conf, message)
 end
 
 
+local DatadogHandler = {
+  PRIORITY = 10,
+  VERSION = "3.0.1",
+}
+
+
 function DatadogHandler:log(conf)
   if not ngx.ctx.service then
     return
   end
 
-  local message = basic_serializer.serialize(ngx)
-
-  local ok, err = ngx_timer_at(0, log, conf, message)
+  local message = serializer.serialize(ngx)
+  local ok, err = timer_at(0, log, conf, message)
   if not ok then
-    ngx_log(NGX_ERR, "failed to create timer: ", err)
+    kong.log.err("failed to create timer: ", err)
   end
 end
 
+
 return DatadogHandler
diff --git a/kong/plugins/datadog/statsd_logger.lua b/kong/plugins/datadog/statsd_logger.lua
@@ -1,11 +1,9 @@
-local ngx_socket_udp = ngx.socket.udp
-local ngx_log        = ngx.log
-local table_concat   = table.concat
-local setmetatable   = setmetatable
-local NGX_ERR        = ngx.ERR
-local NGX_DEBUG      = ngx.DEBUG
-local fmt            = string.format
-local tostring       = tostring
+local kong         = kong
+local udp          = ngx.socket.udp
+local concat       = table.concat
+local setmetatable = setmetatable
+local fmt          = string.format
+local tostring     = tostring
 
 
 local stat_types = {
@@ -17,16 +15,17 @@ local stat_types = {
   set       = "s",
 }
 
+
 local statsd_mt = {}
 statsd_mt.__index = statsd_mt
 
 
 function statsd_mt:new(conf)
-  local sock   = ngx_socket_udp()
+  local sock   = udp()
   local _, err = sock:setpeername(conf.host, conf.port)
   if err then
     return nil, fmt("failed to connect to %s:%s: %s", conf.host,
-      tostring(conf.port), err)
+                    tostring(conf.port), err)
   end
 
   local statsd = {
@@ -49,7 +48,7 @@ local function statsd_message(prefix, stat, delta, kind, sample_rate, tags)
   end
 
   if tags and #tags > 0 then
-    str_tags = "|#" .. table_concat(tags, ",")
+    str_tags = "|#" .. concat(tags, ",")
   end
 
   return fmt("%s.%s:%s|%s%s%s", prefix, stat,
@@ -60,8 +59,8 @@ end
 function statsd_mt:close_socket()
   local ok, err = self.socket:close()
   if not ok then
-    ngx_log(NGX_ERR, "[udp-log] failed to close connection from ",
-            self.host, ":", self.port, ": ", err)
+    kong.log.err("failed to close connection from ", self.host, ":", self.port,
+                 ": ", err)
   end
 end
 
@@ -70,12 +69,12 @@ function statsd_mt:send_statsd(stat, delta, kind, sample_rate, tags)
   local udp_message = statsd_message(self.prefix or "kong", stat,
                                      delta, kind, sample_rate, tags)
 
-  ngx_log(NGX_DEBUG, fmt("Sending data to statsd server: %s", udp_message))
+  kong.log.debug("Sending data to statsd server: ", udp_message)
 
   local ok, err = self.socket:send(udp_message)
   if not ok then
-    ngx_log(NGX_ERR, fmt("failed to send data to %s:%s: %s", self.host,
-      tostring(self.port), err))
+    kong.log.err("failed to send data to ", self.host, ":",
+                 tostring(self.port), ": ", err)
   end
 end
 
