From f0e4ce76fb3a50ad4df25cba187dbf63310b3425 Mon Sep 17 00:00:00 2001 From: Adam Rutkowski Date: Thu, 4 Apr 2024 11:56:25 +0200 Subject: [PATCH] wip --- lib/plausible/cache/adapter.ex | 2 +- lib/plausible/cache/stats.ex | 4 +-- mix.lock | 2 +- test/plausible/cache/stats_test.exs | 48 ++++++++++++++++++----------- 4 files changed, 34 insertions(+), 22 deletions(-) diff --git a/lib/plausible/cache/adapter.ex b/lib/plausible/cache/adapter.ex index 5cba4f2db..100965165 100644 --- a/lib/plausible/cache/adapter.ex +++ b/lib/plausible/cache/adapter.ex @@ -45,7 +45,7 @@ defmodule Plausible.Cache.Adapter do @spec get(atom(), any(), (-> any())) :: any() def get(cache_name, key, fallback_fn) do - ConCache.Operations.get_or_store(cache_name, key, fallback_fn) + ConCache.get_or_store(cache_name, key, fallback_fn) catch :exit, _ -> Logger.error("Error retrieving key from '#{inspect(cache_name)}'") diff --git a/lib/plausible/cache/stats.ex b/lib/plausible/cache/stats.ex index 1e5ea3e1b..f88688bce 100644 --- a/lib/plausible/cache/stats.ex +++ b/lib/plausible/cache/stats.ex @@ -35,11 +35,11 @@ defmodule Plausible.Cache.Stats do {:ok, nil} end - def handle_telemetry_event(@telemetry_hit, _measurments, %{cache_name: cache_name}, _) do + def handle_telemetry_event(@telemetry_hit, _measurments, %{cache: %{name: cache_name}}, _) do bump(cache_name, @hit) end - def handle_telemetry_event(@telemetry_miss, _measurments, %{cache_name: cache_name}, _) do + def handle_telemetry_event(@telemetry_miss, _measurments, %{cache: %{name: cache_name}}, _) do bump(cache_name, @miss) end diff --git a/mix.lock b/mix.lock index d428bf9d1..1d7e53007 100644 --- a/mix.lock +++ b/mix.lock @@ -18,7 +18,7 @@ "combination": {:hex, :combination, "0.0.3", "746aedca63d833293ec6e835aa1f34974868829b1486b1e1cb0685f0b2ae1f41", [:mix], [], "hexpm", "72b099f463df42ef7dc6371d250c7070b57b6c5902853f69deb894f79eda18ca"}, "combine": {:hex, :combine, "0.10.0", "eff8224eeb56498a2af13011d142c5e7997a80c8f5b97c499f84c841032e429f", [:mix], [], "hexpm", "1b1dbc1790073076580d0d1d64e42eae2366583e7aecd455d1215b0d16f2451b"}, "comeonin": {:hex, :comeonin, "5.4.0", "246a56ca3f41d404380fc6465650ddaa532c7f98be4bda1b4656b3a37cc13abe", [:mix], [], "hexpm", "796393a9e50d01999d56b7b8420ab0481a7538d0caf80919da493b4a6e51faf1"}, - "con_cache": {:git, "https://github.com/aerosol/con_cache.git", "6acd74721c114a3b8396aba295fe33c72fd88846", [branch: "emit-telemetry-events-for-hit-and-miss"]}, + "con_cache": {:git, "https://github.com/aerosol/con_cache.git", "3ccb5d14565cb4ffb50e30ae78facb3afa1d41d1", [branch: "emit-telemetry-events-for-hit-and-miss"]}, "cors_plug": {:hex, :cors_plug, "3.0.3", "7c3ac52b39624bc616db2e937c282f3f623f25f8d550068b6710e58d04a0e330", [:mix], [{:plug, "~> 1.13", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "3f2d759e8c272ed3835fab2ef11b46bddab8c1ab9528167bd463b6452edf830d"}, "cowboy": {:hex, :cowboy, "2.10.0", "ff9ffeff91dae4ae270dd975642997afe2a1179d94b1887863e43f681a203e26", [:make, :rebar3], [{:cowlib, "2.12.1", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "1.8.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "3afdccb7183cc6f143cb14d3cf51fa00e53db9ec80cdcd525482f5e99bc41d6b"}, "cowboy_telemetry": {:hex, :cowboy_telemetry, "0.4.0", "f239f68b588efa7707abce16a84d0d2acf3a0f50571f8bb7f56a15865aae820c", [:rebar3], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7d98bac1ee4565d31b62d59f8823dfd8356a169e7fcbb83831b8a5397404c9de"}, diff --git a/test/plausible/cache/stats_test.exs b/test/plausible/cache/stats_test.exs index c01bf3627..f4832b0ef 100644 --- a/test/plausible/cache/stats_test.exs +++ b/test/plausible/cache/stats_test.exs @@ -2,6 +2,7 @@ defmodule Plausible.Cache.StatsTest do use Plausible.DataCase, async: true alias Plausible.Cache.Stats + alias Plausible.Cache test "when tracking is not initialized, stats are 0" do assert {:ok, %{hit_rate: +0.0, count: 0}} = Stats.gather(:foo) @@ -12,34 +13,45 @@ defmodule Plausible.Cache.StatsTest do end test "tracking changes hit ratio", %{test: test} do - Stats.record_miss(test) + start(test) + Cache.Adapter.get(test, :key) + assert {:ok, %{hit_rate: +0.0, count: 0}} = Stats.gather(test) - Stats.record_hit(test) - assert {:ok, %{hit_rate: 50.0, count: 0}} = Stats.gather(test) + Cache.Adapter.put(test, :key, :value) + Cache.Adapter.get(test, :key) + + assert {:ok, %{hit_rate: 50.0, count: 1}} = Stats.gather(test) + + Cache.Adapter.get(test, :key) + Cache.Adapter.get(test, :key) - Stats.record_hit(test) - Stats.record_hit(test) - assert {:ok, %{hit_rate: 75.0, count: 0}} = Stats.gather(test) + assert {:ok, %{hit_rate: 75.0, count: 1}} = Stats.gather(test) - Stats.record_miss(test) - Stats.record_miss(test) - assert {:ok, %{hit_rate: 50.0, count: 0}} = Stats.gather(test) + Cache.Adapter.get(test, :non_key) + Cache.Adapter.get(test, :non_key) + assert {:ok, %{hit_rate: 50.0, count: 1}} = Stats.gather(test) end test "hit ratio goes up to 100", %{test: test} do - Stats.record_hit(test) - Stats.record_hit(test) - Stats.record_hit(test) - assert {:ok, %{hit_rate: 100.0, count: 0}} = Stats.gather(test) + start(test) + Cache.Adapter.put(test, :key, :value) + Cache.Adapter.get(test, :key) + Cache.Adapter.get(test, :key) + Cache.Adapter.get(test, :key) + assert {:ok, %{hit_rate: 100.0, count: 1}} = Stats.gather(test) end test "count comes from cache adapter", %{test: test} do - %{start: {m, f, a}} = Plausible.Cache.Adapter.child_spec(test, test) - {:ok, _} = apply(m, f, a) + start(test) + Cache.Adapter.put(test, :key1, :value) + Cache.Adapter.put(test, :key2, :value) + assert Stats.size(test) == 2 + assert {:ok, %{hit_rate: +0.0, count: 2}} = Stats.gather(test) + end - Plausible.Cache.Adapter.put(test, :key, :value) - assert Stats.size(test) == 1 - assert {:ok, %{hit_rate: +0.0, count: 1}} = Stats.gather(test) + defp start(name) do + %{start: {m, f, a}} = Plausible.Cache.Adapter.child_spec(name, name) + {:ok, _} = apply(m, f, a) end end