diff --git a/src/api-umbrella/web-app/actions/v0/analytics.lua b/src/api-umbrella/web-app/actions/v0/analytics.lua index 03e2ada4c..c76f70f34 100644 --- a/src/api-umbrella/web-app/actions/v0/analytics.lua +++ b/src/api-umbrella/web-app/actions/v0/analytics.lua @@ -11,12 +11,13 @@ local json_encode = require "api-umbrella.utils.json_encode" local json_response = require "api-umbrella.web-app.utils.json_response" local pg_utils = require "api-umbrella.utils.pg_utils" local respond_to = require "api-umbrella.web-app.utils.respond_to" +local stable_object_hash = require "api-umbrella.utils.stable_object_hash" local time = require "api-umbrella.utils.time" local _M = {} local function generate_organization_summary(start_time, end_time, recent_start_time, filters) - local cache_id = "analytics_summary:organization:" .. start_time .. ":" .. end_time .. ":" .. recent_start_time .. ":" .. ngx.md5(json_encode(filters)) + local cache_id = "analytics_summary:organization:" .. start_time .. ":" .. end_time .. ":" .. recent_start_time .. ":" .. stable_object_hash(filters) local cache = Cache:find(cache_id) if cache then ngx.log(ngx.NOTICE, "Using cached analytics response for " .. cache_id) diff --git a/src/api-umbrella/web-app/hooks/init_preload_modules.lua b/src/api-umbrella/web-app/hooks/init_preload_modules.lua index feef5e72c..1d4fdebbe 100644 --- a/src/api-umbrella/web-app/hooks/init_preload_modules.lua +++ b/src/api-umbrella/web-app/hooks/init_preload_modules.lua @@ -7,7 +7,6 @@ require "api-umbrella.utils.array_includes" require "api-umbrella.utils.array_last" require "api-umbrella.utils.build_url" require "api-umbrella.utils.deep_merge_overwrite_arrays" -require "api-umbrella.utils.opensearch" require "api-umbrella.utils.encryptor" require "api-umbrella.utils.escape_csv" require "api-umbrella.utils.escape_db_like" @@ -29,6 +28,7 @@ require "api-umbrella.utils.load_config" require "api-umbrella.utils.mail" require "api-umbrella.utils.nillify_json_nulls" require "api-umbrella.utils.nillify_yaml_nulls" +require "api-umbrella.utils.opensearch" require "api-umbrella.utils.path_join" require "api-umbrella.utils.pg_encode_array" require "api-umbrella.utils.pg_utils" @@ -37,6 +37,7 @@ require "api-umbrella.utils.random_seed" require "api-umbrella.utils.random_token" require "api-umbrella.utils.request_api_umbrella_roles" require "api-umbrella.utils.round" +require "api-umbrella.utils.stable_object_hash" require "api-umbrella.utils.time" require "api-umbrella.utils.url_parse" require "api-umbrella.utils.worker_group"