Merge pull request #334 from NREL/simplify-logging

Simplify analytics logging code

config/default.yml

@@ -14,8 +14,8 @@ https_port: 443
 nginx:
   workers: auto
   worker_connections: 8192
-  access_log_filename: access.log.gz
-  access_log_options: buffer=256k gzip=4 flush=10s
+  access_log_filename: access.log
+  access_log_options: buffer=256k flush=10s
   proxy_connect_timeout: 60
   proxy_read_timeout: 60
   proxy_send_timeout: 60
@@ -44,8 +44,6 @@ nginx:
       size: 20k
     locks:
       size: 20k
-    logs:
-      size: 5m
     resolved_hosts:
       size: 100k
     stats:

config/elasticsearch_templates.json

@@ -1,38 +1,4 @@
 [
-  {
-    "id": "api-umbrella-template",
-    "template": {
-      "template": "api-umbrella",
-      "mappings": {
-        "city": {
-          "_all": {
-            "enabled": false
-          },
-          "properties": {
-            "updated_at": {
-              "type": "date"
-            },
-            "country": {
-              "type": "string",
-              "index": "not_analyzed"
-            },
-            "region": {
-              "type": "string",
-              "index": "not_analyzed"
-            },
-            "city": {
-              "type": "string",
-              "index": "not_analyzed"
-            },
-            "location": {
-              "type": "geo_point",
-              "lat_lon": true
-            }
-          }
-        }
-      }
-    }
-  },
   {
     "id": "api-umbrella-log-v1-template",
     "template": {
@@ -47,11 +13,6 @@
               "type": "custom",
               "tokenizer": "keyword",
               "filter": ["lowercase"]
-            },
-            "path_hierarchy_lowercase": {
-              "type": "custom",
-              "tokenizer": "path_hierarchy",
-              "filter": ["lowercase"]
             }
           }
         }
@@ -160,10 +121,6 @@
               "type": "string",
               "analyzer": "keyword_lowercase"
             },
-            "request_path_hierarchy": {
-              "type": "string",
-              "analyzer": "path_hierarchy_lowercase"
-            },
             "request_referer": {
               "type": "string",
               "analyzer": "keyword_lowercase"
@@ -179,6 +136,10 @@
               "type": "string",
               "analyzer": "keyword_lowercase"
             },
+            "request_url_query": {
+              "type": "string",
+              "analyzer": "keyword_lowercase"
+            },
             "request_user_agent": {
               "type": "string",
               "analyzer": "keyword_lowercase"

config/test.yml

@@ -12,7 +12,7 @@ nginx:
   # hard-coded for test purposes so we have a more stable baseline and ensure
   # our tests always run with multiple workers.
   workers: 2
-  access_log_options: gzip=4
+  access_log_options:
   proxy_connect_timeout: 10
   proxy_read_timeout: 10
   proxy_send_timeout: 10

src/api-umbrella/proxy/hooks/access.lua

@@ -1,5 +1,3 @@
-local start_time = ngx.now()
-
 -- Try to find the matching API backend first, since it dictates further
 -- settings and requirements.
 local api = ngx.ctx.matched_api
@@ -17,7 +15,6 @@ local referer_validator = require "api-umbrella.proxy.middleware.referer_validat
 local rewrite_request = require "api-umbrella.proxy.middleware.rewrite_request"
 local role_validator = require "api-umbrella.proxy.middleware.role_validator"
 local user_settings = require "api-umbrella.proxy.middleware.user_settings"
-local utils = require "api-umbrella.proxy.utils"
 
 local err
 local err_data
@@ -83,7 +80,3 @@ end
 
 -- Store the settings for use by the header_filter.
 ngx.ctx.settings = settings
-
--- Compute how much time we spent in Lua processing during this phase of the
--- request.
-utils.overhead_timer(start_time)

src/api-umbrella/proxy/hooks/api_backends_access.lua

@@ -1,5 +1,2 @@
 local wait_for_setup = require "api-umbrella.proxy.wait_for_setup"
 wait_for_setup()
-
-local log_timing_id = ngx.var.x_api_umbrella_request_id .. "_upstream_response_time"
-ngx.shared.logs:set(log_timing_id, "pending", 300)

src/api-umbrella/proxy/hooks/header_filter.lua

@@ -1,8 +1,5 @@
-local start_time = ngx.now()
-
 local error_handler = require "api-umbrella.proxy.error_handler"
 local rewrite_response = require "api-umbrella.proxy.middleware.rewrite_response"
-local utils = require "api-umbrella.proxy.utils"
 
 local settings = ngx.ctx.settings
 
@@ -11,7 +8,3 @@ local err = rewrite_response(settings)
 if err then
   return error_handler(err, settings)
 end
-
--- Compute how much time we spent in Lua processing during this phase of the
--- request.
-utils.overhead_timer(start_time)