Add body to the plug-logged messages

Nebo15 · May 14, 2024 · da02a37 · da02a37
1 parent fdb13e5
commit da02a37
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 9 deletions.
diff --git a/lib/logger_json/ecto.ex b/lib/logger_json/ecto.ex
@@ -43,7 +43,7 @@ defmodule LoggerJSON.Ecto do
             | false
         ) :: :ok | {:error, :already_exists}
   def attach(name, event, level) do
-    :telemetry.attach(name, event, &telemetry_logging_handler/4, level)
+    :telemetry.attach(name, event, &__MODULE__.telemetry_logging_handler/4, level)
   end
 
   @doc """

diff --git a/lib/logger_json/plug.ex b/lib/logger_json/plug.ex
@@ -42,7 +42,7 @@ defmodule LoggerJSON.Plug do
       LoggerJSON.Plug.attach("logger-json-phoenix-requests", [:phoenix, :endpoint, :stop], :info)
   """
   def attach(name, event, level) do
-    :telemetry.attach(name, event, &telemetry_logging_handler/4, level)
+    :telemetry.attach(name, event, &__MODULE__.telemetry_logging_handler/4, level)
   end
 
   @doc """
@@ -58,7 +58,47 @@ defmodule LoggerJSON.Plug do
     duration = System.convert_time_unit(duration, :native, :microsecond)
 
     if level = level(level, conn) do
-      Logger.log(level, "", conn: conn, duration_μs: duration)
+      Logger.log(
+        level,
+        fn ->
+          %{
+            method: method,
+            request_path: request_path,
+            state: state,
+            status: status
+          } = conn
+
+          [
+            method,
+            ?\s,
+            request_path,
+            ?\s,
+            "[",
+            connection_type(state),
+            ?\s,
+            status(status),
+            "in ",
+            duration(duration),
+            "]"
+          ]
+        end,
+        conn: conn,
+        duration_μs: duration
+      )
+    end
+  end
+
+  defp connection_type(:set_chunked), do: "Chunked"
+  defp connection_type(_), do: "Sent"
+
+  defp status(nil), do: ""
+  defp status(status), do: [status |> Plug.Conn.Status.code() |> Integer.to_string(), ?\s]
+
+  def duration(duration) do
+    if duration > 1000 do
+      [duration |> div(1000) |> Integer.to_string(), "ms"]
+    else
+      [Integer.to_string(duration), "µs"]
     end
   end
 

diff --git a/mix.exs b/mix.exs
@@ -2,7 +2,7 @@ defmodule LoggerJSON.Mixfile do
   use Mix.Project
 
   @source_url "https://github.com/Nebo15/logger_json"
-  @version "6.0.0-rc.1"
+  @version "6.0.0-rc.2"
 
   def project do
     [

diff --git a/test/logger_json/plug_test.exs b/test/logger_json/plug_test.exs
@@ -10,13 +10,13 @@ defmodule LoggerJSON.PlugTest do
 
   describe "telemetry_logging_handler/4" do
     test "logs request latency and metadata" do
-      conn = Plug.Test.conn(:get, "/")
+      conn = Plug.Test.conn(:get, "/") |> Plug.Conn.put_status(200)
 
       log =
         capture_log(fn ->
           telemetry_logging_handler(
             [:phoenix, :endpoint, :stop],
-            %{duration: 5000},
+            %{duration: 500_000},
             %{conn: conn},
             :info
           )
@@ -25,11 +25,11 @@ defmodule LoggerJSON.PlugTest do
         end)
 
       assert %{
-               "message" => "",
-               "metadata" => %{"duration_μs" => 5},
+               "message" => "GET / [Sent 200 in 500µs]",
+               "metadata" => %{"duration_μs" => 500},
                "request" => %{
                  "client" => %{"ip" => "127.0.0.1", "user_agent" => nil},
-                 "connection" => %{"method" => "GET", "path" => "/", "protocol" => "HTTP/1.1", "status" => nil}
+                 "connection" => %{"method" => "GET", "path" => "/", "protocol" => "HTTP/1.1", "status" => 200}
                }
              } = decode_or_print_error(log)
     end