Skip to content

Unlock Aggregate : cache global #4629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
AntoineAugusti wants to merge 4 commits into from
+25 −3
Closed

Unlock Aggregate : cache global #4629

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7378b2b
Unlock Aggregate : cache global
AntoineAugusti Jun 10, 2025
2831448
Merge branch 'master' into unlock_aggregate_global_cache
thbar Jun 12, 2025
921d082
Merge branch 'master' into unlock_aggregate_global_cache
thbar Jun 24, 2025
fd5e8a9
Merge branch 'master' into unlock_aggregate_global_cache
thbar Jun 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Unlock Aggregate : cache global
  • Loading branch information
@AntoineAugusti
AntoineAugusti committed Jun 10, 2025
commit 7378b2b35cff88f77834a4a1807ae764be6cc8ae
22 changes: 22 additions & 0 deletions apps/unlock/lib/aggregate_processor.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,28 @@ defmodule Unlock.AggregateProcessor do
:include_origin
])

comp_fn = fn _key ->
{:commit, fetch_feeds(item, options), ttl: :timer.seconds(item.ttl)}
end

cache_name = Unlock.Shared.cache_name()
cache_key = item.identifier <> ":#{:erlang.phash2(options)}"

case Cachex.fetch(cache_name, cache_key, comp_fn) do
{:ok, result} ->
Logger.info("Proxy response for #{item.identifier} served from cache")
result

{:commit, result, _options} ->
result

{:error, _error} ->
Logger.error("Error while fetching key #{cache_key}")
%Unlock.HTTP.Response{status: 502, body: "", headers: []}
end
end

def fetch_feeds(%Unlock.Config.Item.Aggregate{} = item, options) do
headers = @schema_fields
headers = if options[:include_origin], do: headers ++ ["origin", "slug"], else: headers

Expand Down
6 changes: 3 additions & 3 deletions apps/unlock/test/controllers/unlock_controller_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,7 @@ defmodule Unlock.ControllerTest do
def setup_aggregate_proxy_config(slug) do
setup_proxy_config(%{
slug => %Unlock.Config.Item.Aggregate{
ttl: 30,
identifier: slug,
feeds: [
%Unlock.Config.Item.Generic.HTTP{
Expand Down Expand Up @@ -587,7 +588,7 @@ defmodule Unlock.ControllerTest do

verify!(Unlock.HTTP.Client.Mock)

# more calls should not result in any real query
# more calls should not result in any HTTP calls to sub-feeds
{resp, logs} =
with_log(fn ->
build_conn()
Expand All @@ -597,8 +598,7 @@ defmodule Unlock.ControllerTest do
assert resp.status == 200
assert resp.resp_body == Helper.data_as_csv(@expected_headers, [first_data_row, second_data_row], "\r\n")

assert logs =~ ~r|Proxy response for an-existing-aggregate-identifier:first-uuid served from cache|
assert logs =~ ~r|Proxy response for an-existing-aggregate-identifier:second-uuid served from cache|
assert logs =~ ~r|Proxy response for an-existing-aggregate-identifier served from cache|

assert_received {:telemetry_event, [:proxy, :request, :external], %{},
%{target: "proxy:an-existing-aggregate-identifier"}}
Expand Down