diff --git a/lib/microwaveprop_web/endpoint.ex b/lib/microwaveprop_web/endpoint.ex index 140aa54e..1586f508 100644 --- a/lib/microwaveprop_web/endpoint.ex +++ b/lib/microwaveprop_web/endpoint.ex @@ -68,6 +68,7 @@ defmodule MicrowavepropWeb.Endpoint do # `path_info` never matches. `request_path` is set once by the adapter # and is stable across forward, so it's the reliable discriminator. def log_level(%{request_path: "/health"}), do: false + def log_level(%{request_path: "/live"}), do: false def log_level(%{request_path: "/metrics"}), do: false def log_level(%{request_path: "/metrics/" <> _}), do: false def log_level(%{method: "HEAD"}), do: false diff --git a/test/microwaveprop/propagation_test.exs b/test/microwaveprop/propagation_test.exs index dddd141a..c1bca60b 100644 --- a/test/microwaveprop/propagation_test.exs +++ b/test/microwaveprop/propagation_test.exs @@ -20,12 +20,12 @@ defmodule Microwaveprop.PropagationTest do :ets.match_delete( :microwaveprop_cache, - {{Microwaveprop.Propagation.ProfilesFile, :_, :_, :_}, :_, :_} + {{ProfilesFile, :_, :_, :_}, :_, :_} ) :ets.match_delete( :microwaveprop_cache, - {{Microwaveprop.Propagation.ProfilesFile, :_, :_}, :_, :_} + {{ProfilesFile, :_, :_}, :_, :_} ) :ok diff --git a/test/microwaveprop_web/metrics_log_suppression_test.exs b/test/microwaveprop_web/metrics_log_suppression_test.exs index c13c75ff..1c18cb29 100644 --- a/test/microwaveprop_web/metrics_log_suppression_test.exs +++ b/test/microwaveprop_web/metrics_log_suppression_test.exs @@ -38,6 +38,24 @@ defmodule MicrowavepropWeb.MetricsLogSuppressionTest do refute log =~ "Sent 200" end + test "GET /live does not emit a Phoenix endpoint Sent log line", %{conn: conn} do + log = + capture_log([level: :info], fn -> + conn = get(conn, "/live") + assert conn.status == 200 + end) + + refute log =~ "Sent 200" + refute log =~ "GET /live" + end + + test "log_level/1 returns false for /live", %{conn: _conn} do + assert MicrowavepropWeb.Endpoint.log_level(%{ + request_path: "/live", + method: "GET" + }) == false + end + test "log_level/1 returns false for the rewritten conn shape produced by forward", %{ conn: _conn } do