commit 73e496bace6163b34ab43b9b44d2db64d04aaf64
author Alex Song <songs@us.ibm.com> Wed Mar 29 15:12:09 2017 -0400
committer Alex Song <alexsong93@gmail.com> Wed Mar 29 17:14:32 2017 -0400
tree 55db4b5a516eadbabb7145d3d38a106cc3a74a26
parent 2f946cc4c78d92e0e6964769348a132a99f71b20

Add logging for analytics

conf.d/api_gateway_logging.conf

diff --git a/conf.d/api_gateway_logging.conf b/conf.d/api_gateway_logging.conf
index 2d303fe..d8524fc 100644
--- a/conf.d/api_gateway_logging.conf
+++ b/conf.d/api_gateway_logging.conf
@@ -32,4 +32,4 @@
                       'ua="$http_user_agent" xfwdf="$http_x_forwarded_for" '
                       'upadd="$upstream_addr" upstat=$upstream_status uprt=$upstream_response_time '
                       'tenantId="$tenant" tenantNamespace="$tenantNamespace" tenantInstance="$tenantInstance" '
-                      'apiId="$apiId" apiKey="$apiKey" reqid="$requestId"';
+                      'apiId="$apiId" apiKey="$apiKey" analyticsUri="$analyticsUri" reqid="$requestId"';

conf.d/managed_endpoints.conf

diff --git a/conf.d/managed_endpoints.conf b/conf.d/managed_endpoints.conf
index b002d7b..d76fbad 100644
--- a/conf.d/managed_endpoints.conf
+++ b/conf.d/managed_endpoints.conf
@@ -67,8 +67,9 @@
         set $tenantInstance '';
         set $apiId '';
         set $backendUrl '';
-        set $apiKey '';
+        set $apiKey '-';
         set $gatewayPath $2;
+        set $analyticsUri '';
         set $cors '';
         set $cors_methods '';
 

scripts/lua/routing.lua

diff --git a/scripts/lua/routing.lua b/scripts/lua/routing.lua
index 9143487..a246ec1 100644
--- a/scripts/lua/routing.lua
+++ b/scripts/lua/routing.lua
@@ -44,6 +44,7 @@
   local red = redis.init(REDIS_HOST, REDIS_PORT, REDIS_PASS, 10000)
   local tenantId = ngx.var.tenant
   local gatewayPath = ngx.var.gatewayPath
+  ngx.var.analyticsUri = ngx.var.request_uri:gsub("/api/([^/]+)", "")
   local resourceKeys = redis.getAllResourceKeys(red, tenantId)
   local redisKey = _M.findRedisKey(resourceKeys, tenantId, gatewayPath)
   if redisKey == nil then
@@ -95,6 +96,7 @@
   if cfUrl ~= nil and cfUrl ~= "" then
     local u = url.parse(cfUrl)
     redisKey = utils.concatStrings({"resources:", tenant, ":", path, u.path})
+    ngx.var.analyticsUri = (u.path == "") and "/" or u.path
   end
   for _, key in pairs(resourceKeys) do
     if key == redisKey or key == redisKeyWithSlash then