From fdb13e56a86baff5e80ec00843c6d5eb086414f3 Mon Sep 17 00:00:00 2001 From: Andrew Dryga Date: Mon, 13 May 2024 19:37:04 -0600 Subject: [PATCH] Fix race condition in tests --- lib/logger_json/formatters/basic.ex | 2 +- test/logger_json/ecto_test.exs | 8 ++++++-- test/logger_json/plug_test.exs | 8 ++++++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/lib/logger_json/formatters/basic.ex b/lib/logger_json/formatters/basic.ex index aa0dc01..2205dc8 100644 --- a/lib/logger_json/formatters/basic.ex +++ b/lib/logger_json/formatters/basic.ex @@ -40,7 +40,7 @@ defmodule LoggerJSON.Formatters.Basic do line = %{ time: utc_time(meta), - severity: Atom.to_string(level) |> String.downcase(), + severity: Atom.to_string(level), message: encode(message, redactors), metadata: encode(take_metadata(meta, metadata_selector), redactors) } diff --git a/test/logger_json/ecto_test.exs b/test/logger_json/ecto_test.exs index 70599b6..df9283b 100644 --- a/test/logger_json/ecto_test.exs +++ b/test/logger_json/ecto_test.exs @@ -3,6 +3,11 @@ defmodule LoggerJSON.EctoTest do import LoggerJSON.Ecto require Logger + setup do + formatter = {LoggerJSON.Formatters.Basic, metadata: :all} + :logger.update_handler_config(:default, :formatter, formatter) + end + describe "telemetry_logging_handler/4" do test "logs ecto queries received via telemetry event" do log = @@ -43,8 +48,7 @@ defmodule LoggerJSON.EctoTest do "queue_time_μs" => 106, "repo" => "Repo" } - }, - "severity" => "info" + } } = decode_or_print_error(log) end diff --git a/test/logger_json/plug_test.exs b/test/logger_json/plug_test.exs index 90dc86a..3170040 100644 --- a/test/logger_json/plug_test.exs +++ b/test/logger_json/plug_test.exs @@ -3,6 +3,11 @@ defmodule LoggerJSON.PlugTest do import LoggerJSON.Plug require Logger + setup do + formatter = {LoggerJSON.Formatters.Basic, metadata: :all} + :logger.update_handler_config(:default, :formatter, formatter) + end + describe "telemetry_logging_handler/4" do test "logs request latency and metadata" do conn = Plug.Test.conn(:get, "/") @@ -25,8 +30,7 @@ defmodule LoggerJSON.PlugTest do "request" => %{ "client" => %{"ip" => "127.0.0.1", "user_agent" => nil}, "connection" => %{"method" => "GET", "path" => "/", "protocol" => "HTTP/1.1", "status" => nil} - }, - "severity" => "info" + } } = decode_or_print_error(log) end