[#263] get model_endpoint from headers instead of args

legion-platform · Dec 29, 2018 · 13e1992 · 13e1992
1 parent a9c802f
commit 13e1992
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/k8s/edge/edge.lua b/k8s/edge/edge.lua
@@ -90,9 +90,10 @@ function _M.response_feedback(data)
     ngx.say(json_encoded_response);
 end
 
-function _M.catch_model_api_response_chunk(model_id, model_version, model_endpoint, content, eof)
-    local http_request_headers = ngx.req.get_headers()
-    local requestID = http_request_headers["Request-ID"]
+function _M.catch_model_api_response_chunk(model_id, model_version, content, eof)
+    local request_http_headers = ngx.req.get_headers()
+    local requestID = request_http_headers["Request-ID"]
+    local model_endpoint = request_http_headers["Model-Endpoint"]
 
     if eof and string.len(content) == 0 then
         return nil
@@ -114,9 +115,10 @@ function _M.catch_model_api_response_chunk(model_id, model_version, model_endpoi
     return data
 end
 
-function _M.catch_model_api_call(model_id, model_version, model_endpoint)
+function _M.catch_model_api_call(model_id, model_version)
     local request_http_headers = ngx.req.get_headers()
     local request_id = request_http_headers["Request-ID"]
+    local model_endpoint = request_http_headers["Model-Endpoint"]
     local http_method = ngx.req.get_method()
     request_http_headers["authorization"] = nil
 

diff --git a/k8s/edge/statistics_sender.lua b/k8s/edge/statistics_sender.lua
@@ -42,7 +42,10 @@ function _M.push_data(_, time, name, endpoint)
     end
 end
 
-function _M.send_request_statistics(name, endpoint, latency)
+function _M.send_request_statistics(name, latency)
+    local request_http_headers = ngx.req.get_headers()
+    local endpoint = request_http_headers["Model-Endpoint"]
+
     local ok, err = ngx.timer.at(0, _M.push_data, latency, name, endpoint)
     if not ok then
         ngx.log(ngx.ERR, "Failed to create Statsd reporting timer: ", err)