oban

lib/tower/event.ex

@@ -157,7 +157,9 @@ defmodule Tower.Event do
   end
 
   defp logger_metadata(log_event) do
-    Map.take(log_event[:meta] || %{}, logger_metadata_keys())
+    (log_event[:meta] || %{})
+    |> Map.merge(Enum.into(Logger.metadata(), %{}))
+    |> Map.take(logger_metadata_keys())
   end
 
   defp logger_metadata_keys do

test/support/test_app.ex

@@ -3,6 +3,8 @@ defmodule TestApp.UncaughtThrowWorker do
 
   @impl Oban.Worker
   def perform(%Oban.Job{}) do
+    Logger.metadata(user_id: 123, secret: "secret")
+
     throw("something")
 
     :ok
@@ -14,6 +16,8 @@ defmodule TestApp.AbnormalExitWorker do
 
   @impl Oban.Worker
   def perform(%Oban.Job{}) do
+    Logger.metadata(user_id: 123, secret: "secret")
+
     exit(:abnormal)
 
     :ok
@@ -25,6 +29,8 @@ defmodule TestApp.RuntimeErrorWorker do
 
   @impl Oban.Worker
   def perform(%Oban.Job{}) do
+    Logger.metadata(user_id: 123, secret: "secret")
+
     raise "error from an Oban worker"
 
     :ok

test/tower/oban_test.exs

@@ -26,6 +26,8 @@ defmodule TowerObanTest do
   end
 
   test "reports raised exception in an Oban worker" do
+    put_env(:logger_metadata, [:user_id])
+
     TestApp.RuntimeErrorWorker.new(%{}, max_attempts: 1)
     |> Oban.insert()
 
@@ -38,6 +40,7 @@ defmodule TowerObanTest do
           kind: :error,
           reason: %RuntimeError{message: "error from an Oban worker"},
           stacktrace: stacktrace,
+          metadata: metadata,
           by: Tower.ObanExceptionHandler
         }
       ] = Tower.EphemeralReporter.events()
@@ -46,9 +49,12 @@ defmodule TowerObanTest do
     assert String.length(id) == 36
     assert recent_datetime?(datetime)
     assert [_ | _] = stacktrace
+    assert metadata == %{user_id: 123}
   end
 
   test "reports uncaught throw generated in an Oban worker" do
+    put_env(:logger_metadata, [:user_id])
+
     TestApp.UncaughtThrowWorker.new(%{}, max_attempts: 1)
     |> Oban.insert()
 
@@ -61,6 +67,7 @@ defmodule TowerObanTest do
           kind: :error,
           reason: %Oban.CrashError{reason: "something"},
           stacktrace: stacktrace,
+          metadata: metadata,
           by: Tower.ObanExceptionHandler
         }
       ] = Tower.EphemeralReporter.events()
@@ -69,9 +76,12 @@ defmodule TowerObanTest do
     assert String.length(id) == 36
     assert recent_datetime?(datetime)
     assert [_ | _] = stacktrace
+    assert metadata == %{user_id: 123}
   end
 
   test "reports abnormal exit generated in an Oban worker" do
+    put_env(:logger_metadata, [:user_id])
+
     TestApp.AbnormalExitWorker.new(%{}, max_attempts: 1)
     |> Oban.insert()
 
@@ -84,6 +94,7 @@ defmodule TowerObanTest do
           kind: :error,
           reason: %Oban.CrashError{reason: :abnormal},
           stacktrace: stacktrace,
+          metadata: metadata,
           by: Tower.ObanExceptionHandler
         }
       ] = Tower.EphemeralReporter.events()
@@ -92,6 +103,20 @@ defmodule TowerObanTest do
     assert String.length(id) == 36
     assert recent_datetime?(datetime)
     assert [_ | _] = stacktrace
+    assert metadata == %{user_id: 123}
+  end
+
+  defp put_env(key, value) do
+    original_value = Application.get_env(:tower, key)
+    Application.put_env(:tower, key, value)
+
+    on_exit(fn ->
+      if original_value == nil do
+        Application.delete_env(:tower, key)
+      else
+        Application.put_env(:tower, key, original_value)
+      end
+    end)
   end
 
   defp recent_datetime?(datetime) do

test/tower_test.exs

@@ -686,8 +686,7 @@ defmodule TowerTest do
 
     capture_log(fn ->
       in_unlinked_process(fn ->
-        Logger.metadata(%{user_id: 123})
-        Logger.metadata(%{secret: "secret"})
+        Logger.metadata(user_id: 123, secret: "secret")
 
         raise "an error"
       end)